diff --git a/doc/common/ch_getstart.xml b/doc/common/ch_getstart.xml
index dd83155eb9..4e05a976ce 100644
--- a/doc/common/ch_getstart.xml
+++ b/doc/common/ch_getstart.xml
@@ -40,7 +40,7 @@
                 </td>
                 <td><link
                     xlink:href="http://docs.openstack.org/developer/horizon/"
-                    ><glossterm>Horizon</glossterm></link>
+                    ><glossterm baseform="horizon">Horizon</glossterm></link>
                 </td>
                 <td>Provides a web-based self-service portal
                  to interact with underlying OpenStack services,
@@ -54,7 +54,7 @@
                 </td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/nova/"
-                        ><glossterm>Nova</glossterm></link>
+                        ><glossterm baseform="nova">Nova</glossterm></link>
                 </td>
                 <td>Manages the lifecycle of compute instances in an
                     OpenStack environment. Responsibilities include
@@ -68,7 +68,7 @@
                 </td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/neutron/"
-                        ><glossterm>Neutron</glossterm></link>
+                        ><glossterm baseform="neutron">Neutron</glossterm></link>
                 </td>
                 <td>Enables Network-Connectivity-as-a-Service for
                     other OpenStack services, such as OpenStack Compute.
@@ -85,7 +85,7 @@
                 </td>
                 <td><link
                     xlink:href="http://docs.openstack.org/developer/swift/"
-                    ><glossterm>Swift</glossterm></link>
+                    ><glossterm baseform="swift">Swift</glossterm></link>
                 </td>
                 <td>Stores and retrieves arbitrary unstructured
                     data objects via a <glossterm>RESTful</glossterm>,
@@ -103,7 +103,7 @@
                 </td>
                 <td><link
                     xlink:href="http://docs.openstack.org/developer/cinder/"
-                    ><glossterm>Cinder</glossterm></link>
+                    ><glossterm baseform="cinder">Cinder</glossterm></link>
                 </td>
                 <td>Provides persistent block storage to running instances. Its pluggable driver
                     architecture facilitates the creation and management of block storage
@@ -117,7 +117,7 @@
                 </td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/keystone/"
-                        ><glossterm>Keystone</glossterm></link>
+                        ><glossterm baseform="keystone">Keystone</glossterm></link>
                 </td>
                 <td>Provides an authentication and authorization service
                     for other OpenStack services. Provides a catalog of endpoints
@@ -130,7 +130,7 @@
                 </td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/glance/"
-                        ><glossterm>Glance</glossterm></link>
+                        ><glossterm baseform="glance">Glance</glossterm></link>
               </td>
                 <td>Stores and retrieves virtual machine disk images.
                     OpenStack Compute makes use of this during instance
@@ -145,7 +145,7 @@
                 </td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/ceilometer/"
-                        ><glossterm>Ceilometer</glossterm></link>
+                        ><glossterm baseform="ceilometer">Ceilometer</glossterm></link>
                 </td>
                 <td>Monitors and meters the OpenStack cloud for
                     billing, benchmarking, scalability, and statistical
@@ -159,7 +159,7 @@
                         ><glossterm>Orchestration</glossterm></link></td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/heat/"
-                        ><glossterm>Heat</glossterm></link>
+                        ><glossterm baseform="heat">Heat</glossterm></link>
                 </td>
                 <td>Orchestrates multiple composite cloud applications by using
                     either the native <glossterm baseform="Heat Orchestration
@@ -175,7 +175,7 @@
                 </td>
                 <td><link
                         xlink:href="http://docs.openstack.org/developer/trove/"
-                        ><glossterm>Trove</glossterm></link>
+                        ><glossterm baseform="trove">Trove</glossterm></link>
                 </td>
                 <td>Provides scalable and reliable Cloud Database-as-a-Service
                    functionality for both relational and non-relational database
@@ -186,7 +186,7 @@
                             ><glossterm>Data processing service</glossterm></link>
                 </td>
                 <td><link xlink:href="http://docs.openstack.org/developer/sahara/"
-                            ><glossterm>Sahara</glossterm></link>
+                            ><glossterm baseform="sahara">Sahara</glossterm></link>
                 </td>
                 <td>Provides capabilties to provision and scale Hadoop clusters in OpenStack by
                     specifying parameters like Hadoop version, cluster topology and nodes hardware