diff --git a/linux/system/repo-local/contrail.yml b/linux/system/repo_local/contrail.yml
similarity index 100%
rename from linux/system/repo-local/contrail.yml
rename to linux/system/repo_local/contrail.yml
diff --git a/linux/system/repo-local/grafana.yml b/linux/system/repo_local/grafana.yml
similarity index 100%
rename from linux/system/repo-local/grafana.yml
rename to linux/system/repo_local/grafana.yml
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo_local/influxdb.yml
similarity index 65%
copy from linux/system/repo-local/tcpcloud.yml
copy to linux/system/repo_local/influxdb.yml
index f007544..7e3fb93 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/influxdb.yml
@@ -1,10 +1,9 @@
 parameters:
   linux:
     system:
-      repo:
-        tcpcloud:
-          default: true
+      repo:influxdb
+        grafana:
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly influxdb"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/mos8.yml b/linux/system/repo_local/mos8.yml
similarity index 100%
rename from linux/system/repo-local/mos8.yml
rename to linux/system/repo_local/mos8.yml
diff --git a/linux/system/repo-local/mos9.yml b/linux/system/repo_local/mos9.yml
similarity index 100%
rename from linux/system/repo-local/mos9.yml
rename to linux/system/repo_local/mos9.yml
diff --git a/linux/system/repo-local/opencontrail.yml b/linux/system/repo_local/opencontrail.yml
similarity index 100%
rename from linux/system/repo-local/opencontrail.yml
rename to linux/system/repo_local/opencontrail.yml
diff --git a/linux/system/repo-local/openstack.yml b/linux/system/repo_local/openstack.yml
similarity index 100%
rename from linux/system/repo-local/openstack.yml
rename to linux/system/repo_local/openstack.yml
diff --git a/linux/system/repo-local/salt.yml b/linux/system/repo_local/salt.yml
similarity index 100%
rename from linux/system/repo-local/salt.yml
rename to linux/system/repo_local/salt.yml
diff --git a/linux/system/repo-local/salt_formulas.yml b/linux/system/repo_local/salt_formulas.yml
similarity index 100%
rename from linux/system/repo-local/salt_formulas.yml
rename to linux/system/repo_local/salt_formulas.yml
diff --git a/linux/system/repo-local/sensu.yml b/linux/system/repo_local/sensu.yml
similarity index 100%
rename from linux/system/repo-local/sensu.yml
rename to linux/system/repo_local/sensu.yml
diff --git a/linux/system/repo-local/elasticsearch.yml b/linux/system/repo_local/tcp-elastic.yml
similarity index 100%
rename from linux/system/repo-local/elasticsearch.yml
rename to linux/system/repo_local/tcp-elastic.yml
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo_local/tcp-extra.yml
similarity index 79%
rename from linux/system/repo-local/tcpcloud.yml
rename to linux/system/repo_local/tcp-extra.yml
index f007544..5d68de8 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/tcp-extra.yml
@@ -5,6 +5,6 @@
         tcpcloud:
           default: true
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-extra"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo_local/tcp-liberty.yml
similarity index 73%
copy from linux/system/repo-local/tcpcloud.yml
copy to linux/system/repo_local/tcp-liberty.yml
index f007544..389b976 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/tcp-liberty.yml
@@ -3,8 +3,7 @@
     system:
       repo:
         tcpcloud:
-          default: true
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud.yml b/linux/system/repo_local/tcp-salt.yml
similarity index 73%
copy from linux/system/repo-local/tcpcloud.yml
copy to linux/system/repo_local/tcp-salt.yml
index f007544..86ef0ac 100644
--- a/linux/system/repo-local/tcpcloud.yml
+++ b/linux/system/repo_local/tcp-salt.yml
@@ -3,8 +3,7 @@
     system:
       repo:
         tcpcloud:
-          default: true
           refresh_db: ${_param:linux_repo_refresh_db}
-          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-liberty tcp-extra"
+          source: "deb [arch=amd64] http://${_param:local_repo_url}/ubuntu-${_param:linux_system_codename}/ nightly tcp-salt"
           architectures: amd64
           key_url: "http://${_param:local_repo_url}/public.gpg"
diff --git a/linux/system/repo-local/tcpcloud_main.yml b/linux/system/repo_local/tcp.yml
similarity index 100%
rename from linux/system/repo-local/tcpcloud_main.yml
rename to linux/system/repo_local/tcp.yml
diff --git a/linux/system/repo-local/ubuntu-liberty.yml b/linux/system/repo_local/ubuntu-liberty.yml
similarity index 100%
rename from linux/system/repo-local/ubuntu-liberty.yml
rename to linux/system/repo_local/ubuntu-liberty.yml
diff --git a/linux/system/repo-local/ubuntu.yml b/linux/system/repo_local/ubuntu.yml
similarity index 100%
rename from linux/system/repo-local/ubuntu.yml
rename to linux/system/repo_local/ubuntu.yml