diff --git a/labs/osbash/config/config.compute b/labs/osbash/config/config.compute
index 6030739d..1f05f369 100644
--- a/labs/osbash/config/config.compute
+++ b/labs/osbash/config/config.compute
@@ -9,7 +9,7 @@ FOURTH_OCTET=31
 # Assign network interfaces to networks
 NET_IF_0=nat
 NET_IF_1=MGMT_NET
-NET_IF_2=DATA_NET
+NET_IF_2=TUNNEL_NET
 
 # A default instance within compute uses 512 MB RAM
 VM_MEM=1024
diff --git a/labs/osbash/config/config.network b/labs/osbash/config/config.network
index 991a1aa0..50c43243 100644
--- a/labs/osbash/config/config.network
+++ b/labs/osbash/config/config.network
@@ -9,7 +9,7 @@ FOURTH_OCTET=21
 # Assign network interfaces to networks
 NET_IF_0=nat
 NET_IF_1=MGMT_NET
-NET_IF_2=DATA_NET
+NET_IF_2=TUNNEL_NET
 NET_IF_3=API_NET
 
 # A default instance within network uses 512 MB RAM
diff --git a/labs/osbash/config/openstack b/labs/osbash/config/openstack
index 09e07e15..b1de1950 100644
--- a/labs/osbash/config/openstack
+++ b/labs/osbash/config/openstack
@@ -1,7 +1,5 @@
 # This file contains OpenStack configuration data. It is used by both
 # host (osbash, Windows batch) and VM guest scripts.
-# Follow install guides for more information on the network configuration:
-# http://docs.openstack.org/kilo/install-guide/install/apt/content/ch_basic_environment.html#basics-networking
 
 # one of: icehouse, juno, kilo
 : ${OPENSTACK_RELEASE:=kilo}
@@ -9,9 +7,13 @@
 # CirrOS image URL
 CIRROS_URL="http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img"
 
+#------------------------------------------------------------------------------
+# http://docs.openstack.org/kilo/install-guide/install/apt/content/ch_basic_environment.html#basics-networking
+#------------------------------------------------------------------------------
+
 # Networks used by OpenStack training-labs setup
 : ${MGMT_NET:=10.0.0.1}
-: ${DATA_NET:=10.0.1.1}
+: ${TUNNEL_NET:=10.0.1.1}
 : ${API_NET:=203.0.113.1}
 # FIXME API_NET and EXT_NET should be different networks as soon as our
 #       setup allows it.
@@ -23,6 +25,10 @@ CIRROS_URL="http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img"
 : ${EXTERNAL_NETWORK_GATEWAY:=203.0.113.1}
 : ${EXTERNAL_NETWORK_CIDR:=203.0.113.0/24}
 
+#------------------------------------------------------------------------------
+# http://docs.openstack.org/kilo/install-guide/install/apt/content/neutron_initial-tenant-network.html
+#------------------------------------------------------------------------------
+
 # DEMO_NET
 : ${TENANT_NETWORK_GATEWAY:=192.168.1.1}
 : ${TENANT_NETWORK_CIDR:=192.168.1.0/24}
diff --git a/labs/osbash/lib/functions.guest b/labs/osbash/lib/functions.guest
index 86c92ecf..8fbc8b07 100644
--- a/labs/osbash/lib/functions.guest
+++ b/labs/osbash/lib/functions.guest
@@ -426,7 +426,7 @@ function config_network {
     unset -v NET_IF_0 NET_IF_1 NET_IF_2 NET_IF_3
     source "$CONFIG_DIR/config.$(hostname)"
 
-    # Get API_NET, DATA_NET, MGMT_NET
+    # Get API_NET, TUNNEL_NET, MGMT_NET
     source "$CONFIG_DIR/openstack"
 
     # Iterate over all NET_IF_? variables
diff --git a/labs/osbash/lib/wbatch/batch_for_windows.sh b/labs/osbash/lib/wbatch/batch_for_windows.sh
index 43b4e7b9..4fe1966f 100644
--- a/labs/osbash/lib/wbatch/batch_for_windows.sh
+++ b/labs/osbash/lib/wbatch/batch_for_windows.sh
@@ -171,7 +171,7 @@ function wbatch_create_hostnet {
 
     sed -e "
         s,%APINET%,$API_NET,g;
-        s,%DATANET%,$DATA_NET,g;
+        s,%TUNNELNET%,$TUNNEL_NET,g;
         s,%MGMTNET%,$MGMT_NET,g;
         " "$WBATCH_TEMPLATE_DIR/template-create_hostnet_bat" | wbatch_write_stdin
 
@@ -221,7 +221,7 @@ function wbatch_get_hostif_subst {
         ${MGMT_NET_IF:-""})
             echo 'VirtualBox Host-Only Ethernet Adapter'
             ;;
-        ${DATA_NET_IF:-""})
+        ${TUNNEL_NET_IF:-""})
             echo 'VirtualBox Host-Only Ethernet Adapter #2'
             ;;
         ${API_NET_IF:-""})
diff --git a/labs/osbash/lib/wbatch/template-create_hostnet_bat b/labs/osbash/lib/wbatch/template-create_hostnet_bat
index 867ba0b0..107e6a23 100644
--- a/labs/osbash/lib/wbatch/template-create_hostnet_bat
+++ b/labs/osbash/lib/wbatch/template-create_hostnet_bat
@@ -15,8 +15,8 @@ ECHO VBoxManage hostonlyif create
 VBoxManage hostonlyif create
 IF %errorlevel% NEQ 0 GOTO :vbm_error
 
-ECHO VBoxManage hostonlyif ipconfig "VirtualBox Host-Only Ethernet Adapter #2" --ip %DATANET% --netmask 255.255.255.0
-VBoxManage hostonlyif ipconfig "VirtualBox Host-Only Ethernet Adapter #2" --ip %DATANET% --netmask 255.255.255.0
+ECHO VBoxManage hostonlyif ipconfig "VirtualBox Host-Only Ethernet Adapter #2" --ip %TUNNELNET% --netmask 255.255.255.0
+VBoxManage hostonlyif ipconfig "VirtualBox Host-Only Ethernet Adapter #2" --ip %TUNNELNET% --netmask 255.255.255.0
 IF %errorlevel% NEQ 0 GOTO :vbm_error
 
 ECHO VBoxManage hostonlyif create
diff --git a/labs/osbash/osbash.sh b/labs/osbash/osbash.sh
index dfcc8587..220f572e 100755
--- a/labs/osbash/osbash.sh
+++ b/labs/osbash/osbash.sh
@@ -227,7 +227,7 @@ echo "Building nodes using base disk $(get_base_disk_name)"
 
 ${WBATCH:-:} wbatch_create_hostnet
 MGMT_NET_IF=$(create_network "MGMT_NET")
-DATA_NET_IF=$(create_network "DATA_NET")
+TUNNEL_NET_IF=$(create_network "TUNNEL_NET")
 API_NET_IF=$(create_network "API_NET")
 #-------------------------------------------------------------------------------
 source "$OSBASH_LIB_DIR/$PROVIDER-install_nodes.sh"