diff --git a/heat/engine/resources/openstack/glance/glance_image.py b/heat/engine/resources/openstack/glance/image.py
similarity index 100%
rename from heat/engine/resources/openstack/glance/glance_image.py
rename to heat/engine/resources/openstack/glance/image.py
diff --git a/heat/tests/openstack/glance/__init__.py b/heat/tests/openstack/glance/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/heat/tests/test_glance_image.py b/heat/tests/openstack/glance/test_image.py
similarity index 99%
rename from heat/tests/test_glance_image.py
rename to heat/tests/openstack/glance/test_image.py
index 6bc0a183ba..7aebc9b3f4 100644
--- a/heat/tests/test_glance_image.py
+++ b/heat/tests/openstack/glance/test_image.py
@@ -16,7 +16,7 @@ import six
 
 from heat.common import exception
 from heat.common import template_format
-from heat.engine.resources.openstack.glance import glance_image as gi
+from heat.engine.resources.openstack.glance import image as gi
 from heat.engine import stack as parser
 from heat.engine import template
 from heat.tests import common