diff --git a/xml/admin_cli.xml b/xml/admin_cli.xml
index f2594306d..5627fd161 100644
--- a/xml/admin_cli.xml
+++ b/xml/admin_cli.xml
@@ -365,7 +365,7 @@
       </listitem>
      </itemizedlist>
      <para>
-      If you intend to manage the image by &ostack; &orch;, you also need to
+      If you intend to manage the image by the &orch; module, you also need to
       include the following package:
       <systemitem class="resource">openstack-heat-cfntools</systemitem>
       (part of the &productname; ISO).
diff --git a/xml/admin_dashboard.xml b/xml/admin_dashboard.xml
index 803322650..677707bcd 100644
--- a/xml/admin_dashboard.xml
+++ b/xml/admin_dashboard.xml
@@ -104,7 +104,7 @@
       </term>
       <listitem>
        <para>
-        Shows statistics and charts connected to &ostack; &meter;.
+        Shows statistics and charts connected to the &meter; module.
        </para>
       </listitem>
      </varlistentry>
diff --git a/xml/glossary.xml b/xml/glossary.xml
index 8a21bcb1b..bc983d0b7 100644
--- a/xml/glossary.xml
+++ b/xml/glossary.xml
@@ -540,19 +540,7 @@
    </para>
   </glossdef>
  </glossentry>
- <glossentry id="gloss.ceilo">
-  <glossterm>&ostack; &meter;</glossterm>
-  <glossdef>
-   <para>
-    An &ostack; project (code name: <literal>&o_meter;</literal>), which is
-    the cloud metering component for &ostack;-based clouds. The project aims
-    to provide a unique point of contact across all &ostack; core components
-    for acquiring metrics which can then be consumed by other components
-    such as customer billing. It was incubated during the &ostack; Grizzly
-    cycle and will become integrated for the &ostack; Havana release.
-   </para>
-  </glossdef>
- </glossentry>
+ 
  <glossentry id="gloss.neutron"><glossterm>&ostack; &netw;</glossterm>
   <glossdef>
    <para>
@@ -575,19 +563,6 @@
    </para>
   </glossdef>
  </glossentry>
- <glossentry id="gloss.heat">
-  <glossterm>&ostack; &orch;</glossterm>
-  <glossdef>
-   <para>
-    <remark>taroth 2013-06-07: DEVs, is the following correct?</remark>
-    An &ostack; incubation project (code name: <literal>&o_orch;</literal>).
-    &ostack; &orch; is a service to orchestrate multiple composite cloud
-    applications using file-based or Web-based templates. It contains both a
-    user interface and an API and describes your cloud deployment in a
-    declarative language.
-   </para>
-  </glossdef>
- </glossentry>
  <glossentry><glossterm>&ostack; Service</glossterm>
   <glossdef>
    <para>
@@ -599,6 +574,17 @@
    </para>
   </glossdef>
  </glossentry>
+ <glossentry id="gloss.heat">
+  <glossterm>&orch;</glossterm>
+  <glossdef>
+   <para>
+    <remark>taroth 2013-06-07: DEVs, is the following correct?</remark> A module (code name:
+    <literal>&o_orch;</literal>) to orchestrate multiple composite cloud applications using
+    file-based or Web-based templates. It contains both a user interface and an API and describes
+    your cloud deployment in a declarative language. The module is an integrated project of &ostack;
+    as of the Havana release.</para>
+  </glossdef>
+ </glossentry>
  <glossentry><glossterm>PaaS (Platform-as-a-Service)</glossterm>
   <glossdef>
    <para>
@@ -856,6 +842,18 @@
    </para>
   </glossdef>
  </glossentry>
+ <glossentry id="gloss.ceilo">
+  <glossterm>&meter;</glossterm>
+  <glossdef>
+   <para>
+    A module (code name: <literal>&o_meter;</literal>) for metering 
+    &ostack;-based clouds. The project aims
+    to provide a unique point of contact across all &ostack; core components
+    for acquiring metrics which can then be consumed by other components
+    such as customer billing. The module is an integrated project of &ostack;
+    as of the Havana release.</para>
+  </glossdef>
+ </glossentry>
  <glossentry><glossterm>Tenant</glossterm>
   <glossdef>
    <para>
diff --git a/xml/phrases-decl.ent b/xml/phrases-decl.ent
index b2db115cf..d07e2b6c5 100644
--- a/xml/phrases-decl.ent
+++ b/xml/phrases-decl.ent
@@ -1320,7 +1320,7 @@ to cloud administrators or cloud operators only.</para>
      <command>ceilometer</command>
     </term>
     <listitem>
-     <para>For managing &ostack; &meter;. Provided by the
+     <para>For managing the &meter; module. Provided by the
      <systemitem class="resource">python-ceilometerclient</systemitem> package.
      </para>
     </listitem>
@@ -1350,7 +1350,7 @@ to cloud administrators or cloud operators only.</para>
      <command>heat</command>
     </term>
     <listitem>
-     <para>For managing &ostack; &orch;. Provided by the
+     <para>For managing the &orch; module. Provided by the
      <systemitem class="resource">python-heatclient</systemitem> package.
       </para>
     </listitem>