diff --git a/tripleo_validations/inventory.py b/tripleo_validations/inventory.py
index d5a34e69c..e26aedf80 100644
--- a/tripleo_validations/inventory.py
+++ b/tripleo_validations/inventory.py
@@ -149,8 +149,8 @@ class TripleoInventory(object):
             if hostnames:
                 names = hostnames.get(HOST_NETWORK) or []
                 shortnames = [n.split(".%s." % HOST_NETWORK)[0] for n in names]
-                children.append(role.lower())
-                ret[role.lower()] = {
+                children.append(role)
+                ret[role] = {
                     'children': sorted(shortnames),
                     'vars': {
                         'ansible_ssh_user': 'heat-admin',
@@ -177,8 +177,8 @@ class TripleoInventory(object):
         roles_by_service = self.get_roles_by_service(
             self.stack_outputs.get('EnabledServices', {}))
         for service, roles in roles_by_service.items():
-            service_children = [role.lower() for role in roles
-                                if ret.get(role.lower()) is not None]
+            service_children = [role for role in roles
+                                if ret.get(role) is not None]
             if service_children:
                 ret[service.lower()] = {
                     'children': service_children,
diff --git a/tripleo_validations/tests/test_inventory.py b/tripleo_validations/tests/test_inventory.py
index 444c34523..b3e6e2ba3 100644
--- a/tripleo_validations/tests/test_inventory.py
+++ b/tripleo_validations/tests/test_inventory.py
@@ -166,12 +166,12 @@ class TestInventory(base.TestCase):
                             'vars': {'deploy_server_id': 'b'}},
                     'c-2': {'hosts': ['x.x.x.3'],
                             'vars': {'deploy_server_id': 'c'}},
-                    'compute': {
+                    'Compute': {
                         'children': ['cp-0'],
                         'vars': {'ansible_ssh_user': 'heat-admin',
                                  'bootstrap_server_id': 'a',
                                  'role_name': 'Compute'}},
-                    'controller': {
+                    'Controller': {
                         'children': ['c-0', 'c-1', 'c-2'],
                         'vars': {'ansible_ssh_user': 'heat-admin',
                                  'bootstrap_server_id': 'a',
@@ -180,13 +180,13 @@ class TestInventory(base.TestCase):
                              'vars': {'deploy_server_id': 'd'}},
                     'cs-0': {'hosts': ['z.z.z.1'],
                              'vars': {'deploy_server_id': 'e'}},
-                    'customrole': {
+                    'CustomRole': {
                         'children': ['cs-0'],
                         'vars': {'ansible_ssh_user': 'heat-admin',
                                  'bootstrap_server_id': 'a',
                                  'role_name': 'CustomRole'}},
                     'overcloud': {
-                        'children': ['compute', 'controller', 'customrole']},
+                        'children': ['Compute', 'Controller', 'CustomRole']},
                     'undercloud': {
                         'hosts': ['localhost'],
                         'vars': {'ansible_connection': 'local',
diff --git a/validations/ceph-health.yaml b/validations/ceph-health.yaml
index fd447aae0..4d81c7143 100644
--- a/validations/ceph-health.yaml
+++ b/validations/ceph-health.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: controller
+- hosts: Controller
   vars:
     metadata:
       name: Check the status of the ceph cluster
diff --git a/validations/controller-token.yaml b/validations/controller-token.yaml
index ecd87eafd..37eca7a6d 100644
--- a/validations/controller-token.yaml
+++ b/validations/controller-token.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: undercloud, controller
+- hosts: undercloud, Controller
   vars:
     metadata:
       Name: Verify that keystone admin token is disabled.
diff --git a/validations/controller-ulimits.yaml b/validations/controller-ulimits.yaml
index 24216c5a3..caecf1201 100644
--- a/validations/controller-ulimits.yaml
+++ b/validations/controller-ulimits.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: controller
+- hosts: Controller
   vars:
     metadata:
       name: Check controller ulimits
diff --git a/validations/haproxy.yaml b/validations/haproxy.yaml
index 65e710b1d..21debcd51 100644
--- a/validations/haproxy.yaml
+++ b/validations/haproxy.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: controller
+- hosts: Controller
   vars:
     metadata:
       name: HAProxy configuration
diff --git a/validations/mysql-open-files-limit.yaml b/validations/mysql-open-files-limit.yaml
index 857af775b..e6da26788 100644
--- a/validations/mysql-open-files-limit.yaml
+++ b/validations/mysql-open-files-limit.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: controller
+- hosts: Controller
   vars:
     metadata:
       name: MySQL Open Files Limit
diff --git a/validations/neutron-sanity-check.yaml b/validations/neutron-sanity-check.yaml
index 24201cec7..cf8ecdb99 100644
--- a/validations/neutron-sanity-check.yaml
+++ b/validations/neutron-sanity-check.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: controller
+- hosts: Controller
   vars:
     metadata:
       name: Neutron Sanity Check
diff --git a/validations/no-op-firewall-nova-driver.yaml b/validations/no-op-firewall-nova-driver.yaml
index c3eb8f536..a8a222416 100644
--- a/validations/no-op-firewall-nova-driver.yaml
+++ b/validations/no-op-firewall-nova-driver.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: compute
+- hosts: Compute
   vars:
     metadata:
       name: Verify NoOpFirewallDriver is set in Nova
diff --git a/validations/pacemaker-status.yaml b/validations/pacemaker-status.yaml
index f17011416..48b2c1892 100644
--- a/validations/pacemaker-status.yaml
+++ b/validations/pacemaker-status.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: controller
+- hosts: Controller
   vars:
     metadata:
       name: Check the status of the pacemaker cluster
diff --git a/validations/rabbitmq-limits.yaml b/validations/rabbitmq-limits.yaml
index 5337833b0..0aaf7edf0 100644
--- a/validations/rabbitmq-limits.yaml
+++ b/validations/rabbitmq-limits.yaml
@@ -1,5 +1,5 @@
 ---
-- hosts: controller
+- hosts: Controller
   vars:
     metadata:
       name: Rabbitmq limits
diff --git a/validations/stonith-exists.yaml b/validations/stonith-exists.yaml
index 40b2b0fc3..e024f4baf 100644
--- a/validations/stonith-exists.yaml
+++ b/validations/stonith-exists.yaml
@@ -1,6 +1,6 @@
 ---
 - name: Validate stonith devices
-  hosts: controller
+  hosts: Controller
   vars:
     metadata:
       name: stonith-exists