diff --git a/integrations/docker/hello.lua b/integrations/docker/hello.lua
new file mode 100644
index 0000000..59a2dea
--- /dev/null
+++ b/integrations/docker/hello.lua
@@ -0,0 +1,3 @@
+local msg = "welcome to the machine!"
+redis.call("SET", "msg", msg)
+return redis.call("GET", "msg")
diff --git a/integrations/docker/monitor_dockerfile b/integrations/docker/monitor_dockerfile
new file mode 100644
index 0000000..e6cd65a
--- /dev/null
+++ b/integrations/docker/monitor_dockerfile
@@ -0,0 +1,28 @@
+# ZT Network Containers Test Monitor
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+RUN yum -y install redis-3.0.4-1.fc23.x86_64
+
+EXPOSE 9993/udp
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD monitor_identity.public /var/lib/zerotier-one/identity.public
+ADD monitor_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+ADD hello.lua /
+
+ADD zerotier-one /
+ADD zerotier-cli /
+
+# Start ZeroTier-One
+ADD monitor_entrypoint.sh /monitor_entrypoint.sh
+RUN chmod -v +x /monitor_entrypoint.sh
+CMD ["./monitor_entrypoint.sh"]
diff --git a/integrations/docker/monitor_entrypoint.sh b/integrations/docker/monitor_entrypoint.sh
new file mode 100644
index 0000000..087f50b
--- /dev/null
+++ b/integrations/docker/monitor_entrypoint.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+netcon_wait_time=25 # wait for test container to come online
+app_timeout_time=15 # app-specific timeout
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+fail=FAIL. # appended to result file in event of failure
+ok=OK. # appended to result file in event of success
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test Monitor'
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-one -d -U -p9993 >>/tmp/zerotier-one.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+done
+echo '*** Starting Test...'
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$netcon_wait_time"s
+ncvirtip=$(<$address_file)
+
+
+# --- Test section ---
+echo '*** Running lua script against redis host at' $ncvirtip
+redis-cli -h $ncvirtip EVAL "$(cat hello.lua)" 0 > redis_response.txt
+response_string=$(<redis_response.txt)
+
+if [[ $response_string == *"welcome to the machine!"* ]]
+then
+	echo 'REDIS RESPONSE OK'
+	touch "$file_path$ok$test_name.txt"
+	printf 'Test: redis-server responded!\n' >> "$file_path$ok$test_name.txt"
+else
+	echo 'REDIS RESPONSE FAIL'
+	touch "$file_path$fail$test_name.txt"
+	printf 'Test: redis server did NOT respond!\n' >> "$file_path$fail$test_name.txt"
+fi
+
+
+
+
diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile b/integrations/docker/sdk_dockerfile
similarity index 100%
rename from tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_dockerfile
rename to integrations/docker/sdk_dockerfile
diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh b/integrations/docker/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/redis/redis-3.0.4-1.fc23.x86_64/netcon_entrypoint.sh
rename to integrations/docker/sdk_entrypoint.sh
diff --git a/tests/docker/_build_single_image.sh b/tests/docker/_build_single_image.sh
index be02571..bbfcd64 100755
--- a/tests/docker/_build_single_image.sh
+++ b/tests/docker/_build_single_image.sh
@@ -12,12 +12,12 @@ cp ../../zerotier-cli zerotier-sdk-service
 cp ../../zerotier-intercept zerotier-intercept
 cp ../../libzerotierintercept.so libzerotierintercept.so
 cp ../../liblwip.so liblwip.so
-cp ../../netcon_identity.public netcon_identity.public
-cp ../../netcon_identity.secret netcon_identity.secret
+cp ../../sdk_identity.public sdk_identity.public
+cp ../../sdk_identity.secret sdk_identity.secret
 cp ../../monitor_identity.public monitor_identity.public
 cp ../../monitor_identity.secret monitor_identity.secret
 
-docker build --tag="$test_name" -f netcon_dockerfile .
+docker build --tag="$test_name" -f sdk_dockerfile .
 docker build --tag="$test_name"_monitor -f monitor_dockerfile .
 
 rm -f zerotier-cli
diff --git a/tests/docker/_two_party_test.sh b/tests/docker/_two_party_test.sh
index 8fa3b3e..461157a 100755
--- a/tests/docker/_two_party_test.sh
+++ b/tests/docker/_two_party_test.sh
@@ -7,8 +7,8 @@ touch "$test_name".name
 test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
 monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
 
-echo "waiting $netcon_test_wait_time for test to complete."
-sleep $netcon_test_wait_time
+echo "waiting $sdk_test_wait_time for test to complete."
+sleep $sdk_test_wait_time
 docker stop $(docker ps -a -q)
 docker rm $test_container
 docker rm $monitor_container
diff --git a/tests/docker/build_tests.sh b/tests/docker/build_tests.sh
index 65009f1..8bfb281 100755
--- a/tests/docker/build_tests.sh
+++ b/tests/docker/build_tests.sh
@@ -6,7 +6,7 @@
 rm _results/*.txt 
 
 # How long we shall wait for each test to conclude
-export netcon_test_wait_time=60s
+export sdk_test_wait_time=60s
 
 export image_build_script=_build_single_image.sh
 
diff --git a/tests/docker/build_zt.sh b/tests/docker/build_zt.sh
index e168c70..6534ca2 100755
--- a/tests/docker/build_zt.sh
+++ b/tests/docker/build_zt.sh
@@ -6,8 +6,8 @@
 cd ../../
 make clean
 make one
-make netcon
-cd netcon/docker-test
+make sdk
+cd sdk/docker-test
 
 cp ../../zerotier-cli zerotier-cli
 cp ../../zerotier-sdk-service zerotier-sdk-service
diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile
similarity index 73%
rename from tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile
rename to tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile
index be45428..3691246 100644
--- a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_dockerfile
+++ b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -29,8 +29,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh b/tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/darkhttpd/darkhttpd-1.11.x86_64/netcon_entrypoint.sh
rename to tests/docker/darkhttpd/darkhttpd-1.11.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile
similarity index 74%
rename from tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
rename to tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile
index 3bff6c3..47c12f3 100644
--- a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_dockerfile
+++ b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -29,8 +29,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/netcon_entrypoint.sh
rename to tests/docker/httpd/httpd-2.4.16-1.fc23.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile
similarity index 75%
rename from tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile
rename to tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile
index 5b66f98..6dcb8b7 100644
--- a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_dockerfile
+++ b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_dockerfile
@@ -12,8 +12,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -30,8 +30,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh b/tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/netcon_entrypoint.sh
rename to tests/docker/httpd/httpd-2.4.16-1.ub14.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/_two_party_test.sh b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/_two_party_test.sh
index 8fa3b3e..461157a 100755
--- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/_two_party_test.sh
+++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/_two_party_test.sh
@@ -7,8 +7,8 @@ touch "$test_name".name
 test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
 monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
 
-echo "waiting $netcon_test_wait_time for test to complete."
-sleep $netcon_test_wait_time
+echo "waiting $sdk_test_wait_time for test to complete."
+sleep $sdk_test_wait_time
 docker stop $(docker ps -a -q)
 docker rm $test_container
 docker rm $monitor_container
diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile
similarity index 74%
rename from tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile
rename to tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile
index b12c62b..b240910 100644
--- a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_dockerfile
+++ b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -29,8 +29,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/netcon_entrypoint.sh
rename to tests/docker/httpd/httpd-2.4.18-1.fc23.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh b/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh
index 79d4391..965fadb 100644
--- a/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh
+++ b/tests/docker/httpd/httpd_demo/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=25 # wait for test container to come online
+sdk_wait_time=25 # wait for test container to come online
 app_timeout_time=15 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -41,8 +41,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/httpd/httpd_demo/netcon_dockerfile b/tests/docker/httpd/httpd_demo/sdk_dockerfile
similarity index 77%
rename from tests/docker/httpd/httpd_demo/netcon_dockerfile
rename to tests/docker/httpd/httpd_demo/sdk_dockerfile
index 81911d8..53b63d5 100644
--- a/tests/docker/httpd/httpd_demo/netcon_dockerfile
+++ b/tests/docker/httpd/httpd_demo/sdk_dockerfile
@@ -21,8 +21,8 @@ RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -30,8 +30,8 @@ ADD *.name /
 ADD zerotier-cli /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Install LWIP library used by service
 ADD liblwip.so /
@@ -39,4 +39,4 @@ RUN mkdir -p ext/bin/lwip
 RUN cp liblwip.so ext/bin/lwip/liblwip.so
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/httpd/httpd_demo/netcon_entrypoint.sh b/tests/docker/httpd/httpd_demo/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/httpd/httpd_demo/netcon_entrypoint.sh
rename to tests/docker/httpd/httpd_demo/sdk_entrypoint.sh
diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile
similarity index 76%
rename from tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile
rename to tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile
index f9ab870..be5b90c 100644
--- a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_dockerfile
+++ b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_dockerfile
@@ -14,8 +14,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -32,10 +32,10 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 ADD nginx.conf_ /
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh b/tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/netcon_entrypoint.sh
rename to tests/docker/nginx/nginx-1.4.6-1.ub14.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh
index 8fa3b3e..461157a 100755
--- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh
+++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/_two_party_test.sh
@@ -7,8 +7,8 @@ touch "$test_name".name
 test_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name":latest)
 monitor_container=$(docker run -d -it -v $PWD/../../_results:/opt/results --device=/dev/net/tun "$test_name"_monitor:latest)
 
-echo "waiting $netcon_test_wait_time for test to complete."
-sleep $netcon_test_wait_time
+echo "waiting $sdk_test_wait_time for test to complete."
+sleep $sdk_test_wait_time
 docker stop $(docker ps -a -q)
 docker rm $test_container
 docker rm $monitor_container
diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile
similarity index 74%
rename from tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
rename to tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile
index 032a815..c26bb85 100644
--- a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_dockerfile
+++ b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -29,10 +29,10 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 ADD nginx.conf_ /
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/netcon_entrypoint.sh
rename to tests/docker/nginx/nginx-1.8.0-13.fc23.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile
similarity index 74%
rename from tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
rename to tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile
index c34b7a5..612d801 100644
--- a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_dockerfile
+++ b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -29,10 +29,10 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 ADD nginx.conf_ /
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/netcon_entrypoint.sh
rename to tests/docker/nginx/nginx-1.8.0-14.fc23.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
index 1701a46..2ac1381 100644
--- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
+++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=25 # wait for test container to come online
+sdk_wait_time=25 # wait for test container to come online
 app_timeout_time=15 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -30,8 +30,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile
similarity index 74%
rename from tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
rename to tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile
index 6be174f..56c7518 100644
--- a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_dockerfile
+++ b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp 8080/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -32,8 +32,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh b/tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/nodejs/nodejs-0.10.36-4.fc23/netcon_entrypoint.sh
rename to tests/docker/nodejs/nodejs-0.10.36-4.fc23/sdk_entrypoint.sh
diff --git a/tests/docker/python/python/monitor_entrypoint.sh b/tests/docker/python/python/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/python/python/monitor_entrypoint.sh
+++ b/tests/docker/python/python/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/python/python/netcon_dockerfile b/tests/docker/python/python/sdk_dockerfile
similarity index 73%
rename from tests/docker/python/python/netcon_dockerfile
rename to tests/docker/python/python/sdk_dockerfile
index 9fff880..2f93fd9 100644
--- a/tests/docker/python/python/netcon_dockerfile
+++ b/tests/docker/python/python/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -29,8 +29,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/python/python/netcon_entrypoint.sh b/tests/docker/python/python/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/python/python/netcon_entrypoint.sh
rename to tests/docker/python/python/sdk_entrypoint.sh
diff --git a/tests/docker/python/python3/monitor_entrypoint.sh b/tests/docker/python/python3/monitor_entrypoint.sh
index c8fca5a..b57a317 100644
--- a/tests/docker/python/python3/monitor_entrypoint.sh
+++ b/tests/docker/python/python3/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=35 # wait for test container to come online
+sdk_wait_time=35 # wait for test container to come online
 app_timeout_time=25 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/python/python3/netcon_dockerfile b/tests/docker/python/python3/sdk_dockerfile
similarity index 72%
rename from tests/docker/python/python3/netcon_dockerfile
rename to tests/docker/python/python3/sdk_dockerfile
index a31c4fb..12f7afc 100644
--- a/tests/docker/python/python3/netcon_dockerfile
+++ b/tests/docker/python/python3/sdk_dockerfile
@@ -10,8 +10,8 @@ EXPOSE 9993/udp 80/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -28,8 +28,8 @@ ADD zerotier-cli /
 ADD zerotier-sdk-service /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/python/python3/netcon_entrypoint.sh b/tests/docker/python/python3/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/python/python3/netcon_entrypoint.sh
rename to tests/docker/python/python3/sdk_entrypoint.sh
diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
index 087f50b..81b054c 100644
--- a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=25 # wait for test container to come online
+sdk_wait_time=25 # wait for test container to come online
 app_timeout_time=15 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -30,8 +30,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile
new file mode 100644
index 0000000..5a18cb9
--- /dev/null
+++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_dockerfile
@@ -0,0 +1,36 @@
+# ZT Network Containers Test
+FROM fedora:23
+MAINTAINER https://www.zerotier.com/
+
+# Install apps
+RUN yum -y update
+RUN yum -y install redis-3.0.4-1.fc23.x86_64
+RUN yum clean all
+
+# Add ZT files
+RUN mkdir -p /var/lib/zerotier-one/networks.d
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
+ADD *.conf /var/lib/zerotier-one/networks.d/
+ADD *.conf /
+ADD *.name /
+
+EXPOSE 9993/udp 6379/udp
+
+# Install LWIP library used by service
+ADD liblwip.so /var/lib/zerotier-one/liblwip.so
+
+# Install syscall intercept library
+ADD libzerotierintercept.so /
+RUN cp libzerotierintercept.so lib/libzerotierintercept.so
+RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
+
+ADD zerotier-cli /
+Add zerotier-sdk-service /
+
+# Install test scripts
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
+
+# Start ZeroTier-One
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh
new file mode 100644
index 0000000..7665f5c
--- /dev/null
+++ b/tests/docker/redis/redis-3.0.4-1.fc23.x86_64/sdk_entrypoint.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/
+
+
+# --- Test Parameters ---
+test_namefile=$(ls *.name)
+test_name="${test_namefile%.*}" # test network id
+nwconf=$(ls *.conf) # blank test network config file
+nwid="${nwconf%.*}" # test network id
+file_path=/opt/results/ # test result output file path (fs shared between host and containers)
+file_base="$test_name".txt # test result output file
+tmp_ext=.tmp # temporary filetype used for sharing test data between containers
+address_file="$file_path$test_name"_addr"$tmp_ext" # file shared between host and containers for sharing address (optional)
+
+
+# --- Network Config ---
+echo '*** ZeroTier Network Containers Test: ' "$test_name"
+chown -R daemon /var/lib/zerotier-one
+chgrp -R daemon /var/lib/zerotier-one
+su daemon -s /bin/bash -c '/zerotier-sdk-service -d -U -p9993 >>/tmp/zerotier-sdk-service.out 2>&1'
+virtip4=""
+while [ -z "$virtip4" ]; do
+	sleep 0.2
+	virtip4=`/zerotier-cli listnetworks | grep -F $nwid | cut -d ' ' -f 9 | sed 's/,/\n/g' | grep -F '.' | cut -d / -f 1`
+	dev=`/zerotier-cli listnetworks | grep -F "" | cut -d ' ' -f 8 | cut -d "_" -f 2 | sed "s/^<dev>//" | tr '\n' '\0'`
+done
+echo '*** Up and running at' $virtip4 ' on network: ' $nwid
+echo '*** Writing address to ' "$address_file"
+echo $virtip4 > "$address_file"
+
+# --- Test section ---
+echo '*** Starting application...'
+sleep 0.5
+
+export ZT_NC_NETWORK=/var/lib/zerotier-one/nc_"$dev"
+export LD_PRELOAD=./libzerotierintercept.so
+/usr/bin/redis-server --port 6379
diff --git a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
index 0756bc6..66f66f0 100644
--- a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
+++ b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/monitor_entrypoint.sh
@@ -8,7 +8,7 @@ test_namefile=$(ls *.name)
 test_name="${test_namefile%.*}" # test network id
 nwconf=$(ls *.conf) # blank test network config file
 nwid="${nwconf%.*}" # test network id
-netcon_wait_time=25 # wait for test container to come online
+sdk_wait_time=25 # wait for test container to come online
 app_timeout_time=15 # app-specific timeout
 file_path=/opt/results/ # test result output file path (fs shared between host and containers)
 file_base="$test_name".txt # test result output file
@@ -33,8 +33,8 @@ while [ -z "$virtip4" ]; do
 done
 echo '*** Starting Test...'
 echo '*** Up and running at' $virtip4 ' on network: ' $nwid
-echo '*** Sleeping for ('  "$netcon_wait_time"  's ) while we wait for the Network Container to come online...'
-sleep "$netcon_wait_time"s
+echo '*** Sleeping for ('  "$sdk_wait_time"  's ) while we wait for the Network Container to come online...'
+sleep "$sdk_wait_time"s
 ncvirtip=$(<$address_file)
 
 
diff --git a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile
similarity index 72%
rename from tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
rename to tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile
index a735e62..b2b61c0 100644
--- a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_dockerfile
+++ b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_dockerfile
@@ -11,8 +11,8 @@ EXPOSE 9993/udp
 
 # Add ZT files
 RUN mkdir -p /var/lib/zerotier-one/networks.d
-ADD netcon_identity.public /var/lib/zerotier-one/identity.public
-ADD netcon_identity.secret /var/lib/zerotier-one/identity.secret
+ADD sdk_identity.public /var/lib/zerotier-one/identity.public
+ADD sdk_identity.secret /var/lib/zerotier-one/identity.secret
 ADD *.conf /var/lib/zerotier-one/networks.d/
 ADD *.conf /
 ADD *.name /
@@ -28,8 +28,8 @@ RUN ln -sf /lib/libzerotierintercept.so /lib/libzerotierintercept
 ADD zerotier-cli /
 
 # Install test scripts
-ADD netcon_entrypoint.sh /netcon_entrypoint.sh
-RUN chmod -v +x /netcon_entrypoint.sh
+ADD sdk_entrypoint.sh /sdk_entrypoint.sh
+RUN chmod -v +x /sdk_entrypoint.sh
 
 # Start ZeroTier-One
-CMD ["./netcon_entrypoint.sh"]
+CMD ["./sdk_entrypoint.sh"]
diff --git a/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh b/tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_entrypoint.sh
similarity index 100%
rename from tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/netcon_entrypoint.sh
rename to tests/docker/sshd/openssh-server-7.1p1-3.fc23.x86_64/sdk_entrypoint.sh
diff --git a/tests/docker/test.sh b/tests/docker/test.sh
index 03e8601..a62d931 100755
--- a/tests/docker/test.sh
+++ b/tests/docker/test.sh
@@ -8,7 +8,7 @@ echo "*** Running unit tests..."
 rm _results/*.txt 
 
 # How long we shall wait for each test to conclude
-export netcon_test_wait_time=60s
+export sdk_test_wait_time=60s
 
 # Test structure, in later releases more complex multi-party scripts will be included
 export test_script=_two_party_test.sh
diff --git a/tests/zt_api/zt_api_client.c b/tests/zt_api/zt_api_client.c
index ea04181..a59eb0d 100644
--- a/tests/zt_api/zt_api_client.c
+++ b/tests/zt_api/zt_api_client.c
@@ -6,7 +6,7 @@
 #include <sys/socket.h>    //socket
 #include <arpa/inet.h> //inet_addr
  
-#include "../../netcon.h"
+#include "../../sdk.h"
 
 int main(int argc , char *argv[])
 {
diff --git a/tests/zt_api/zt_api_server.c b/tests/zt_api/zt_api_server.c
index 9c24b60..998f979 100644
--- a/tests/zt_api/zt_api_server.c
+++ b/tests/zt_api/zt_api_server.c
@@ -8,7 +8,7 @@
 #include <arpa/inet.h> //inet_addr
 #include <unistd.h>    //write
  
-#include "../../netcon.h"
+#include "../../sdk.h"
 
 int main(int argc , char *argv[])
 {