diff --git a/ceilometer/image/notifications.py b/ceilometer/image/notifications.py
index 82d35cb60..7d46c7988 100644
--- a/ceilometer/image/notifications.py
+++ b/ceilometer/image/notifications.py
@@ -27,7 +27,7 @@ from ceilometer.openstack.common import cfg
 
 OPTS = [
     cfg.StrOpt('glance_control_exchange',
-               default='glance_notifications',
+               default='glance',
                help="Exchange name for Glance notifications"),
 ]
 
diff --git a/doc/source/configuration.rst b/doc/source/configuration.rst
index e1ae2aa4c..61cceee82 100644
--- a/doc/source/configuration.rst
+++ b/doc/source/configuration.rst
@@ -32,7 +32,7 @@ If you use sql alchemy, its specific paramaters will need to be set.
 Parameter                        Default                               Note
 ===============================  ====================================  ==============================================================
 nova_control_exchange            nova                                  Exchange name for Nova notifications
-glance_control_exchange          glance_notifications                  Exchange name for Glance notifications
+glance_control_exchange          glance                                Exchange name for Glance notifications
 cinder_control_exchange          cinder                                Exchange name for Cinder notifications
 quantum_control_exchange         quantum                               Exchange name for Quantum notifications
 metering_secret                  change this or be hacked              Secret value for signing metering messages