8 files changed, 8 insertions, 8 deletions
diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index 74a180bd0..b2d5d1f01 100755
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             # sleep up to 3 minutes to avoid disk contention\
             sleep $((RANDOM / 200))\
             mkdir -p /etc/docker\
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index 516312ba9..3071356e6 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -84,7 +84,7 @@ parameters:
   sdnc_ip_addr: 172.16.7.1
   vid_ip_addr: 172.16.8.1
   clamp_ip_addr: 172.16.12.1
-  openo_ip_addr: 172.16.14.1
+  multiserv_ip_addr: 172.16.14.1
   music_ip_addr: 172.16.15.1
   oof_ip_addr: 172.16.16.1
   aaf_ip_addr: 172.16.13.1
diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index 6fec3d03e..1e2ccd6c2 100755
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index ee4f229d1..c682dc5cf 100644
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -84,7 +84,7 @@ parameters:
   sdnc_ip_addr: 172.16.7.1
   vid_ip_addr: 172.16.8.1
   clamp_ip_addr: 172.16.12.1
-  openo_ip_addr: 172.16.14.1
+  multiserv_ip_addr: 172.16.14.1
   music_ip_addr: 172.16.15.1
   oof_ip_addr: 172.16.16.1
   aaf_ip_addr: 172.16.13.1
diff --git a/test/ete/labs/tlab/apt-proxy.sh b/test/ete/labs/tlab/apt-proxy.sh
index 3cf547452..9203844fc 100755
--- a/test/ete/labs/tlab/apt-proxy.sh
+++ b/test/ete/labs/tlab/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env
index 6f5b9607d..feded7faf 100644
--- a/test/ete/labs/tlab/onap-openstack-template.env
+++ b/test/ete/labs/tlab/onap-openstack-template.env
@@ -85,7 +85,7 @@ parameters:
   sdnc_ip_addr: 10.0.7.1
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
-  openo_ip_addr: 10.0.14.1
+  multiserv_ip_addr: 10.0.14.1
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1
diff --git a/test/ete/labs/windriver/apt-proxy.sh b/test/ete/labs/windriver/apt-proxy.sh
index 365b5d015..13c8221b4 100755
--- a/test/ete/labs/windriver/apt-proxy.sh
+++ b/test/ete/labs/windriver/apt-proxy.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-sed -i '/#!\/bin\/bash/a\
+sed -i '/^            #!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 1e333cc7f..b18bd62c1 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -84,7 +84,7 @@ parameters:
   sdnc_ip_addr: 10.0.7.1
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
-  openo_ip_addr: 10.0.14.1
+  multiserv_ip_addr: 10.0.14.1
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1