diff --git a/contrib/heat_gnocchi/heat_gnocchi/resources/gnocchi_alarm.py b/contrib/heat_gnocchi/heat_gnocchi/resources/gnocchi_alarm.py
index 9db5de6fbf..e4ca3cbc8c 100644
--- a/contrib/heat_gnocchi/heat_gnocchi/resources/gnocchi_alarm.py
+++ b/contrib/heat_gnocchi/heat_gnocchi/resources/gnocchi_alarm.py
@@ -15,7 +15,7 @@
 from heat.common.i18n import _
 from heat.engine import constraints
 from heat.engine import properties
-from heat.engine.resources.ceilometer import alarm
+from heat.engine.resources.openstack.ceilometer import alarm
 from heat.engine import support
 
 
diff --git a/heat/engine/resources/ceilometer/__init__.py b/heat/engine/resources/openstack/ceilometer/__init__.py
similarity index 100%
rename from heat/engine/resources/ceilometer/__init__.py
rename to heat/engine/resources/openstack/ceilometer/__init__.py
diff --git a/heat/engine/resources/ceilometer/alarm.py b/heat/engine/resources/openstack/ceilometer/alarm.py
similarity index 100%
rename from heat/engine/resources/ceilometer/alarm.py
rename to heat/engine/resources/openstack/ceilometer/alarm.py
diff --git a/heat/tests/test_ceilometer_alarm.py b/heat/tests/test_ceilometer_alarm.py
index 148f5db6ba..9a85d511eb 100644
--- a/heat/tests/test_ceilometer_alarm.py
+++ b/heat/tests/test_ceilometer_alarm.py
@@ -26,7 +26,7 @@ from heat.engine.clients.os import ceilometer
 from heat.engine import parser
 from heat.engine import properties as props
 from heat.engine import resource
-from heat.engine.resources.ceilometer import alarm
+from heat.engine.resources.openstack.ceilometer import alarm
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.tests import common