diff --git a/contrib/docker/README.md b/contrib/heat_docker/README.md
similarity index 100%
rename from contrib/docker/README.md
rename to contrib/heat_docker/README.md
diff --git a/contrib/docker/docker/__init__.py b/contrib/heat_docker/heat_docker/__init__.py
similarity index 100%
rename from contrib/docker/docker/__init__.py
rename to contrib/heat_docker/heat_docker/__init__.py
diff --git a/contrib/docker/docker/resources/__init__.py b/contrib/heat_docker/heat_docker/resources/__init__.py
similarity index 100%
rename from contrib/docker/docker/resources/__init__.py
rename to contrib/heat_docker/heat_docker/resources/__init__.py
diff --git a/contrib/docker/docker/resources/docker_container.py b/contrib/heat_docker/heat_docker/resources/docker_container.py
similarity index 100%
rename from contrib/docker/docker/resources/docker_container.py
rename to contrib/heat_docker/heat_docker/resources/docker_container.py
diff --git a/contrib/docker/docker/tests/__init__.py b/contrib/heat_docker/heat_docker/tests/__init__.py
similarity index 100%
rename from contrib/docker/docker/tests/__init__.py
rename to contrib/heat_docker/heat_docker/tests/__init__.py
diff --git a/contrib/docker/docker/tests/fake_docker_client.py b/contrib/heat_docker/heat_docker/tests/fake_docker_client.py
similarity index 100%
rename from contrib/docker/docker/tests/fake_docker_client.py
rename to contrib/heat_docker/heat_docker/tests/fake_docker_client.py
diff --git a/contrib/docker/docker/tests/test_docker_container.py b/contrib/heat_docker/heat_docker/tests/test_docker_container.py
similarity index 100%
rename from contrib/docker/docker/tests/test_docker_container.py
rename to contrib/heat_docker/heat_docker/tests/test_docker_container.py
diff --git a/contrib/docker/requirements.txt b/contrib/heat_docker/requirements.txt
similarity index 100%
rename from contrib/docker/requirements.txt
rename to contrib/heat_docker/requirements.txt
diff --git a/contrib/docker/setup.cfg b/contrib/heat_docker/setup.cfg
similarity index 94%
rename from contrib/docker/setup.cfg
rename to contrib/heat_docker/setup.cfg
index 45a4303551..8f33e2b4e8 100644
--- a/contrib/docker/setup.cfg
+++ b/contrib/heat_docker/setup.cfg
@@ -20,7 +20,7 @@ classifier =
 [files]
 # Copy to /usr/lib/heat for plugin loading
 data_files =
-    lib/heat/docker = docker/resources/*
+    lib/heat/docker = heat_docker/resources/*
 
 [global]
 setup-hooks =
diff --git a/contrib/docker/setup.py b/contrib/heat_docker/setup.py
similarity index 100%
rename from contrib/docker/setup.py
rename to contrib/heat_docker/setup.py
diff --git a/doc/source/template_guide/contrib.rst b/doc/source/template_guide/contrib.rst
index 575b24d8f1..0fc31163eb 100644
--- a/doc/source/template_guide/contrib.rst
+++ b/doc/source/template_guide/contrib.rst
@@ -42,8 +42,8 @@ DockerInc Resource
 This plugin enables the use of  Docker containers in a Heat template and
 requires the `docker-py <https://pypi.python.org/pypi/docker-py>`_
 package. You can find more information in the `README
-<https://github.com/openstack/heat/blob/master/contrib/docker/docker/
-README.md>`_.
+<https://github.com/openstack/heat/blob/master/contrib/heat_docker/heat_docker
+/README.md>`_.
 
 .. resourcepages:: DockerInc::
 
@@ -57,4 +57,4 @@ find more information in the `README
 <https://github.com/openstack/heat/blob/master/contrib/nova_flavor/nova_flavor
 /README.md>`_.
 
-.. resourcepages:: NovaFlavor::
\ No newline at end of file
+.. resourcepages:: NovaFlavor::