diff --git a/linux/system/repo/mcp/apt_mirantis/ceph.yml b/linux/system/repo/mcp/apt_mirantis/ceph.yml
index 12011ac..6c578a9 100644
--- a/linux/system/repo/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo/mcp/apt_mirantis/ceph.yml
@@ -16,7 +16,7 @@
 # Deprecated since 2018.11+
 #parameters:
 #  _param:
-#    linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+#    linux_system_repo_mcp_ceph_version: ${_param:mcp_version}
 #    linux_system_repo_mcp_ceph_codename: luminous
 #  linux:
 #    system:
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
index cd996c7..2d6aa0c 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/2x.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_2x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
index 5156087..c3c0ea1 100644
--- a/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
+++ b/linux/system/repo/mcp/apt_mirantis/elastic/5x.yml
@@ -4,7 +4,7 @@
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_5x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/grafana.yml b/linux/system/repo/mcp/apt_mirantis/grafana.yml
index 755347b..73f8d15 100644
--- a/linux/system/repo/mcp/apt_mirantis/grafana.yml
+++ b/linux/system/repo/mcp/apt_mirantis/grafana.yml
@@ -2,7 +2,7 @@
 # Will be removed in 2018q4
 #parameters:
 #  _param:
-#    linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
+#    linux_system_repo_mcp_grafana_version: ${_param:mcp_version}
 #  linux:
 #    system:
 #      repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
index 219c0dc..4389579 100644
--- a/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
+++ b/linux/system/repo/mcp/apt_mirantis/kibana/46.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.keystorage.elasticsearch
 parameters:
   _param:
-    linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_kibana_46_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/openstack.yml b/linux/system/repo/mcp/apt_mirantis/openstack.yml
index c1483ac..381e37b 100644
--- a/linux/system/repo/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo/mcp/apt_mirantis/openstack.yml
@@ -16,7 +16,7 @@
 # DEPRECATED since 2018.10+ release.
 #parameters:
 #  _param:
-#    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+#    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
 #  linux:
 #    system:
 #      repo:
diff --git a/linux/system/repo/mcp/apt_mirantis/sensu.yml b/linux/system/repo/mcp/apt_mirantis/sensu.yml
index fe2ad07..89e1501 100644
--- a/linux/system/repo/mcp/apt_mirantis/sensu.yml
+++ b/linux/system/repo/mcp/apt_mirantis/sensu.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_sensu_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_sensu_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/contrail.yml b/linux/system/repo/mcp/contrail.yml
index 18b7cfb..3211f78 100644
--- a/linux/system/repo/mcp/contrail.yml
+++ b/linux/system/repo/mcp/contrail.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     linux_repo_contrail_component: oc311
-    linux_system_repo_mcp_contrail_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_contrail_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/extra.yml b/linux/system/repo/mcp/extra.yml
index abd6948..b4004da 100644
--- a/linux/system/repo/mcp/extra.yml
+++ b/linux/system/repo/mcp/extra.yml
@@ -2,7 +2,7 @@
 - system.linux.system.repo.keystorage.mirantis_com
 parameters:
   _param:
-    linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_extra_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
index 3e82a68..74e31f4 100644
--- a/linux/system/repo/mcp/openstack.yml
+++ b/linux/system/repo/mcp/openstack.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/salt/init.yml b/linux/system/repo/mcp/salt/init.yml
index 17fd50b..3430a5c 100644
--- a/linux/system/repo/mcp/salt/init.yml
+++ b/linux/system/repo/mcp/salt/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_salt_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_salt_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo/mcp/updates.yml b/linux/system/repo/mcp/updates.yml
index 870d8d2..d60e17c 100644
--- a/linux/system/repo/mcp/updates.yml
+++ b/linux/system/repo/mcp/updates.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_updates_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_updates_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/ceph.yml b/linux/system/repo_local/ceph.yml
index d28c0b6..1817909 100644
--- a/linux/system/repo_local/ceph.yml
+++ b/linux/system/repo_local/ceph.yml
@@ -4,6 +4,6 @@
       repo:
         ceph:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} ceph-mirantis"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} ceph-mirantis"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/docker.yml b/linux/system/repo_local/docker.yml
index 6254dec..e739f36 100644
--- a/linux/system/repo_local/docker.yml
+++ b/linux/system/repo_local/docker.yml
@@ -6,6 +6,6 @@
       repo:
         docker:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} docker"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} docker"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/docker_legacy.yml b/linux/system/repo_local/docker_legacy.yml
index 3df198f..98ef1f1 100644
--- a/linux/system/repo_local/docker_legacy.yml
+++ b/linux/system/repo_local/docker_legacy.yml
@@ -6,6 +6,6 @@
       repo:
         docker:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} docker-legacy"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} docker-legacy"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/elasticsearch.yml b/linux/system/repo_local/elasticsearch.yml
index 8dc78aa..168cc04 100644
--- a/linux/system/repo_local/elasticsearch.yml
+++ b/linux/system/repo_local/elasticsearch.yml
@@ -4,6 +4,6 @@
       repo:
         elasticsearch:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:apt_mk_version} elastic"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:mcp_version} elastic"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/glusterfs.yml b/linux/system/repo_local/glusterfs.yml
index 5d0ecd3..b3bb6c3 100644
--- a/linux/system/repo_local/glusterfs.yml
+++ b/linux/system/repo_local/glusterfs.yml
@@ -6,6 +6,6 @@
       repo:
         glusterfs:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} glusterfs"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} glusterfs"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/grafana.yml b/linux/system/repo_local/grafana.yml
index f2d9ad5..59ef857 100644
--- a/linux/system/repo_local/grafana.yml
+++ b/linux/system/repo_local/grafana.yml
@@ -4,6 +4,6 @@
       repo:
         grafana:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} grafana"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} grafana"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/influxdb.yml b/linux/system/repo_local/influxdb.yml
index 1c641bb..08c06fc 100644
--- a/linux/system/repo_local/influxdb.yml
+++ b/linux/system/repo_local/influxdb.yml
@@ -4,6 +4,6 @@
       repo:
         influxdb:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} influxdb"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} influxdb"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/maas.yml b/linux/system/repo_local/maas.yml
index 1a5b487..23605d6 100644
--- a/linux/system/repo_local/maas.yml
+++ b/linux/system/repo_local/maas.yml
@@ -6,6 +6,6 @@
       repo:
         maas:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:apt_mk_version} maas"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:linux_system_codename}/ ${_param:mcp_version} maas"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/mcp/apt_mirantis/aptly.yml b/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
index ee248a0..852e280 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/aptly.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_aptly_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_aptly_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml b/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
index c3a00c6..67f95ad 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/cassandra.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_cassandra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_cassandra_version: ${_param:mcp_version}
     linux_system_repo_mcp_cassandra_version_number: "21x"
   linux:
     system:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/ceph.yml b/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
index f0380cb..bfb3897 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/ceph.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_ceph_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_ceph_version: ${_param:mcp_version}
     linux_system_repo_mcp_ceph_codename: luminous
   linux:
     system:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/docker.yml b/linux/system/repo_local/mcp/apt_mirantis/docker.yml
index 638fb0c..16f0645 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/docker.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/docker.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_docker_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_docker_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml b/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
index 887f8fd..6cdbe7c 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/docker_legacy.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_docker_legacy_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_docker_legacy_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
index 63e2717..4fb0d78 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/2x.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_2x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_2x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
index b04886e..b578d8b 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/elastic/5x.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_elastic_5x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_elastic_5x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
index ad1fb6c..417c86c 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/fluentd.yml
@@ -1,11 +1,11 @@
 parameters:
   _param:
-    linux_system_repo_mcp_fluentd_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_fluentd_version: ${_param:mcp_version}
   linux:
     system:
       repo:
         mcp_fluentd:
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/fluentd ${_param:apt_mk_version} contrib"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/fluentd ${_param:mcp_version} contrib"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
           clean_file: true
diff --git a/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
index b1eceed..0aacbfa 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/glusterfs.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_glusterfs_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_glusterfs_version: ${_param:mcp_version}
     linux_system_repo_mcp_glusterfs_version_number: "3.8"
   linux:
     system:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/grafana.yml b/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
index d924500..98a80b0 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/grafana.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_grafana_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_grafana_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml b/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
index e99664d..c770f1e 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/influxdb.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_influxdb_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_influxdb_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
index 799c0a2..9f4ec80 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/46.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_kibana_46_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_kibana_46_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
index 59410f4..f4aaa5a 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/kibana/5x.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_kibana_5x_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_kibana_5x_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/maas.yml b/linux/system/repo_local/mcp/apt_mirantis/maas.yml
index 0c9b2eb..1de20dc 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/maas.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/maas.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_maas_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_maas_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/openstack.yml b/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
index 2a40b38..d50a759 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/openstack.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
index 181ec40..76c6ea1 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/saltstack.yml
@@ -3,7 +3,7 @@
 parameters:
   _param:
     salt_version: 2017.7
-    linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_saltstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml b/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
index be21433..efb215f 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/saltstack_2016_3.yml
@@ -2,7 +2,7 @@
 # Please use system/repo/mcp/apt_mirantis
 parameters:
   _param:
-    linux_system_repo_mcp_saltstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_saltstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/sensu.yml b/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
index a634cd6..f662d88 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/sensu.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_extra_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
index 483006e..b6d721d 100644
--- a/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
+++ b/linux/system/repo_local/mcp/apt_mirantis/ubuntu.yml
@@ -10,16 +10,16 @@
       repo:
         ubuntu:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename} main universe restricted"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:mcp_version}/ubuntu ${_param:linux_system_codename} main universe restricted"
           architectures: amd64
           default: true
         ubuntu_updates:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:mcp_version}/ubuntu ${_param:linux_system_codename}-updates main universe restricted"
           architectures: amd64
           default: true
         ubuntu_security:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:apt_mk_version}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/${_param:mcp_version}/ubuntu ${_param:linux_system_codename}-security main universe restricted"
           architectures: amd64
           default: true
diff --git a/linux/system/repo_local/mcp/ceph.yml b/linux/system/repo_local/mcp/ceph.yml
index 89308ad..31b60ba 100644
--- a/linux/system/repo_local/mcp/ceph.yml
+++ b/linux/system/repo_local/mcp/ceph.yml
@@ -4,6 +4,6 @@
       repo:
         ceph:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} ceph"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} ceph"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo_local/mcp/contrail.yml b/linux/system/repo_local/mcp/contrail.yml
index 1443a4d..0f16826 100644
--- a/linux/system/repo_local/mcp/contrail.yml
+++ b/linux/system/repo_local/mcp/contrail.yml
@@ -2,7 +2,7 @@
   _param:
     linux_repo_contrail_component: oc311
     contrail_repo_pin_priority: 200
-    linux_system_repo_mcp_contrail_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_contrail_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/extra.yml b/linux/system/repo_local/mcp/extra.yml
index fd90ef9..26972a4 100644
--- a/linux/system/repo_local/mcp/extra.yml
+++ b/linux/system/repo_local/mcp/extra.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_extra_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_extra_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/openstack.yml b/linux/system/repo_local/mcp/openstack.yml
index 7818ef1..bd4a9b4 100644
--- a/linux/system/repo_local/mcp/openstack.yml
+++ b/linux/system/repo_local/mcp/openstack.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mk_openstack_version: ${_param:apt_mk_version}
+    linux_system_repo_mk_openstack_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/salt/init.yml b/linux/system/repo_local/mcp/salt/init.yml
index 44a382d..79a4e8d 100644
--- a/linux/system/repo_local/mcp/salt/init.yml
+++ b/linux/system/repo_local/mcp/salt/init.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_salt_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_salt_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/mcp/updates.yml b/linux/system/repo_local/mcp/updates.yml
index e5915ff..7348110 100644
--- a/linux/system/repo_local/mcp/updates.yml
+++ b/linux/system/repo_local/mcp/updates.yml
@@ -1,6 +1,6 @@
 parameters:
   _param:
-    linux_system_repo_mcp_updates_version: ${_param:apt_mk_version}
+    linux_system_repo_mcp_updates_version: ${_param:mcp_version}
   linux:
     system:
       repo:
diff --git a/linux/system/repo_local/sensu.yml b/linux/system/repo_local/sensu.yml
index 67750cf..2e56fbd 100644
--- a/linux/system/repo_local/sensu.yml
+++ b/linux/system/repo_local/sensu.yml
@@ -4,6 +4,6 @@
       repo:
         sensu:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:apt_mk_version} sensu"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ ${_param:mcp_version} sensu"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"