diff --git a/salt/control/cluster/foundation_integration_single.yml b/salt/control/cluster/infra_integration_single.yml
similarity index 84%
rename from salt/control/cluster/foundation_integration_single.yml
rename to salt/control/cluster/infra_integration_single.yml
index fe8d1b1..d1ef4e0 100644
--- a/salt/control/cluster/foundation_integration_single.yml
+++ b/salt/control/cluster/infra_integration_single.yml
@@ -2,7 +2,7 @@
   salt:
     control:
       size:
-        foundation.integration:
+        infra.integration:
           cpu: 4
           ram: 8192
           disk_profile: small
@@ -15,4 +15,4 @@
             cid01:
               provider: kvm02.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
-              size: foundation.integration
\ No newline at end of file
+              size: infra.integration
\ No newline at end of file
diff --git a/salt/control/cluster/foundation_storage_single.yml b/salt/control/cluster/infra_storage_single.yml
similarity index 85%
rename from salt/control/cluster/foundation_storage_single.yml
rename to salt/control/cluster/infra_storage_single.yml
index f0f1862..5d21054 100644
--- a/salt/control/cluster/foundation_storage_single.yml
+++ b/salt/control/cluster/infra_storage_single.yml
@@ -2,7 +2,7 @@
   salt:
     control:
       size:
-        foundation.storage:
+        infra.storage:
           cpu: 4
           ram: 8192
           disk_profile: xxxlarge
@@ -15,4 +15,4 @@
             sto01:
               provider: kvm02.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
-              size: foundation.storage
\ No newline at end of file
+              size: infra.storage
\ No newline at end of file
diff --git a/salt/control/cluster/foundation_version_control_single.yml b/salt/control/cluster/infra_version_control_single.yml
similarity index 82%
rename from salt/control/cluster/foundation_version_control_single.yml
rename to salt/control/cluster/infra_version_control_single.yml
index 2262eaf..dd40496 100644
--- a/salt/control/cluster/foundation_version_control_single.yml
+++ b/salt/control/cluster/infra_version_control_single.yml
@@ -2,7 +2,7 @@
   salt:
     control:
       size:
-        foundation.version_control:
+        infra.version_control:
           cpu: 4
           ram: 8192
           disk_profile: small
@@ -15,4 +15,4 @@
             git01:
               provider: kvm02.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
-              size: foundation.version_control
\ No newline at end of file
+              size: infra.version_control
\ No newline at end of file