Use official service names
Use official service names

Change-Id: I1eeff02978c46c2ca942753d9ebc85afb1d33b33

openstack/openstack-manuals,openstack/openstack-manuals,openstack/openstack-manuals,openstack/openstack-manuals