diff --git a/doc/common/get_started_block_storage.rst b/doc/common/get_started_block_storage.rst
index 81e3188869..846b9c7780 100644
--- a/doc/common/get_started_block_storage.rst
+++ b/doc/common/get_started_block_storage.rst
@@ -1,6 +1,6 @@
-=======================
-OpenStack Block Storage
-=======================
+==============================
+Block Storage service overview
+==============================
The OpenStack Block Storage service (cinder) adds persistent storage
to a virtual machine. Block Storage provides an infrastructure for managing
diff --git a/doc/common/get_started_compute.rst b/doc/common/get_started_compute.rst
index 8e2770501b..43f6370111 100644
--- a/doc/common/get_started_compute.rst
+++ b/doc/common/get_started_compute.rst
@@ -1,6 +1,6 @@
-=================
-OpenStack Compute
-=================
+========================
+Compute service overview
+========================
Use OpenStack Compute to host and manage cloud computing systems.
OpenStack Compute is a major part of an Infrastructure-as-a-Service
diff --git a/doc/common/get_started_dashboard.rst b/doc/common/get_started_dashboard.rst
index 1dd2a078c5..5140f20b82 100644
--- a/doc/common/get_started_dashboard.rst
+++ b/doc/common/get_started_dashboard.rst
@@ -1,8 +1,6 @@
-.. _get_started_dashboard:
-
-===================
-OpenStack dashboard
-===================
+==================
+Dashboard overview
+==================
The OpenStack dashboard is a modular `Django web
application `__ that provides a
diff --git a/doc/common/get_started_sahara.rst b/doc/common/get_started_data_processing.rst
similarity index 92%
rename from doc/common/get_started_sahara.rst
rename to doc/common/get_started_data_processing.rst
index 18288e50c6..7fea288bfe 100644
--- a/doc/common/get_started_sahara.rst
+++ b/doc/common/get_started_data_processing.rst
@@ -1,6 +1,6 @@
-=================================
-OpenStack Data processing service
-=================================
+================================
+Data Processing service overview
+================================
The Data processing service for OpenStack (sahara) aims to provide users
with a simple means to provision data processing (Hadoop, Spark)
diff --git a/doc/common/get_started_database_service.rst b/doc/common/get_started_database_service.rst
index e6d0a76aed..47151cf030 100644
--- a/doc/common/get_started_database_service.rst
+++ b/doc/common/get_started_database_service.rst
@@ -1,6 +1,6 @@
-==========================
-OpenStack Database service
-==========================
+=========================
+Database service overview
+=========================
The Database service provides scalable and reliable cloud provisioning
functionality for both relational and non-relational database engines.
diff --git a/doc/common/get_started_identity.rst b/doc/common/get_started_identity.rst
index 4ad4ba7abe..c901bf3a7a 100644
--- a/doc/common/get_started_identity.rst
+++ b/doc/common/get_started_identity.rst
@@ -1,6 +1,6 @@
-==================
-OpenStack Identity
-==================
+=========================
+Identity service overview
+=========================
The OpenStack :term:`Identity service` provides a single point of
integration for managing authentication, authorization, and service catalog
diff --git a/doc/common/get_started_image_service.rst b/doc/common/get_started_image_service.rst
index 04066b1f20..7b5abcb381 100644
--- a/doc/common/get_started_image_service.rst
+++ b/doc/common/get_started_image_service.rst
@@ -1,6 +1,6 @@
-=======================
-OpenStack Image service
-=======================
+======================
+Image service overview
+======================
The OpenStack Image service is central to Infrastructure-as-a-Service
(IaaS) as shown in :ref:`get_started_conceptual_architecture`. It accepts API
diff --git a/doc/common/get_started_logical_architecture.rst b/doc/common/get_started_logical_architecture.rst
index 7babb23c41..cdb25f4e95 100644
--- a/doc/common/get_started_logical_architecture.rst
+++ b/doc/common/get_started_logical_architecture.rst
@@ -24,7 +24,7 @@ several message broker and database solutions, such as RabbitMQ,
MySQL, MariaDB, and SQLite.
Users can access OpenStack via the web-based user interface implemented
-by the :ref:`get_started_dashboard`, via `command-line
+by :doc:`Dashboard `, via `command-line
clients `__ and by
issuing API requests through tools like browser plug-ins or :command:`curl`.
For applications, `several SDKs `__
diff --git a/doc/common/get_started_openstack_networking.rst b/doc/common/get_started_networking.rst
similarity index 93%
rename from doc/common/get_started_openstack_networking.rst
rename to doc/common/get_started_networking.rst
index fe279aec07..55c051e576 100644
--- a/doc/common/get_started_openstack_networking.rst
+++ b/doc/common/get_started_networking.rst
@@ -1,6 +1,6 @@
-====================
-OpenStack Networking
-====================
+===========================
+Networking service overview
+===========================
OpenStack Networking (neutron) allows you to create and attach interface
devices managed by other OpenStack services to networks. Plug-ins can be
diff --git a/doc/common/get_started_object_storage.rst b/doc/common/get_started_object_storage.rst
index e31e783e30..301f6a2ebd 100644
--- a/doc/common/get_started_object_storage.rst
+++ b/doc/common/get_started_object_storage.rst
@@ -1,6 +1,6 @@
-========================
-OpenStack Object Storage
-========================
+===============================
+Object Storage service overview
+===============================
The OpenStack Object Storage is a multi-tenant object storage system. It
is highly scalable and can manage large amounts of unstructured data at
diff --git a/doc/common/get_started_openstack_services.rst b/doc/common/get_started_openstack_services.rst
index 8c2ab09dd2..6547fb9b0a 100644
--- a/doc/common/get_started_openstack_services.rst
+++ b/doc/common/get_started_openstack_services.rst
@@ -10,14 +10,14 @@ OpenStack services
get_started_storage_concepts.rst
get_started_object_storage.rst
get_started_block_storage.rst
- get_started_file_storage.rst
- get_started_openstack_networking.rst
+ get_started_shared_file_systems.rst
+ get_started_networking.rst
get_started_dashboard.rst
get_started_identity.rst
get_started_image_service.rst
get_started_telemetry.rst
get_started_orchestration.rst
get_started_database_service.rst
- get_started_sahara.rst
+ get_started_data_processing.rst
This section describes OpenStack services in detail.
diff --git a/doc/common/get_started_orchestration.rst b/doc/common/get_started_orchestration.rst
index 3cf0d134ed..31551e6ece 100644
--- a/doc/common/get_started_orchestration.rst
+++ b/doc/common/get_started_orchestration.rst
@@ -1,6 +1,6 @@
-===============================
-OpenStack Orchestration service
-===============================
+==============================
+Orchestration service overview
+==============================
The Orchestration service provides a template-based orchestration for
describing a cloud application by running OpenStack API calls to
diff --git a/doc/common/get_started_file_storage.rst b/doc/common/get_started_shared_file_systems.rst
similarity index 93%
rename from doc/common/get_started_file_storage.rst
rename to doc/common/get_started_shared_file_systems.rst
index e4e06995d5..1079851e7c 100644
--- a/doc/common/get_started_file_storage.rst
+++ b/doc/common/get_started_shared_file_systems.rst
@@ -1,6 +1,6 @@
-=====================================
-OpenStack Shared File Systems service
-=====================================
+====================================
+Shared File Systems service overview
+====================================
The OpenStack Shared File Systems service (manila) provides file storage to a
virtual machine. The Shared File Systems service provides an infrastructure
diff --git a/doc/common/get_started_telemetry.rst b/doc/common/get_started_telemetry.rst
index efcedd4cce..aa0ae2f9bc 100644
--- a/doc/common/get_started_telemetry.rst
+++ b/doc/common/get_started_telemetry.rst
@@ -1,6 +1,6 @@
-===========================
-OpenStack Telemetry service
-===========================
+==========================
+Telemetry service overview
+==========================
Telemetry Data Collection service
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/install-guide/source/conf.py b/doc/install-guide/source/conf.py
index 1dda8d6e30..494450bf42 100644
--- a/doc/install-guide/source/conf.py
+++ b/doc/install-guide/source/conf.py
@@ -99,7 +99,7 @@ exclude_patterns = ['common/cli*', 'common/nova*',
'common/get_started_dashboard.rst',
'common/get_started_database_service.rst',
'common/get_started_storage_concepts.rst',
- 'common/get_started_sahara.rst',
+ 'common/get_started_data_processing.rst',
'common/dashboard_customizing.rst',
'shared/note_configuration_vary_by_distribution.rst']
diff --git a/doc/install-guide/source/manila.rst b/doc/install-guide/source/manila.rst
index fa869b519b..b78c32d1bf 100644
--- a/doc/install-guide/source/manila.rst
+++ b/doc/install-guide/source/manila.rst
@@ -6,7 +6,7 @@ Shared File Systems service
.. toctree::
- common/get_started_file_storage.rst
+ common/get_started_shared_file_systems.rst
manila-controller-install.rst
manila-share-install.rst
manila-verify.rst
diff --git a/doc/install-guide/source/neutron.rst b/doc/install-guide/source/neutron.rst
index 1bbac504d8..afcbc560f8 100644
--- a/doc/install-guide/source/neutron.rst
+++ b/doc/install-guide/source/neutron.rst
@@ -14,7 +14,7 @@ traffic flows, see the
.. toctree::
:maxdepth: 1
- common/get_started_openstack_networking.rst
+ common/get_started_networking.rst
neutron-concepts.rst
neutron-controller-install.rst
neutron-compute-install.rst