New name for services. service_type -> type

Change-Id: I53f9a10ddc41fe2cb9ae724cb0a4968eb7a081e5
Merge "New name for services. service_type -> type"