Renamed 'ServiceProvider provider-type="" service-types=""' to 'ServiceProvider service="" types=""' respectively. Renamed ServiceInfo.serviceType to ServiceInfo.service Added ServiceInfo.types