diff --git a/doc/source/developing_guides/pluginguide.rst b/doc/source/developing_guides/pluginguide.rst
index 46f9d43cf5..b7981e25c4 100644
--- a/doc/source/developing_guides/pluginguide.rst
+++ b/doc/source/developing_guides/pluginguide.rst
@@ -481,8 +481,8 @@ Delete
 
      For this to work for a particular resource, the `entity` and
      `default_client_name` attributes must be overridden in the resource
-     implementation. For example, `entity` of Ceilometer Alarm should equals
-     to "alarms" and `default_client_name` to "ceilometer".
+     implementation. For example, `entity` of Aodh Alarm should equals
+     to "alarm" and `default_client_name` to "aodh".
 
 .. py:function:: handle_delete_snapshot(self, snapshot)
 
diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst
index 8ea0469027..8167888246 100644
--- a/doc/source/getting_started/on_devstack.rst
+++ b/doc/source/getting_started/on_devstack.rst
@@ -50,7 +50,7 @@ heat processes will be launched in `screen` with the labels prefixed with `h-`.
 
 Configure DevStack to enable ceilometer and aodh (if using alarms)
 ------------------------------------------------------------------
-To use ceilometer alarms you need to enable ceilometer and aodh in devstack.
+To use aodh alarms you need to enable ceilometer and aodh in devstack.
 Adding the following lines to `[[local|localrc]]` section of `local.conf`
 will enable the services::
 
diff --git a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml
index f3ee6be6af..ccc10707d3 100644
--- a/etc/heat/templates/AWS_CloudWatch_Alarm.yaml
+++ b/etc/heat/templates/AWS_CloudWatch_Alarm.yaml
@@ -1,5 +1,5 @@
 HeatTemplateFormatVersion: '2012-12-12'
-Description: AWS::CloudWatch::Alarm using Ceilometer.
+Description: AWS::CloudWatch::Alarm using Aodh.
 Parameters:
   AlarmDescription:
     Type: String
@@ -47,16 +47,16 @@ Parameters:
 
 Mappings:
   ComparisonOperatorMap:
-    LessThanOrEqualToThreshold: {Ceilometer: le}
-    LessThanThreshold: {Ceilometer: lt}
-    GreaterThanThreshold: {Ceilometer: gt}
-    GreaterThanOrEqualToThreshold: {Ceilometer: ge}
+    LessThanOrEqualToThreshold: {Aodh: le}
+    LessThanThreshold: {Aodh: lt}
+    GreaterThanThreshold: {Aodh: gt}
+    GreaterThanOrEqualToThreshold: {Aodh: ge}
   StatisticMap:
-    SampleCount: {Ceilometer: count}
-    Average: {Ceilometer: avg}
-    Sum: {Ceilometer: sum}
-    Minimum: {Ceilometer: min}
-    Maximum: {Ceilometer: max}
+    SampleCount: {Aodh: count}
+    Average: {Aodh: avg}
+    Sum: {Aodh: sum}
+    Minimum: {Aodh: min}
+    Maximum: {Aodh: max}
 
 Resources:
   __alarm__:
@@ -80,8 +80,8 @@ Resources:
       insufficient_data_actions:
         Ref: InsufficientDataActions
       statistic:
-        "Fn::FindInMap": [StatisticMap, {Ref: Statistic}, Ceilometer]
+        "Fn::FindInMap": [StatisticMap, {Ref: Statistic}, Aodh]
       comparison_operator:
-        "Fn::FindInMap": [ComparisonOperatorMap, {Ref: ComparisonOperator}, Ceilometer]
+        "Fn::FindInMap": [ComparisonOperatorMap, {Ref: ComparisonOperator}, Aodh]
       matching_metadata:
         "Fn::MemberListToMap": [Name, Value, {Ref: Dimensions}]
diff --git a/heat/engine/resources/openstack/ceilometer/__init__.py b/heat/engine/resources/openstack/aodh/__init__.py
similarity index 100%
rename from heat/engine/resources/openstack/ceilometer/__init__.py
rename to heat/engine/resources/openstack/aodh/__init__.py
diff --git a/heat/engine/resources/openstack/ceilometer/alarm.py b/heat/engine/resources/openstack/aodh/alarm.py
similarity index 100%
rename from heat/engine/resources/openstack/ceilometer/alarm.py
rename to heat/engine/resources/openstack/aodh/alarm.py
diff --git a/heat/engine/resources/openstack/ceilometer/gnocchi/__init__.py b/heat/engine/resources/openstack/aodh/gnocchi/__init__.py
similarity index 100%
rename from heat/engine/resources/openstack/ceilometer/gnocchi/__init__.py
rename to heat/engine/resources/openstack/aodh/gnocchi/__init__.py
diff --git a/heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py b/heat/engine/resources/openstack/aodh/gnocchi/alarm.py
similarity index 100%
rename from heat/engine/resources/openstack/ceilometer/gnocchi/alarm.py
rename to heat/engine/resources/openstack/aodh/gnocchi/alarm.py
diff --git a/heat/tests/openstack/ceilometer/__init__.py b/heat/tests/openstack/aodh/__init__.py
similarity index 100%
rename from heat/tests/openstack/ceilometer/__init__.py
rename to heat/tests/openstack/aodh/__init__.py
diff --git a/heat/tests/openstack/ceilometer/test_ceilometer_alarm.py b/heat/tests/openstack/aodh/test_alarm.py
similarity index 99%
rename from heat/tests/openstack/ceilometer/test_ceilometer_alarm.py
rename to heat/tests/openstack/aodh/test_alarm.py
index 8626c0e6f9..af503c7815 100644
--- a/heat/tests/openstack/ceilometer/test_ceilometer_alarm.py
+++ b/heat/tests/openstack/aodh/test_alarm.py
@@ -22,7 +22,7 @@ from heat.common import exception
 from heat.common import template_format
 from heat.engine.clients.os import aodh
 from heat.engine.clients.os import ceilometer
-from heat.engine.resources.openstack.ceilometer import alarm
+from heat.engine.resources.openstack.aodh import alarm
 from heat.engine import rsrc_defn
 from heat.engine import scheduler
 from heat.engine import stack as parser
diff --git a/heat/tests/openstack/ceilometer/test_gnocchi_alarm.py b/heat/tests/openstack/aodh/test_gnocchi_alarm.py
similarity index 99%
rename from heat/tests/openstack/ceilometer/test_gnocchi_alarm.py
rename to heat/tests/openstack/aodh/test_gnocchi_alarm.py
index 58f2fcaa22..d7b68bd63d 100644
--- a/heat/tests/openstack/ceilometer/test_gnocchi_alarm.py
+++ b/heat/tests/openstack/aodh/test_gnocchi_alarm.py
@@ -17,7 +17,7 @@ import mox
 from heat.common import exception
 from heat.common import template_format
 from heat.engine.clients.os import aodh
-from heat.engine.resources.openstack.ceilometer.gnocchi import (
+from heat.engine.resources.openstack.aodh.gnocchi import (
     alarm as gnocchi)
 from heat.engine import scheduler
 from heat.tests import common