diff --git a/tcp_tests/templates/common-services/virtual_mcp10_ovs-common-services.yaml b/tcp_tests/templates/common-services/virtual-mcp10-ovs-common-services.yaml
similarity index 98%
rename from tcp_tests/templates/common-services/virtual_mcp10_ovs-common-services.yaml
rename to tcp_tests/templates/common-services/virtual-mcp10-ovs-common-services.yaml
index e8063a8..3cf252a 100644
--- a/tcp_tests/templates/common-services/virtual_mcp10_ovs-common-services.yaml
+++ b/tcp_tests/templates/common-services/virtual-mcp10-ovs-common-services.yaml
@@ -1,4 +1,4 @@
-{% from 'virtual_mcp10_ovs.jinja' import HOSTNAME_CFG01 with context %}
+{% from 'virtual-mcp10-ovs.jinja' import HOSTNAME_CFG01 with context %}
 
 # Install support services
 
diff --git a/tcp_tests/templates/openstack/virtual_mcp10_ovs-openstack.yaml b/tcp_tests/templates/openstack/virtual-mcp10-ovs-openstack.yaml
similarity index 98%
rename from tcp_tests/templates/openstack/virtual_mcp10_ovs-openstack.yaml
rename to tcp_tests/templates/openstack/virtual-mcp10-ovs-openstack.yaml
index 5ad1b34..4a39fcb 100644
--- a/tcp_tests/templates/openstack/virtual_mcp10_ovs-openstack.yaml
+++ b/tcp_tests/templates/openstack/virtual-mcp10-ovs-openstack.yaml
@@ -1,4 +1,4 @@
-{% from 'virtual_mcp10_ovs.jinja' import HOSTNAME_CFG01 with context %}
+{% from 'virtual-mcp10-ovs.jinja' import HOSTNAME_CFG01 with context %}
 
 # Install OpenStack control services
 
diff --git a/tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
similarity index 99%
rename from tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml
rename to tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
index 722d321..198cac7 100644
--- a/tcp_tests/templates/salt/virtual_mcp10_ovs-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
@@ -1,4 +1,4 @@
-{% from 'virtual_mcp10_ovs.jinja' import HOSTNAME_CFG01 with context %}
+{% from 'virtual-mcp10-ovs.jinja' import HOSTNAME_CFG01 with context %}
 
 # Install salt to the config node
 
diff --git a/tcp_tests/templates/underlay/virtual_mcp10_ovs--meta-data.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--meta-data.yaml
similarity index 100%
rename from tcp_tests/templates/underlay/virtual_mcp10_ovs--meta-data.yaml
rename to tcp_tests/templates/underlay/virtual-mcp10-ovs--meta-data.yaml
diff --git a/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data-cfg01.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data-cfg01.yaml
similarity index 100%
rename from tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data-cfg01.yaml
rename to tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data-cfg01.yaml
diff --git a/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1404.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml
similarity index 100%
rename from tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1404.yaml
rename to tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1404.yaml
diff --git a/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
similarity index 98%
rename from tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml
rename to tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
index ea71321..26c21d8 100644
--- a/tcp_tests/templates/underlay/virtual_mcp10_ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
@@ -25,6 +25,8 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
   runcmd:
+   - export TERM=linux
+   - export LANG=C
    # Configure dhclient
    - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
    - sudo resolvconf -u
diff --git a/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
similarity index 92%
rename from tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
rename to tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
index a946d3b..ece6e22 100644
--- a/tcp_tests/templates/underlay/virtual_mcp10_ovs.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs.yaml
@@ -15,7 +15,7 @@
 
 template:
   devops_settings:
-    env_name: {{ os_env('ENV_NAME', 'virtual_mcp10_ovs') }}
+    env_name: {{ os_env('ENV_NAME', 'virtual-mcp10-ovs') }}
 
     address_pools:
       admin-pool01:
@@ -158,8 +158,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data-cfg01.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data-cfg01.yaml
 
               interfaces:
                 - label: ens3
@@ -199,8 +199,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data1404.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data1404.yaml
 
               interfaces: &interfaces
                 - label: eth0
@@ -240,8 +240,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data1404.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data1404.yaml
 
               interfaces: *interfaces
               network_config: *network_config
@@ -269,8 +269,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data1404.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data1404.yaml
 
               interfaces: *interfaces
               network_config: *network_config
@@ -298,8 +298,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data1404.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data1404.yaml
 
               interfaces: *interfaces
               network_config: *network_config
@@ -325,8 +325,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data1604.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data1604.yaml
 
 
               interfaces: &all_interfaces
@@ -376,8 +376,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data1604.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data1604.yaml
 
               interfaces: *all_interfaces
               network_config: *all_network_config
@@ -402,8 +402,8 @@
                   format: raw
                   device: cdrom
                   bus: ide
-                  cloudinit_meta_data: !include virtual_mcp10_ovs--meta-data.yaml
-                  cloudinit_user_data: !include virtual_mcp10_ovs--user-data1604.yaml
+                  cloudinit_meta_data: !include virtual-mcp10-ovs--meta-data.yaml
+                  cloudinit_user_data: !include virtual-mcp10-ovs--user-data1604.yaml
 
               interfaces: *all_interfaces
               network_config: *all_network_config
diff --git a/tcp_tests/templates/virtual_mcp10_ovs.jinja b/tcp_tests/templates/virtual-mcp10-ovs.jinja
similarity index 100%
rename from tcp_tests/templates/virtual_mcp10_ovs.jinja
rename to tcp_tests/templates/virtual-mcp10-ovs.jinja