Make use of Service, Service Offering, and Service Plan more consistent
Make use of Service, Service Offering, and Service Plan more consistent

servicebroker/servicebroker,servicebroker/servicebroker,servicebroker/servicebroker,openservicebrokerapi/servicebroker