Remove openstack- prefix from service name

Change-Id: I806936cb7ef2c9fcd1208b409f6563237e284219