diff --git a/doc/common/app_support.rst b/doc/common/app_support.rst
index 79ca3ad36f..541f1251b0 100644
--- a/doc/common/app_support.rst
+++ b/doc/common/app_support.rst
@@ -172,7 +172,7 @@ The following Launchpad Bugs areas are available:
 
 *  `Bugs: Clustering service (senlin) <https://bugs.launchpad.net/senlin>`__
 
-*  `Bugs: Containers service (magnum) <https://bugs.launchpad.net/magnum>`__
+*  `Bugs: Container Infrastructure Management service (magnum) <https://bugs.launchpad.net/magnum>`__
 
 *  `Bugs: Data processing service
    (sahara) <https://bugs.launchpad.net/sahara>`__
diff --git a/doc/common/cli_install_openstack_command_line_clients.rst b/doc/common/cli_install_openstack_command_line_clients.rst
index 3ad3bdbee8..93cd418374 100644
--- a/doc/common/cli_install_openstack_command_line_clients.rst
+++ b/doc/common/cli_install_openstack_command_line_clients.rst
@@ -172,7 +172,7 @@ list below.
 *  ``gnocchi`` - Telemetry API v3
 *  ``heat`` - Orchestration API
 *  ``keystone`` - Identity service API and extensions
-*  ``magnum`` - Containers service API
+*  ``magnum`` - Container Infrastructure Management service API
 *  ``manila`` - Shared file systems API
 *  ``mistral`` - Workflow service API
 *  ``monasca`` - Monitoring API
diff --git a/doc/common/cli_overview.rst b/doc/common/cli_overview.rst
index 56734fe583..4033068c8f 100644
--- a/doc/common/cli_overview.rst
+++ b/doc/common/cli_overview.rst
@@ -60,7 +60,7 @@ service with its package name and description.
      - nova
      - python-novaclient
      - Creates and manages images, instances, and flavors.
-   * - Containers service
+   * - Container Infrastructure Management service
      - magnum
      - python-magnumclient
      - Creates and manages containers.
diff --git a/doc/common/glossary.rst b/doc/common/glossary.rst
index 9b92061bec..f202fe5753 100644
--- a/doc/common/glossary.rst
+++ b/doc/common/glossary.rst
@@ -898,16 +898,15 @@ C
       its associated metadata, such as machine state, OS disk size, and so
       on.
 
+   Container Infrastructure Management service
+
+      To provide a set of services for provisioning, scaling, and managing
+      container orchestration engines.
+
    container server
 
       An Object Storage server that manages containers.
 
-   Containers service
-
-      OpenStack project that provides a set of services for
-      management of application containers in a multi-tenant cloud
-      environment. The code name of the project name is magnum.
-
    container service
 
       The Object Storage component that provides container services,
diff --git a/www/developer/openstack-projects.html b/www/developer/openstack-projects.html
index fda95e9d9a..d29286d490 100644
--- a/www/developer/openstack-projects.html
+++ b/www/developer/openstack-projects.html
@@ -45,7 +45,7 @@
      Compute service Developer Documentation (nova)
     </a>
           <a href="http://docs.openstack.org/developer/magnum/">
-     Containers service Developer Documentation (magnum)
+     Container Infrastructure Management service Developer Documentation (magnum)
     </a>
           <a href="http://docs.openstack.org/developer/horizon/">
      Dashboard Developer Documentation (horizon)