diff --git a/tripleo_common/inventory.py b/tripleo_common/inventory.py
index bf0fd70b3..8e0d95142 100644
--- a/tripleo_common/inventory.py
+++ b/tripleo_common/inventory.py
@@ -135,9 +135,9 @@ class TripleoInventory(object):
             return {}
 
     UNDERCLOUD_SERVICES = [
-        'openstack-nova-compute', 'openstack-heat-engine',
-        'openstack-ironic-conductor', 'openstack-swift-container',
-        'openstack-swift-object', 'openstack-mistral-engine']
+        'tripleo_nova_compute', 'tripleo_heat_engine',
+        'tripleo_ironic_conductor', 'tripleo_swift_container_server',
+        'tripleo_swift_object_server', 'tripleo_mistral_engine']
 
     def get_undercloud_service_list(self):
         """Return list of undercloud services - currently static
diff --git a/tripleo_common/tests/test_inventory.py b/tripleo_common/tests/test_inventory.py
index 5d0fc29da..c1402deee 100644
--- a/tripleo_common/tests/test_inventory.py
+++ b/tripleo_common/tests/test_inventory.py
@@ -218,12 +218,12 @@ class TestInventory(base.TestCase):
                          'plan': 'overcloud',
                          'project_name': 'admin',
                          'undercloud_service_list': [
-                             'openstack-nova-compute',
-                             'openstack-heat-engine',
-                             'openstack-ironic-conductor',
-                             'openstack-swift-container',
-                             'openstack-swift-object',
-                             'openstack-mistral-engine'],
+                             'tripleo_nova_compute',
+                             'tripleo_heat_engine',
+                             'tripleo_ironic_conductor',
+                             'tripleo_swift_container_server',
+                             'tripleo_swift_object_server',
+                             'tripleo_mistral_engine'],
                          'undercloud_swift_url': 'anendpoint',
                          'username': 'admin'}}}
         inv_list = inventory.list()
@@ -305,12 +305,12 @@ class TestInventory(base.TestCase):
                          'plan': 'overcloud',
                          'project_name': 'admin',
                          'undercloud_service_list': [
-                             'openstack-nova-compute',
-                             'openstack-heat-engine',
-                             'openstack-ironic-conductor',
-                             'openstack-swift-container',
-                             'openstack-swift-object',
-                             'openstack-mistral-engine'],
+                             'tripleo_nova_compute',
+                             'tripleo_heat_engine',
+                             'tripleo_ironic_conductor',
+                             'tripleo_swift_container_server',
+                             'tripleo_swift_object_server',
+                             'tripleo_mistral_engine'],
                          'undercloud_swift_url':
                          'anendpoint' if session else None,
                          'username': 'admin'}}}
@@ -414,12 +414,12 @@ class TestInventory(base.TestCase):
                                     'plan': 'overcloud',
                                     'project_name': 'admin',
                                     'undercloud_service_list': [
-                                        'openstack-nova-compute',
-                                        'openstack-heat-engine',
-                                        'openstack-ironic-conductor',
-                                        'openstack-swift-container',
-                                        'openstack-swift-object',
-                                        'openstack-mistral-engine'],
+                                        'tripleo_nova_compute',
+                                        'tripleo_heat_engine',
+                                        'tripleo_ironic_conductor',
+                                        'tripleo_swift_container_server',
+                                        'tripleo_swift_object_server',
+                                        'tripleo_mistral_engine'],
                                     'undercloud_swift_url': 'anendpoint',
                                     'username': 'admin'}}}
         if extra_vars: