diff --git a/nginx/server/proxy/foundation/gerrit.yml b/nginx/server/proxy/infra/gerrit.yml
similarity index 84%
rename from nginx/server/proxy/foundation/gerrit.yml
rename to nginx/server/proxy/infra/gerrit.yml
index 8915b71..13ae180 100644
--- a/nginx/server/proxy/foundation/gerrit.yml
+++ b/nginx/server/proxy/infra/gerrit.yml
@@ -8,7 +8,7 @@
           type: nginx_proxy
           name: gerrit
           proxy:
-            host: ${_param:fuel_version_control_node01_single_address}
+            host: ${_param:infra_version_control_node01_single_address}
             port: 8082
             protocol: http
           host:
diff --git a/nginx/server/proxy/foundation/jenkins.yml b/nginx/server/proxy/infra/jenkins.yml
similarity index 85%
rename from nginx/server/proxy/foundation/jenkins.yml
rename to nginx/server/proxy/infra/jenkins.yml
index 9f10ad7..9d10dae 100644
--- a/nginx/server/proxy/foundation/jenkins.yml
+++ b/nginx/server/proxy/infra/jenkins.yml
@@ -8,7 +8,7 @@
           type: nginx_proxy
           name: jenkins
           proxy:
-            host: ${_param:fuel_integration_node01_single_address}
+            host: ${_param:infra_integration_node01_single_address}
             port: 8080
             protocol: http
           host:
diff --git a/nginx/server/proxy/foundation/sphinx.yml b/nginx/server/proxy/infra/sphinx.yml
similarity index 100%
rename from nginx/server/proxy/foundation/sphinx.yml
rename to nginx/server/proxy/infra/sphinx.yml
diff --git a/reclass/storage/system/monitoring_service_cluster.yml b/reclass/storage/system/monitoring_service_cluster.yml
index d86a218..630ee32 100644
--- a/reclass/storage/system/monitoring_service_cluster.yml
+++ b/reclass/storage/system/monitoring_service_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    monitor_node01_hostname: mon01
+    monitor_node02_hostname: mon02
+    monitor_node03_hostname: mon03
   reclass:
     storage:
       node:
         monitoring_service_node01:
-          name: mon01
+          name: ${_param:monitor_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.monitoring.server
@@ -12,7 +16,7 @@
             linux_system_codename: xenial
             single_address: ${_param:monitoring_service_node01_address}
         monitoring_service_node02:
-          name: mon02
+          name: ${_param:monitor_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.monitoring.server
@@ -21,7 +25,7 @@
             linux_system_codename: xenial
             single_address: ${_param:monitoring_service_node02_address}
         monitoring_service_node03:
-          name: mon03
+          name: ${_param:monitor_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.monitoring.server
diff --git a/reclass/storage/system/monitoring_service_single.yml b/reclass/storage/system/monitoring_service_single.yml
index 42353ef..9680529 100644
--- a/reclass/storage/system/monitoring_service_single.yml
+++ b/reclass/storage/system/monitoring_service_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    monitor_node01_hostname: mon01
   reclass:
     storage:
       node:
         monitoring_service_node01:
-          name: mon01
+          name: ${_param:monitor_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.monitoring.server
diff --git a/reclass/storage/system/opencontrail_analytics_cluster.yml b/reclass/storage/system/opencontrail_analytics_cluster.yml
index f8055a6..6a4b7ee 100644
--- a/reclass/storage/system/opencontrail_analytics_cluster.yml
+++ b/reclass/storage/system/opencontrail_analytics_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    opencontrail_analytics_node01_hostname: nal01
+    opencontrail_analytics_node02_hostname: nal02
+    opencontrail_analytics_node03_hostname: nal03
   reclass:
     storage:
       node:
         opencontrail_analytics_node01:
-          name: nal01
+          name: ${_param:opencontrail_analytics_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.opencontrail.analytics
@@ -14,7 +18,7 @@
             keepalived_vip_priority: 103
             opencontrail_database_id: 1
         opencontrail_analytics_node02:
-          name: nal02
+          name: ${_param:opencontrail_analytics_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:  
           - cluster.${_param:cluster_name}.opencontrail.analytics
@@ -25,7 +29,7 @@
             keepalived_vip_priority: 102
             opencontrail_database_id: 2
         opencontrail_analytics_node03:
-          name: nal03
+          name: ${_param:opencontrail_analytics_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.opencontrail.analytics
diff --git a/reclass/storage/system/opencontrail_control_cluster.yml b/reclass/storage/system/opencontrail_control_cluster.yml
index 0f882a3..a8d916e 100644
--- a/reclass/storage/system/opencontrail_control_cluster.yml
+++ b/reclass/storage/system/opencontrail_control_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    opencontrail_control_node01_hostname: ntw01
+    opencontrail_control_node02_hostname: ntw02
+    opencontrail_control_node03_hostname: ntw03
   reclass:
     storage:
       node:
         opencontrail_control_node01:
-          name: ntw01
+          name: ${_param:opencontrail_control_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.opencontrail.control
@@ -14,7 +18,7 @@
             keepalived_vip_priority: 103
             opencontrail_database_id: 1
         opencontrail_control_node02:
-          name: ntw02
+          name: ${_param:opencontrail_control_node02hostname}
           domain: ${_param:cluster_domain}
           classes:  
           - cluster.${_param:cluster_name}.opencontrail.control
@@ -25,7 +29,7 @@
             keepalived_vip_priority: 102
             opencontrail_database_id: 2
         opencontrail_control_node03:
-          name: ntw03
+          name: ${_param:opencontrail_control_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.opencontrail.control
diff --git a/reclass/storage/system/opencontrail_gateway_single.yml b/reclass/storage/system/opencontrail_gateway_single.yml
index c6ae10f..6c0b871 100644
--- a/reclass/storage/system/opencontrail_gateway_single.yml
+++ b/reclass/storage/system/opencontrail_gateway_single.yml
@@ -1,9 +1,11 @@
 parameters:
   reclass:
+    _param:
+       opencontrail_gateway_hostname: gtw01
     storage:
       node:
         opencontrail_gateway_node01:
-          name: gtw01
+          name: ${_param:opencontrail_gateway_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.opencontrail.gateway
diff --git a/reclass/storage/system/openstack_benchmark_single.yml b/reclass/storage/system/openstack_benchmark_single.yml
index 5c86ba3..4c85d29 100644
--- a/reclass/storage/system/openstack_benchmark_single.yml
+++ b/reclass/storage/system/openstack_benchmark_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    openstack_benchmark_node01_hostname: bmk01
   reclass:
     storage:
       node:
         opencontrail_benchmark_node01:
-          name: bmk01
+          name: ${_param:openstack_benchmark_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.benchmark
diff --git a/reclass/storage/system/openstack_billing_single.yml b/reclass/storage/system/openstack_billing_single.yml
index c0e05c4..5b63ec0 100644
--- a/reclass/storage/system/openstack_billing_single.yml
+++ b/reclass/storage/system/openstack_billing_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    openstack_billing_hostname: bil01
   reclass:
     storage:
       node:
         opencontrail_billing_node01:
-          name: bil01
+          name: ${_param:openstack_billing_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.billing
diff --git a/reclass/storage/system/openstack_compute_multi.yml b/reclass/storage/system/openstack_compute_multi.yml
index 82f465a..0340e9c 100644
--- a/reclass/storage/system/openstack_compute_multi.yml
+++ b/reclass/storage/system/openstack_compute_multi.yml
@@ -1,9 +1,12 @@
 parameters:
+  _param:
+    openstack_compute_node01_hostname: cmp01
+    openstack_compute_node02_hostname: cmp02
   reclass:
     storage:
       node:
         openstack_compute_node01:
-          name: cmp01
+          name: ${_param:openstack_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.compute
@@ -12,7 +15,7 @@
             linux_system_codename: trusty
             single_address: 172.16.10.105
         openstack_compute_node02:
-          name: cmp02
+          name: ${_param:openstack_compute_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.compute
diff --git a/reclass/storage/system/openstack_compute_single.yml b/reclass/storage/system/openstack_compute_single.yml
index 11bb4f5..80758c7 100644
--- a/reclass/storage/system/openstack_compute_single.yml
+++ b/reclass/storage/system/openstack_compute_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    openstack_compute_node01_hostname: cmp01
   reclass:
     storage:
       node:
         openstack_compute_node01:
-          name: cmp01
+          name: ${_param:openstack_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.compute
diff --git a/reclass/storage/system/openstack_control_cluster.yml b/reclass/storage/system/openstack_control_cluster.yml
index 482d826..deb25b8 100644
--- a/reclass/storage/system/openstack_control_cluster.yml
+++ b/reclass/storage/system/openstack_control_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    openstack_control_node01_hostname: ctl01
+    openstack_control_node02_hostname: ctl02
+    openstack_control_node03_hostname: ctl03
   reclass:
     storage:
       node:
         openstack_control_node01:
-          name: ctl01
+          name: ${_param:openstack_control_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.control
@@ -15,7 +19,7 @@
             opencontrail_database_id: 1
             rabbitmq_cluster_role: master
         openstack_control_node02:
-          name: ctl02
+          name: ${_param:openstack_control_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.control
@@ -27,7 +31,7 @@
             opencontrail_database_id: 2
             rabbitmq_cluster_role: slave
         openstack_control_node03:
-          name: ctl03
+          name: ${_param:openstack_control_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.control
diff --git a/reclass/storage/system/openstack_dashboard_single.yml b/reclass/storage/system/openstack_dashboard_single.yml
index 3a9f81a..c2915d3 100644
--- a/reclass/storage/system/openstack_dashboard_single.yml
+++ b/reclass/storage/system/openstack_dashboard_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    openstack_proxy_hostname: prx01
   reclass:
     storage:
       node:
         openstack_proxy_node01:
-          name: prx01
+          name: ${_param:openstack_proxy_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.dashboard
diff --git a/reclass/storage/system/openstack_database_cluster.yml b/reclass/storage/system/openstack_database_cluster.yml
index a46aaec..33c6d24 100644
--- a/reclass/storage/system/openstack_database_cluster.yml
+++ b/reclass/storage/system/openstack_database_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    openstack_database_node01_hostname: dbs01
+    openstack_database_node02_hostname: dbs02
+    openstack_database_node03_hostname: dbs03
   reclass:
     storage:
       node:
         openstack_database_node01:
-          name: dbs01
+          name: ${_param:openstack_database_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.master.cluster
@@ -15,7 +19,7 @@
             keepalived_vip_priority: 103
             mysql_cluster_role: master
         openstack_database_node02:
-          name: dbs02
+          name: ${_param:openstack_database_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:  
           - service.galera.slave.cluster
@@ -27,7 +31,7 @@
             keepalived_vip_priority: 102
             mysql_cluster_role: slave
         openstack_database_node03:
-          name: dbs03
+          name: ${_param:openstack_database_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - service.galera.slave.cluster
diff --git a/reclass/storage/system/openstack_gateway_cluster.yml b/reclass/storage/system/openstack_gateway_cluster.yml
index f4af2b4..30e04ab 100644
--- a/reclass/storage/system/openstack_gateway_cluster.yml
+++ b/reclass/storage/system/openstack_gateway_cluster.yml
@@ -1,9 +1,12 @@
 parameters:
+  _param:
+    openstack_gateway_node01_hostname: gtw01
+    openstack_gateway_node02_hostname: gtw02
   reclass:
     storage:
       node:
         openstack_gateway_node01:
-          name: gtw01
+          name: ${_param:openstack_gateway_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.gateway
@@ -12,7 +15,7 @@
             linux_system_codename: trusty
             single_address: ${_param:openstack_gateway_node01_address}
         openstack_gateway_node02:
-          name: gtw02
+          name: ${_param:openstack_gateway_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.gateway
diff --git a/reclass/storage/system/openstack_gateway_single.yml b/reclass/storage/system/openstack_gateway_single.yml
index 4128f5a..ebb9195 100644
--- a/reclass/storage/system/openstack_gateway_single.yml
+++ b/reclass/storage/system/openstack_gateway_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    openstack_gateway_node01_hostname: gtw01
   reclass:
     storage:
       node:
         openstack_gateway_node01:
-          name: gtw01
+          name: ${_param:openstack_gateway_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.gateway
diff --git a/reclass/storage/system/openstack_message_queue_cluster.yml b/reclass/storage/system/openstack_message_queue_cluster.yml
index ccf811f..c6a811f 100644
--- a/reclass/storage/system/openstack_message_queue_cluster.yml
+++ b/reclass/storage/system/openstack_message_queue_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    openstack_message_queue_node01_hostname: msg01
+    openstack_message_queue_node02_hostname: msg02
+    openstack_message_queue_node03_hostname: msg03
   reclass:
     storage:
       node:
         openstack_message_queue_node01:
-          name: msg01
+          name: ${_param:openstack_message_queue_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.message_queue
@@ -14,7 +18,7 @@
             keepalived_vip_priority: 103
             rabbitmq_cluster_role: master
         openstack_message_queue_node02:
-          name: msg02
+          name: ${_param:openstack_message_queue_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:  
           - cluster.${_param:cluster_name}.openstack.message_queue
@@ -25,7 +29,7 @@
             keepalived_vip_priority: 102
             rabbitmq_cluster_role: slave
         openstack_message_queue_node03:
-          name: msg03
+          name: ${_param:openstack_message_queue_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.message_queue
diff --git a/reclass/storage/system/openstack_proxy_cluster.yml b/reclass/storage/system/openstack_proxy_cluster.yml
index 3e546ed..95439fa 100644
--- a/reclass/storage/system/openstack_proxy_cluster.yml
+++ b/reclass/storage/system/openstack_proxy_cluster.yml
@@ -1,9 +1,12 @@
 parameters:
+  _param:
+    openstack_proxy_node01_hostname: prx01
+    openstack_proxy_node02_hostname: prx02
   reclass:
     storage:
       node:
         openstack_proxy_node01:
-          name: prx01
+          name: ${_param:openstack_proxy_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.proxy
@@ -13,7 +16,7 @@
             single_address: ${_param:openstack_proxy_node01_address}
             keepalived_vip_priority: 102
         openstack_proxy_node02:
-          name: prx02
+          name: ${_param:openstack_proxy_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.proxy
diff --git a/reclass/storage/system/openstack_proxy_single.yml b/reclass/storage/system/openstack_proxy_single.yml
index 4cfcc87..794ca64 100644
--- a/reclass/storage/system/openstack_proxy_single.yml
+++ b/reclass/storage/system/openstack_proxy_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    openstack_proxy_node01_hostname: prx01
   reclass:
     storage:
       node:
         openstack_proxy_node01:
-          name: prx01
+          name: ${_param:openstack_proxy_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.proxy
diff --git a/reclass/storage/system/openstack_telemetry_cluster.yml b/reclass/storage/system/openstack_telemetry_cluster.yml
index dba415c..d184fc9 100644
--- a/reclass/storage/system/openstack_telemetry_cluster.yml
+++ b/reclass/storage/system/openstack_telemetry_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    openstack_telemetry_node01_hostname: mdb01
+    openstack_telemetry_node02_hostname: mdb02
+    openstack_telemetry_node03_hostname: mdb03
   reclass:
     storage:
       node:
         openstack_telemetry_node01:
-          name: mdb01
+          name: ${_param:openstack_telemetry_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.telemetry
@@ -13,7 +17,7 @@
             single_address: ${_param:openstack_telemetry_node01_address}
             keepalived_vip_priority: 103
         openstack_telemetry_node02:
-          name: mdb02
+          name: ${_param:openstack_telemetry_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.telemetry
@@ -23,7 +27,7 @@
             single_address: ${_param:openstack_telemetry_node02_address}
             keepalived_vip_priority: 102
         openstack_telemetry_node03:
-          name: mdb03
+          name: ${_param:openstack_telemetry_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.openstack.telemetry
diff --git a/reclass/storage/system/physical_control_cluster.yml b/reclass/storage/system/physical_control_cluster.yml
index d16d4e5..2d27058 100644
--- a/reclass/storage/system/physical_control_cluster.yml
+++ b/reclass/storage/system/physical_control_cluster.yml
@@ -1,31 +1,35 @@
 parameters:
+  _param:
+    infra_compute_node01_hostname: kvm01
+    infra_compute_node02_hostname: kvm02
+    infra_compute_node03_hostname: kvm03
   reclass:
     storage:
       node:
-        fuel_compute_node01:
-          name: kvm01
+        infra_compute_node01:
+          name: ${_param:infra_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node01_address}
-        fuel_compute_node02:
-          name: kvm02
+            single_address: ${_param:infra_compute_node01_address}
+        infra_compute_node02:
+          name: ${_param:infra_compute_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node02_address}
-        fuel_compute_node03:
-          name: kvm03
+            single_address: ${_param:infra_compute_node02_address}
+        infra_compute_node03:
+          name: ${_param:infra_compute_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node03_address}
+            single_address: ${_param:infra_compute_node03_address}
diff --git a/reclass/storage/system/physical_control_full.yml b/reclass/storage/system/physical_control_full.yml
index d43c1c4..d1dc5c8 100644
--- a/reclass/storage/system/physical_control_full.yml
+++ b/reclass/storage/system/physical_control_full.yml
@@ -1,94 +1,104 @@
 parameters:
+  _param:
+    infra_compute_node01_hostname: kvm01
+    infra_compute_node02_hostname: kvm02
+    infra_compute_node03_hostname: kvm03
+    infra_compute_node04_hostname: kvm04
+    infra_compute_node05_hostname: kvm05
+    infra_compute_node06_hostname: kvm06
+    infra_compute_node07_hostname: kvm07
+    infra_compute_node08_hostname: kvm08
+    infra_compute_node09_hostname: kvm09
   reclass:
     storage:
       node:
-        fuel_compute_node01:
-          name: kvm01
+        infra_compute_node01:
+          name: ${_param:infra_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node01_address}
-            deploy_address: ${_param:fuel_compute_node01_deploy_address}
-        fuel_compute_node02:
-          name: kvm02
+            single_address: ${_param:infra_compute_node01_address}
+            deploy_address: ${_param:infra_compute_node01_deploy_address}
+        infra_compute_node02:
+          name: ${_param:infra_compute_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node02_address}
-            deploy_address: ${_param:fuel_compute_node02_deploy_address}
-        fuel_compute_node03:
-          name: kvm03
+            single_address: ${_param:infra_compute_node02_address}
+            deploy_address: ${_param:infra_compute_node02_deploy_address}
+        infra_compute_node03:
+          name: ${_param:infra_compute_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node03_address}
-            deploy_address: ${_param:fuel_compute_node03_deploy_address}
-        fuel_compute_node04:
-          name: kvm04
+            single_address: ${_param:infra_compute_node03_address}
+            deploy_address: ${_param:infra_compute_node03_deploy_address}
+        infra_compute_node04:
+          name: ${_param:infra_compute_node04_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node04_address}
-            deploy_address: ${_param:fuel_compute_node04_deploy_address}
-        fuel_compute_node05:
-          name: kvm05
+            single_address: ${_param:infra_compute_node04_address}
+            deploy_address: ${_param:infra_compute_node04_deploy_address}
+        infra_compute_node05:
+          name: ${_param:infra_compute_node05_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node05_address}
-            deploy_address: ${_param:fuel_compute_node05_deploy_address}
-        fuel_compute_node06:
-          name: kvm06
+            single_address: ${_param:infra_compute_node05_address}
+            deploy_address: ${_param:infra_compute_node05_deploy_address}
+        infra_compute_node06:
+          name: ${_param:infra_compute_node06_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node06_address}
-            deploy_address: ${_param:fuel_compute_node06_deploy_address}
-        fuel_compute_node07:
-          name: kvm07
+            single_address: ${_param:infra_compute_node06_address}
+            deploy_address: ${_param:infra_compute_node06_deploy_address}
+        infra_compute_node07:
+          name: ${_param:infra_compute_node07_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node07_address}
-            deploy_address: ${_param:fuel_compute_node07_deploy_address}
-        fuel_compute_node08:
-          name: kvm08
+            single_address: ${_param:infra_compute_node07_address}
+            deploy_address: ${_param:infra_compute_node07_deploy_address}
+        infra_compute_node08:
+          name: ${_param:infra_compute_node08_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node08_address}
-            deploy_address: ${_param:fuel_compute_node08_deploy_address}
-        fuel_compute_node09:
-          name: kvm09
+            single_address: ${_param:infra_compute_node08_address}
+            deploy_address: ${_param:infra_compute_node08_deploy_address}
+        infra_compute_node09:
+          name: ${_param:infra_compute_node09_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node09_address}
-            deploy_address: ${_param:fuel_compute_node09_deploy_address}
+            single_address: ${_param:infra_compute_node09_address}
+            deploy_address: ${_param:infra_compute_node09_deploy_address}
diff --git a/reclass/storage/system/physical_control_single.yml b/reclass/storage/system/physical_control_single.yml
index 7767c7e..4d23169 100644
--- a/reclass/storage/system/physical_control_single.yml
+++ b/reclass/storage/system/physical_control_single.yml
@@ -1,14 +1,16 @@
 parameters:
+  _param:
+    infra_compute_node01_hostname: kvm01
   reclass:
     storage:
       node:
-        fuel_compute_node01:
-          name: kvm01
+        infra_compute_node01:
+          name: ${_param:infra_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.fuel.compute
+          - cluster.${_param:cluster_name}.infra.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: trusty
-            single_address: ${_param:fuel_compute_node01_address}
+            single_address: ${_param:infra_compute_node01_address}
 
diff --git a/reclass/storage/system/stacklight_log_cluster.yml b/reclass/storage/system/stacklight_log_cluster.yml
index 15d2c21..4a5da29 100644
--- a/reclass/storage/system/stacklight_log_cluster.yml
+++ b/reclass/storage/system/stacklight_log_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    stacklight_log_node01_hostname: log01
+    stacklight_log_node02_hostname: log02
+    stacklight_log_node03_hostname: log03
   reclass:
     storage:
       node:
         stacklight_log_node01:
-          name: log01
+          name: ${_param:stacklight_log_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.log
@@ -14,7 +18,7 @@
             single_address: ${_param:stacklight_log_node01_address}
             keepalived_vip_priority: 103
         stacklight_log_node02:
-          name: log02
+          name: ${_param:stacklight_log_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.log
@@ -24,7 +28,7 @@
             single_address: ${_param:stacklight_log_node02_address}
             keepalived_vip_priority: 102
         stacklight_log_node03:
-          name: log03
+          name: ${_param:stacklight_log_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.log
diff --git a/reclass/storage/system/stacklight_monitor_cluster.yml b/reclass/storage/system/stacklight_monitor_cluster.yml
index be862f6..9df1a69 100644
--- a/reclass/storage/system/stacklight_monitor_cluster.yml
+++ b/reclass/storage/system/stacklight_monitor_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node02_hostname: mon02
+    stacklight_monitor_node03_hostname: mon03
   reclass:
     storage:
       node:
         stacklight_monitor_node01:
-          name: mon01
+          name: ${_param:stacklight_monitor_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.monitor
@@ -13,7 +17,7 @@
             single_address: ${_param:stacklight_monitor_node01_address}
             keepalived_vip_priority: 103
         stacklight_monitor_node02:
-          name: mon02
+          name: ${_param:stacklight_monitor_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.monitor
@@ -23,7 +27,7 @@
             single_address: ${_param:stacklight_monitor_node02_address}
             keepalived_vip_priority: 102
         stacklight_monitor_node03:
-          name: mon03
+          name: ${_param:stacklight_monitor_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.monitor
diff --git a/reclass/storage/system/stacklight_server_cluster.yml b/reclass/storage/system/stacklight_server_cluster.yml
index 1ffe9b3..a654ea2 100644
--- a/reclass/storage/system/stacklight_server_cluster.yml
+++ b/reclass/storage/system/stacklight_server_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    stacklight_monitor_node01_hostname: mon01
+    stacklight_monitor_node01_hostname: mon02
+    stacklight_monitor_node01_hostname: mon03
   reclass:
     storage:
       node:
         stacklight_server_node01:
-          name: mon01
+          name: ${_param:stacklight_monitor_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.server
@@ -18,7 +22,7 @@
             single_address: ${_param:stacklight_monitor_node01_address}
             keepalived_vip_priority: 103
         stacklight_server_node02:
-          name: mon02
+          name: ${_param:stacklight_monitor_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.server
@@ -28,7 +32,7 @@
             single_address: ${_param:stacklight_monitor_node02_address}
             keepalived_vip_priority: 102
         stacklight_server_node03:
-          name: mon03
+          name: ${_param:stacklight_monitor_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.server
@@ -36,4 +40,4 @@
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
             single_address: ${_param:stacklight_monitor_node03_address}
-            keepalived_vip_priority: 101
+            keepalived_vip_priority: 101
\ No newline at end of file
diff --git a/reclass/storage/system/stacklight_server_single.yml b/reclass/storage/system/stacklight_server_single.yml
index c2237f1..2b397f6 100644
--- a/reclass/storage/system/stacklight_server_single.yml
+++ b/reclass/storage/system/stacklight_server_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    stacklight_monitor_node01_hostname: mon01
   reclass:
     storage:
       node:
         stacklight_server_node01:
-          name: mon01
+          name: ${_param:stacklight_monitor_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.server
diff --git a/reclass/storage/system/stacklight_telemetry_cluster.yml b/reclass/storage/system/stacklight_telemetry_cluster.yml
index 8791b98..12b1dae 100644
--- a/reclass/storage/system/stacklight_telemetry_cluster.yml
+++ b/reclass/storage/system/stacklight_telemetry_cluster.yml
@@ -1,9 +1,13 @@
 parameters:
+  _param:
+    stacklight_telemetry_node01_hostname: mtr01
+    stacklight_telemetry_node02_hostname: mtr02
+    stacklight_telemetry_node03_hostname: mtr03
   reclass:
     storage:
       node:
         stacklight_telemetry_node01:
-          name: mtr01
+          name: ${_param:stacklight_telemetry_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.telemetry
@@ -13,7 +17,7 @@
             single_address: ${_param:stacklight_telemetry_node01_address}
             keepalived_vip_priority: 103
         stacklight_telemetry_node02:
-          name: mtr02
+          name: ${_param:stacklight_telemetry_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.telemetry
@@ -23,7 +27,7 @@
             single_address: ${_param:stacklight_telemetry_node02_address}
             keepalived_vip_priority: 102
         stacklight_telemetry_node03:
-          name: mtr03
+          name: ${_param:stacklight_telemetry_node03_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.telemetry
diff --git a/reclass/storage/system/stacklight_telemetry_single.yml b/reclass/storage/system/stacklight_telemetry_single.yml
index 920c29d..bc51b30 100644
--- a/reclass/storage/system/stacklight_telemetry_single.yml
+++ b/reclass/storage/system/stacklight_telemetry_single.yml
@@ -1,9 +1,11 @@
 parameters:
+  _param:
+    stacklight_telemetry_node01_hostname: mtr01
   reclass:
     storage:
       node:
         stacklight_telemetry_node01:
-          name: mtr01
+          name: ${_param:stacklight_telemetry_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
           - cluster.${_param:cluster_name}.stacklight.telemetry