diff --git a/Makefile b/Makefile
index 9603cb3..c6cb31c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,46 +1,46 @@
 DOCKER = docker
-IMAGE = thewtex/cross-compiler
+ORG = dockcross
 
 android-arm: base android-arm/Dockerfile
-	$(DOCKER) build -t $(IMAGE)-android-arm android-arm
+	$(DOCKER) build -t $(ORG)/android-arm android-arm
 
 darwin-x64:
-	$(DOCKER) build -t $(IMAGE)-darwin-x64 darwin-x64
+	$(DOCKER) build -t $(ORG)/darwin-x64 darwin-x64
 
 browser-asmjs: base browser-asmjs/Dockerfile
 	cp -r test browser-asmjs/
-	$(DOCKER) build -t $(IMAGE)-browser-asmjs browser-asmjs
+	$(DOCKER) build -t $(ORG)/browser-asmjs browser-asmjs
 	rm -rf browser-asmjs/test
 
-linux-x86:
-	$(DOCKER) build -t $(IMAGE)-linux-x86 linux-x86
+linux-x86: base linux-x86/Dockerfile linux-x86/Toolchain.cmake
+	$(DOCKER) build -t $(ORG)/linux-x86 linux-x86
 
-linux-x64:
-	$(DOCKER) build -t $(IMAGE)-linux-x64 linux-x64
+linux-x64: base linux-x64/Dockerfile linux-x64/Toolchain.cmake
+	$(DOCKER) build -t $(ORG)/linux-x64 linux-x64
 
 linux-arm64: base linux-arm64/Dockerfile linux-arm64/Toolchain.cmake
-	$(DOCKER) build -t $(IMAGE)-linux-arm64 linux-arm64
+	$(DOCKER) build -t $(ORG)/linux-arm64 linux-arm64
 
 linux-armv5: base linux-armv5/Dockerfile linux-armv5/Toolchain.cmake
-	$(DOCKER) build -t $(IMAGE)-linux-armv5 linux-armv5
+	$(DOCKER) build -t $(ORG)/linux-armv5 linux-armv5
 
 linux-armv6: base linux-armv6/Dockerfile linux-armv6/Toolchain.cmake
-	$(DOCKER) build -t $(IMAGE)-linux-armv6 linux-armv6
+	$(DOCKER) build -t $(ORG)/linux-armv6 linux-armv6
 
 linux-armv7: base linux-armv7/Dockerfile linux-armv7/Toolchain.cmake
-	$(DOCKER) build -t $(IMAGE)-linux-armv7 linux-armv7
+	$(DOCKER) build -t $(ORG)/linux-armv7 linux-armv7
 
 linux-ppc64le: base linux-ppc64le/Dockerfile linux-ppc64le/Toolchain.cmake
-	$(DOCKER) build -t $(IMAGE)-linux-ppc64le linux-ppc64le
+	$(DOCKER) build -t $(ORG)/linux-ppc64le linux-ppc64le
 
 windows-x86: base windows-x86/Dockerfile windows-x86/settings.mk
-	$(DOCKER) build -t $(IMAGE)-windows-x86 windows-x86
+	$(DOCKER) build -t $(ORG)/windows-x86 windows-x86
 
 windows-x64: base windows-x64/Dockerfile windows-x64/settings.mk
-	$(DOCKER) build -t $(IMAGE)-windows-x64 windows-x64
+	$(DOCKER) build -t $(ORG)/windows-x64 windows-x64
 
 base: Dockerfile
-	$(DOCKER) build -t $(IMAGE)-base .
+	$(DOCKER) build -t $(ORG)/base .
 
 all: base android-arm darwin-x64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 windows-x86 windows-x64
 
diff --git a/README.rst b/README.rst
index 0b0fc57..2926e4b 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,10 @@
-cross-compilers
----------------
+dockcross
+=========
 
-Dockerfiles for cross compiling in a Docker container.
+Cross compiling toolchains in Docker images.
 
 Features
-========
+--------
 
 * Different toolchains for cross compiling.
 * Commands in the container are run as the calling user, so that any created files have the expected ownership, (i.e. not root).
@@ -13,8 +13,102 @@ Features
 * Current directory is mounted as the container's workdir, ``/build``.
 * Works with boot2docker on OSX and Docker for Mac beta (1.11.1-beta12).
 
+Cross compilers
+---------------
+
+.. image:: https://circleci.com/gh/dockcross/cross-compilers/tree/master.svg?style=svg
+  :target: https://circleci.com/gh/dockcross/cross-compilers/tree/master
+
+
+.. |base-images| image:: https://badge.imagelayers.io/dockcross/base:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/base:latest
+
+dockcross/base
+  |base-images| Base image for other toolchain images. From Debian Jessie with GCC,
+  make, autotools, CMake, Ninja, Git, and Python.
+
+
+.. |android-arm-images| image:: https://badge.imagelayers.io/dockcross/android-arm:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/android-arm:latest
+
+dockcross/android-arm
+  |android-arm-images| The Android NDK standalone toolchain for the arm
+  architecture.
+
+
+.. |browser-asmjs-images| image:: https://badge.imagelayers.io/dockcross/browser-asmjs:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/browser-asmjs:latest
+
+dockcross/browser-asmjs
+  |browser-asmjs-images| The Emscripten JavaScript cross compiler.
+
+.. |linux-arm64-images| image:: https://badge.imagelayers.io/dockcross/linux-arm64:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/linux-arm64:latest
+
+dockcross/linux-arm64
+  |linux-arm64-images| Linux arm64 cross compiler toolchain for legacy devices
+  like the Parrot AR Drone.
+
+.. |linux-armv5-images| image:: https://badge.imagelayers.io/dockcross/linux-armv5:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/linux-armv5:latest
+
+dockcross/linux-armv5
+  |linux-armv5-images| Linux armv5 cross compiler toolchain for legacy devices
+  like the Parrot AR Drone.
+
+.. |linux-armv6-images| image:: https://badge.imagelayers.io/dockcross/linux-armv6:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/linux-armv6:latest
+
+dockcross/linux-armv6
+  |linux-armv6-images| Linux ARMv6 cross compiler toolchain for the Raspberry
+  Pi, etc.
+
+
+.. |linux-armv7-images| image:: https://badge.imagelayers.io/dockcross/linux-armv7:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/linux-armv7:latest
+
+dockcross/linux-armv7
+  |linux-armv7-images| Generic Linux armv7 cross compiler toolchain.
+
+
+.. |linux-ppc64le-images| image:: https://badge.imagelayers.io/dockcross/linux-ppc64le:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/linux-ppc64le:latest
+
+dockcross/linux-ppc64le
+  |linux-ppc64le-images| Linux PowerPC 64 little endian cross compiler
+  toolchain for the POWER8, etc.
+
+
+.. |linux-x64-images| image:: https://badge.imagelayers.io/dockcross/linux-x64:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/linux-x64:latest
+
+dockcross/linux-x64
+  |linux-x64-images| Linux x86_64 / amd64 compiler. Since the Docker image is
+  natively x86_64, this is not actually a cross compiler.
+
+
+.. |linux-x86-images| image:: https://badge.imagelayers.io/dockcross/linux-x86:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/linux-x86:latest
+
+dockcross/linux-x86
+  |linux-x86-images| Linux i686 cross compiler.
+
+
+.. |windows-x64-images| image:: https://badge.imagelayers.io/dockcross/windows-x64:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/windows-x64:latest
+
+dockcross/windows-x64
+  |windows-x64-images| 64-bit Windows cross-compiler based on MXE/MinGW-w64.
+
+
+.. |windows-x86-images| image:: https://badge.imagelayers.io/dockcross/windows-x86:latest.svg
+  :target: https://imagelayers.io/?images=dockcross/windows-x86:latest
+
+dockcross/windows-x86
+  |windows-x86-images| 32-bit Windows cross-compiler based on MXE/MinGW-w64.
+
 Installation
-============
+------------
 
 This image is not intended to be run manually. Instead, there is a helper script which comes bundled with the image.
 
@@ -26,11 +120,11 @@ redirect the output to a file::
   mv ./dockcross ~/bin/
 
 Usage
-=====
+-----
 
 For the impatient, here's a one-liner to compile a hello world for armv7::
 
-  docker run --rm thewtex/cross-compiler-linux-armv7 > ./dockcross-linux-armv7
+  docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7
   chmod +x ./dockcross-linux-armv7
   ./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
 
@@ -46,7 +140,7 @@ source cross-compiler Docker image or the dockcross script itself.
 
 
 Built-in update commands
-========================
+------------------------
 
 - ``dockcross [--] command [args...]``: Forces a command to run inside the container (in case of a name clash with a built-in command), use ``--`` before the command.
 - ``dockcross update-image``: Fetch the latest version of the docker image.
@@ -54,7 +148,7 @@ Built-in update commands
 - ``dockcross update``: Update both the docker image, and the dockcross script.
 
 Configuration
-=============
+-------------
 
 The following command-line options and environment variables are used. In all cases, the command-line option overrides the environment variable.
 
@@ -79,7 +173,7 @@ DOCKCROSS_ARGS / --args|-a <docker-run-args>
 Extra arguments to pass to the ``docker run`` command.
 
 Examples
-========
+--------
 
 1. **dockcross make**: Build the Makefile in the current directory.
 2. **dockcross cmake -Bbuild -H. -GNinja***: Run CMake with a build directory "build" for the CMakeLists.txt in the current directory and generate `ninja` files.
@@ -91,98 +185,3 @@ Note that commands are executed verbatim. If you require any shell processing fo
 ---
 
 Credits go to `sdt/docker-raspberry-pi-cross-compiler <https://github.com/sdt/docker-raspberry-pi-cross-compiler>`_, who invented the base of the **dockcross** script.
-
-
-CI status
----------
-
-.. image:: https://circleci.com/gh/thewtex/cross-compilers/tree/master.svg?style=svg
-  :target: https://circleci.com/gh/thewtex/cross-compilers/tree/master
-
-
-.. |base-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-base:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-base:latest
-
-thewtex/cross-compiler-base
-  |base-images| Base image for other toolchain images. From Debian Jessie with GCC,
-  make, autotools, CMake, Ninja, Git, and Python.
-
-
-.. |android-arm-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-android-arm:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-android-arm:latest
-
-thewtex/cross-compiler-android-arm
-  |android-arm-images| The Android NDK standalone toolchain for the arm
-  architecture.
-
-
-.. |browser-asmjs-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-browser-asmjs:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-browser-asmjs:latest
-
-thewtex/cross-compiler-browser-asmjs
-  |browser-asmjs-images| The Emscripten JavaScript cross compiler.
-
-.. |linux-arm64-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-linux-arm64:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-linux-arm64:latest
-
-thewtex/cross-compiler-linux-arm64
-  |linux-arm64-images| Linux arm64 cross compiler toolchain for legacy devices
-  like the Parrot AR Drone.
-
-.. |linux-armv5-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-linux-armv5:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-linux-armv5:latest
-
-thewtex/cross-compiler-linux-armv5
-  |linux-armv5-images| Linux armv5 cross compiler toolchain for legacy devices
-  like the Parrot AR Drone.
-
-.. |linux-armv6-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-linux-armv6:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-linux-armv6:latest
-
-thewtex/cross-compiler-linux-armv6
-  |linux-armv6-images| Linux ARMv6 cross compiler toolchain for the Raspberry
-  Pi, etc.
-
-
-.. |linux-armv7-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-linux-armv7:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-linux-armv7:latest
-
-thewtex/cross-compiler-linux-armv7
-  |linux-armv7-images| Generic Linux armv7 cross compiler toolchain.
-
-
-.. |linux-ppc64le-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-linux-ppc64le:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-linux-ppc64le:latest
-
-thewtex/cross-compiler-linux-ppc64le
-  |linux-ppc64le-images| Linux PowerPC 64 little endian cross compiler
-  toolchain for the POWER8, etc.
-
-
-.. |linux-x64-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-linux-x64:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-linux-x64:latest
-
-thewtex/cross-compiler-linux-x64
-  |linux-x64-images| Linux x86_64 / amd64 compiler. Since the Docker image is
-  natively x86_64, this is not actually a cross compiler.
-
-
-.. |linux-x86-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-linux-x86:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-linux-x86:latest
-
-thewtex/cross-compiler-linux-x86
-  |linux-x86-images| Linux i686 cross compiler.
-
-
-.. |windows-x64-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-windows-x64:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-windows-x64:latest
-
-thewtex/cross-compiler-windows-x64
-  |windows-x64-images| 64-bit Windows cross-compiler based on MXE/MinGW-w64.
-
-
-.. |windows-x86-images| image:: https://badge.imagelayers.io/thewtex/cross-compiler-windows-x86:latest.svg
-  :target: https://imagelayers.io/?images=thewtex/cross-compiler-windows-x86:latest
-
-thewtex/cross-compiler-windows-x86
-  |windows-x86-images| 32-bit Windows cross-compiler based on MXE/MinGW-w64.
diff --git a/android-arm/Dockerfile b/android-arm/Dockerfile
index 99fa01d..446315f 100644
--- a/android-arm/Dockerfile
+++ b/android-arm/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # The cross-compiling emulator
@@ -34,7 +34,7 @@ RUN mkdir -p /build && \
     find ${CROSS_ROOT} -executable -exec chmod a+x '{}' \;
 
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-android-arm
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/android-arm
 
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
diff --git a/browser-asmjs/Dockerfile b/browser-asmjs/Dockerfile
index 2f2a8bc..9d5352a 100644
--- a/browser-asmjs/Dockerfile
+++ b/browser-asmjs/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # The cross-compiling emulator
@@ -40,6 +40,6 @@ RUN cd /tmp && \
   python /tmp/test/run.py; python /tmp/test/run.py && \
   cd && rm -rf /tmp/test
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-browser-asmjs
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/browser-asmjs
 
 ENV CMAKE_TOOLCHAIN_FILE /usr/emsdk_portable/emscripten/tag-${EMSCRIPTEN_VERSION}/cmake/Modules/Platform/Emscripten.cmake
diff --git a/circle.yml b/circle.yml
index 5de8302..cb91569 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,59 +9,59 @@ machine:
 dependencies:
   override:
     - docker info
-    - docker pull thewtex/cross-compiler-base
-    - docker pull thewtex/cross-compiler-android-arm
-    - docker pull thewtex/cross-compiler-browser-asmjs
-    - docker pull thewtex/cross-compiler-linux-arm64
-    - docker pull thewtex/cross-compiler-linux-armv5
-    - docker pull thewtex/cross-compiler-linux-armv6
-    - docker pull thewtex/cross-compiler-linux-armv7
-    - docker pull thewtex/cross-compiler-linux-ppc64le
-    - docker pull thewtex/cross-compiler-linux-x64
-    - docker pull thewtex/cross-compiler-linux-x86
-    - docker pull thewtex/cross-compiler-windows-x64
-    - docker pull thewtex/cross-compiler-windows-x86
+    - docker pull dockcross/base
+    - docker pull dockcross/android-arm
+    - docker pull dockcross/browser-asmjs
+    - docker pull dockcross/linux-arm64
+    - docker pull dockcross/linux-armv5
+    - docker pull dockcross/linux-armv6
+    - docker pull dockcross/linux-armv7
+    - docker pull dockcross/linux-ppc64le
+    - docker pull dockcross/linux-x64
+    - docker pull dockcross/linux-x86
+    - docker pull dockcross/windows-x64
+    - docker pull dockcross/windows-x86
 
 test:
   override:
     - make base
-    - docker run --rm thewtex/cross-compiler-base > ./dockcross-base && chmod +x ./dockcross-base
+    - docker run --rm dockcross/base > ./dockcross-base && chmod +x ./dockcross-base
     - ./dockcross-base python test/run.py --emulator 'sh -c'
     - make android-arm
-    - docker run --rm thewtex/cross-compiler-android-arm > ./dockcross-android-arm && chmod +x ./dockcross-android-arm
+    - docker run --rm dockcross/android-arm > ./dockcross-android-arm && chmod +x ./dockcross-android-arm
     - ./dockcross-android-arm python test/run.py
     - make browser-asmjs
-    - docker run --rm thewtex/cross-compiler-browser-asmjs > ./dockcross-browser-asmjs && chmod +x ./dockcross-browser-asmjs
+    - docker run --rm dockcross/browser-asmjs > ./dockcross-browser-asmjs && chmod +x ./dockcross-browser-asmjs
     - ./dockcross-browser-asmjs python test/run.py --emulator /usr/bin/node --exe-suffix ".js"
     - make linux-arm64
-    - docker run --rm thewtex/cross-compiler-linux-arm64 > ./dockcross-linux-arm64 && chmod +x ./dockcross-linux-arm64
+    - docker run --rm dockcross/linux-arm64 > ./dockcross-linux-arm64 && chmod +x ./dockcross-linux-arm64
     - ./dockcross-linux-arm64 python test/run.py --emulator /usr/bin/qemu-arm
     - make linux-armv5
-    - docker run --rm thewtex/cross-compiler-linux-armv5 > ./dockcross-linux-armv5 && chmod +x ./dockcross-linux-armv5
+    - docker run --rm dockcross/linux-armv5 > ./dockcross-linux-armv5 && chmod +x ./dockcross-linux-armv5
     - ./dockcross-linux-armv5 python test/run.py --emulator /usr/bin/qemu-arm
     - make linux-armv6
-    - docker run --rm thewtex/cross-compiler-linux-armv6 > ./dockcross-linux-armv6 && chmod +x ./dockcross-linux-armv6
+    - docker run --rm dockcross/linux-armv6 > ./dockcross-linux-armv6 && chmod +x ./dockcross-linux-armv6
     - ./dockcross-linux-armv6 python test/run.py --emulator /usr/bin/qemu-arm
     - make linux-armv7
-    - docker run --rm thewtex/cross-compiler-linux-armv7 > ./dockcross-linux-armv7 && chmod +x ./dockcross-linux-armv7
+    - docker run --rm dockcross/linux-armv7 > ./dockcross-linux-armv7 && chmod +x ./dockcross-linux-armv7
     - ./dockcross-linux-armv7 python test/run.py --emulator /usr/bin/qemu-arm
     - ./dockcross-linux-armv7 && chmod +x ./dockcross-linux-armv7 && ./dockcross-linux-armv7 bash -c '$CC test/C/hello.c -o hello_arm'
     - make linux-ppc64le
-    - docker run --rm thewtex/cross-compiler-linux-ppc64le > ./dockcross-linux-ppc64le && chmod +x ./dockcross-linux-ppc64le
+    - docker run --rm dockcross/linux-ppc64le > ./dockcross-linux-ppc64le && chmod +x ./dockcross-linux-ppc64le
     - ./dockcross-linux-ppc64le python test/run.py --emulator /usr/bin/qemu-ppc64le --languages C
     - make linux-x64
-    - docker run --rm thewtex/cross-compiler-linux-x64 > ./dockcross-linux-x64 && chmod +x ./dockcross-linux-x64
+    - docker run --rm dockcross/linux-x64 > ./dockcross-linux-x64 && chmod +x ./dockcross-linux-x64
     - ./dockcross-linux-x64 python test/run.py
     - make linux-x86
-    - docker run --rm thewtex/cross-compiler-linux-x86 > ./dockcross-linux-x86 && chmod +x ./dockcross-linux-x86
+    - docker run --rm dockcross/linux-x86 > ./dockcross-linux-x86 && chmod +x ./dockcross-linux-x86
     - ./dockcross-linux-x86 python test/run.py
     - make windows-x64:
         timeout: 3000
-    - docker run --rm thewtex/cross-compiler-windows-x64 > ./dockcross-windows-x64 && chmod +x ./dockcross-windows-x64
+    - docker run --rm dockcross/windows-x64 > ./dockcross-windows-x64 && chmod +x ./dockcross-windows-x64
     - ./dockcross-windows-x64 python test/run.py --emulator /usr/bin/wine --exe-suffix ".exe"
     - make windows-x86:
         timeout: 3000
-    - docker run --rm thewtex/cross-compiler-windows-x86 > ./dockcross-windows-x86 && chmod +x ./dockcross-windows-x86
+    - docker run --rm dockcross/windows-x86 > ./dockcross-windows-x86 && chmod +x ./dockcross-windows-x86
     - ./dockcross-windows-x86 python test/run.py --emulator /usr/bin/wine --exe-suffix ".exe"
 
 deployment:
@@ -69,15 +69,15 @@ deployment:
     branch: master
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
-      - docker push thewtex/cross-compiler-base
-      - docker push thewtex/cross-compiler-android-arm
-      - docker push thewtex/cross-compiler-browser-asmjs
-      - docker push thewtex/cross-compiler-linux-arm64
-      - docker push thewtex/cross-compiler-linux-armv5
-      - docker push thewtex/cross-compiler-linux-armv6
-      - docker push thewtex/cross-compiler-linux-armv7
-      - docker push thewtex/cross-compiler-linux-ppc64le
-      - docker push thewtex/cross-compiler-linux-x64
-      - docker push thewtex/cross-compiler-linux-x86
-      - docker push thewtex/cross-compiler-windows-x64
-      - docker push thewtex/cross-compiler-windows-x86
+      - docker push dockcross/base
+      - docker push dockcross/android-arm
+      - docker push dockcross/browser-asmjs
+      - docker push dockcross/linux-arm64
+      - docker push dockcross/linux-armv5
+      - docker push dockcross/linux-armv6
+      - docker push dockcross/linux-armv7
+      - docker push dockcross/linux-ppc64le
+      - docker push dockcross/linux-x64
+      - docker push dockcross/linux-x86
+      - docker push dockcross/windows-x64
+      - docker push dockcross/windows-x86
diff --git a/darwin-x64/Dockerfile b/darwin-x64/Dockerfile
index 6bedc94..529153a 100644
--- a/darwin-x64/Dockerfile
+++ b/darwin-x64/Dockerfile
@@ -24,4 +24,4 @@ RUN curl -L https://github.com/tpoechtrager/osxcross/archive/master.tar.gz | tar
     mkdir -p ${CROSS_ROOT}/lib && \
     rm -rf /osxcross-master
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-darwin-x64
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/darwin-x64
diff --git a/imagefiles/dockcross b/imagefiles/dockcross
index fcceefd..8d248ea 100755
--- a/imagefiles/dockcross
+++ b/imagefiles/dockcross
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEFAULT_DOCKCROSS_IMAGE=thewtex/cross-compiler-base
+DEFAULT_DOCKCROSS_IMAGE=dockcross/base
 
 #------------------------------------------------------------------------------
 # Helpers
@@ -164,9 +164,9 @@ docker run -i -t --rm \
 # This image is not intended to be run manually.
 #
 # To create a dockcross helper script for the
-# thewtex/cross-compiler-linux-armv7 image, run:
+# dockcross/linux-armv7 image, run:
 #
-# docker run --rm thewtex/cross-compiler-linux-armv7 > dockcross-linux-armv7
+# docker run --rm dockcross/linux-armv7 > dockcross-linux-armv7
 # chmod +x dockcross-linux-armv7
 #
 # You may then wish to move the dockcross script to your PATH.
diff --git a/linux-arm64/Dockerfile b/linux-arm64/Dockerfile
index 928daae..a7eac1c 100644
--- a/linux-arm64/Dockerfile
+++ b/linux-arm64/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Add the cross compiler sources
@@ -34,7 +34,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
     CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
     LD=/usr/bin/${CROSS_TRIPLE}-ld
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-linux-arm64
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64
 WORKDIR /build
 
 # Note: Toolchain file support is currently in debian Experimental according to:
diff --git a/linux-armv5/Dockerfile b/linux-armv5/Dockerfile
index 31d0542..6ea8a8e 100644
--- a/linux-armv5/Dockerfile
+++ b/linux-armv5/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # This is for ARMv5 "legacy" (armel) devices which do NOT support hard float
@@ -28,7 +28,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
 ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc
 ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/"
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-linux-armv5
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv5
 
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
diff --git a/linux-armv6/Dockerfile b/linux-armv6/Dockerfile
index e815d54..2530966 100644
--- a/linux-armv6/Dockerfile
+++ b/linux-armv6/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Enable 32 bits binaries
@@ -39,7 +39,7 @@ RUN mkdir rpi_tools && cd rpi_tools && git init && git remote add -f origin http
 ENV QEMU_LD_PREFIX ${CROSS_ROOT}/libc
 ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${CROSS_ROOT}/libc/lib/${CROSS_TRIPLE}/"
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-linux-armv6
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv6
 
 COPY Toolchain.cmake ${CROSS_ROOT}/
 ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
diff --git a/linux-armv7/Dockerfile b/linux-armv7/Dockerfile
index 9b6c652..cb74c0e 100644
--- a/linux-armv7/Dockerfile
+++ b/linux-armv7/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Add the cross compiler sources
@@ -25,7 +25,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
     CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
     LD=/usr/bin/${CROSS_TRIPLE}-ld
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-linux-armv7
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-armv7
 
 # Note: Toolchain file support is currently in debian Experimental:
 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
diff --git a/linux-ppc64le/Dockerfile b/linux-ppc64le/Dockerfile
index 198db23..0250849 100644
--- a/linux-ppc64le/Dockerfile
+++ b/linux-ppc64le/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # Add the cross compiler sources
@@ -34,7 +34,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
     CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
     LD=/usr/bin/${CROSS_TRIPLE}-ld
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-linux-ppc64le
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-ppc64le
 WORKDIR /build
 
 # Note: Toolchain file support is currently in debian Experimental according to:
diff --git a/linux-x64/Dockerfile b/linux-x64/Dockerfile
index fb8d967..2f6b0a4 100644
--- a/linux-x64/Dockerfile
+++ b/linux-x64/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 ENV CROSS_TRIPLE x86_64-linux-gnu
@@ -10,4 +10,4 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
     CXX=/usr/bin/${CROSS_TRIPLE}-g++ \
     LD=/usr/bin/${CROSS_TRIPLE}-ld
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-linux-x64
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-x64
diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile
index bc729f8..de1f98b 100644
--- a/linux-x86/Dockerfile
+++ b/linux-x86/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 RUN dpkg --add-architecture i386 && \
@@ -34,7 +34,7 @@ ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
     CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
     CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-linux-x86
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-x86
 
 # Note: Toolchain file support is currently in debian Experimental:
 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29
diff --git a/windows-x64/Dockerfile b/windows-x64/Dockerfile
index 175416d..ed478f0 100644
--- a/windows-x64/Dockerfile
+++ b/windows-x64/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # WINE is used as an emulator for try_run and tests with CMake.
@@ -65,7 +65,7 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
     CXX=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-g++ \
     LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-windows-x64
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x64
 WORKDIR /build
 
 ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/x86_64-w64-mingw32.static/share/cmake/mxe-conf.cmake
diff --git a/windows-x86/Dockerfile b/windows-x86/Dockerfile
index ea38312..d66b330 100644
--- a/windows-x86/Dockerfile
+++ b/windows-x86/Dockerfile
@@ -1,4 +1,4 @@
-FROM thewtex/cross-compiler-base
+FROM dockcross/base
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 # WINE is used as an emulator for try_run and tests with CMake.
@@ -65,7 +65,7 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
     CXX=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-g++ \
     LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld
 
-ENV DEFAULT_DOCKCROSS_IMAGE thewtex/cross-compiler-windows-x86
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x86
 WORKDIR /build
 
 ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake