VOL-595 - container image name consistency and general cleanup

Change-Id: Iccac1ccba61537cefa046118df139196e9e87713
diff --git a/tests/itests/docutests/build_md_test.py b/tests/itests/docutests/build_md_test.py
index 133736e..57c273a 100644
--- a/tests/itests/docutests/build_md_test.py
+++ b/tests/itests/docutests/build_md_test.py
@@ -58,9 +58,9 @@
         DOCKER_COMPOSE_FILE),
     docker_stop_and_remove_all_containers="docker stop `docker ps -q` ; "
                                           "docker rm `docker ps -a -q`",
-    docker_start_voltha="docker run -ti --rm cord/voltha",
+    docker_start_voltha="docker run -ti --rm voltha/voltha",
     docker_start_voltha_with_consul_ip="docker run -ti --rm --net="
-                                       "compose_default cord/voltha "
+                                       "compose_default voltha/voltha "
                                        "/voltha/voltha/main.py --consul=",
     docker_get_consul_ip="docker inspect "
                          "compose_consul_1 | jq -r "
diff --git a/tests/itests/run_as_root/test_frameio.py b/tests/itests/run_as_root/test_frameio.py
index ad62f98..0d64f1f 100644
--- a/tests/itests/run_as_root/test_frameio.py
+++ b/tests/itests/run_as_root/test_frameio.py
@@ -18,7 +18,7 @@
 """
 Run this test inside a docker container using the following syntax:
 
-docker run -ti --rm -v $(pwd):/voltha  --privileged cord/voltha-base \
+docker run -ti --rm -v $(pwd):/voltha  --privileged voltha/voltha-base \
     env PYTHONPATH=/voltha python \
     /voltha/tests/itests/run_as_root/test_frameio.py