diff --git a/doc/common-rst/get_started_orchestration.rst b/doc/common-rst/get_started_orchestration.rst
index 77155469ae..cd04565897 100644
--- a/doc/common-rst/get_started_orchestration.rst
+++ b/doc/common-rst/get_started_orchestration.rst
@@ -1,8 +1,8 @@
-==============================
-OpenStack Orchestration module
-==============================
+===============================
+OpenStack Orchestration service
+===============================
 
-The Orchestration module provides a template-based orchestration for
+The Orchestration service provides a template-based orchestration for
 describing a cloud application by running OpenStack API calls to
 generate running cloud applications. The software integrates other core
 components of OpenStack into a one-file template system. The templates
@@ -12,10 +12,10 @@ advanced functionality, such as instance high availability, instance
 auto-scaling, and nested stacks. This enables OpenStack core projects to
 receive a larger user base.
 
-The service enables deployers to integrate with the Orchestration module
+The service enables deployers to integrate with the Orchestration service
 directly or through custom plug-ins.
 
-The Orchestration module consists of the following components:
+The Orchestration service consists of the following components:
 
 ``heat`` command-line client
   A CLI that communicates with the heat-api to run AWS CloudFormation
diff --git a/doc/common-rst/get_started_telemetry.rst b/doc/common-rst/get_started_telemetry.rst
index f53918d9de..7c4bcedab0 100644
--- a/doc/common-rst/get_started_telemetry.rst
+++ b/doc/common-rst/get_started_telemetry.rst
@@ -1,8 +1,8 @@
-==========================
-OpenStack Telemetry module
-==========================
+===========================
+OpenStack Telemetry service
+===========================
 
-The Telemetry module performs the following functions:
+The Telemetry service performs the following functions:
 
 - Efficiently polls metering data related to OpenStack services.
 
@@ -14,7 +14,7 @@ The Telemetry module performs the following functions:
 
 - Creates alarms when collected data breaks defined rules.
 
-The Telemetry module consists of the following components:
+The Telemetry service consists of the following components:
 
 A compute agent (``ceilometer-agent-compute``)
   Runs on each compute node and polls for resource utilization
diff --git a/doc/glossary/glossary-terms.xml b/doc/glossary/glossary-terms.xml
index b5df33ec8a..4e55f5a3fb 100644
--- a/doc/glossary/glossary-terms.xml
+++ b/doc/glossary/glossary-terms.xml
@@ -874,7 +874,7 @@
       <glossdef>
         <para>
           AWS CloudFormation allows AWS users to create and manage a
-          collection of related resources. The Orchestration module
+          collection of related resources. The Orchestration service
           supports a CloudFormation-compatible format (CFN).
         </para>
       </glossdef>
@@ -2163,8 +2163,8 @@
         <para>An official OpenStack project. Currently consists of Compute
         (nova), Object Storage (swift), Image service (glance), Identity
         (keystone), Dashboard (horizon), Networking (neutron), and Block
-        Storage (cinder), the Telemetry module (ceilometer), Orchestration
-        module (heat), Database service (trove), Bare Metal service (ironic),
+        Storage (cinder), Telemetry (ceilometer), Orchestration (heat),
+        Database service (trove), Bare Metal service (ironic),
         Data processing service (sahara). However, this
         definition is changing based on
         community discussions about the "Big Tent".