diff --git a/common-rst/README.txt b/common/README.txt
similarity index 51%
rename from common-rst/README.txt
rename to common/README.txt
index 4b9f64417..f46538ad5 100644
--- a/common-rst/README.txt
+++ b/common/README.txt
@@ -2,6 +2,6 @@ Important note about this directory
 ===================================
 
 Because this directory is synced from openstack-manuals, make any changes in
-openstack-manuals/doc/common-rst. After changes to the synced files merge to
-openstack-manuals/doc/common-rst, a patch is automatically proposed for this
+openstack-manuals/doc/common. After changes to the synced files merge to
+openstack-manuals/doc/common, a patch is automatically proposed for this
 directory.
diff --git a/common-rst/app_support.rst b/common/app_support.rst
similarity index 100%
rename from common-rst/app_support.rst
rename to common/app_support.rst
diff --git a/common-rst/conventions.rst b/common/conventions.rst
similarity index 100%
rename from common-rst/conventions.rst
rename to common/conventions.rst
diff --git a/common-rst/glossary.rst b/common/glossary.rst
similarity index 100%
rename from common-rst/glossary.rst
rename to common/glossary.rst
diff --git a/common-rst/source/locale/ja/LC_MESSAGES/common-rst.po b/common/source/locale/ja/LC_MESSAGES/common-rst.po
similarity index 100%
rename from common-rst/source/locale/ja/LC_MESSAGES/common-rst.po
rename to common/source/locale/ja/LC_MESSAGES/common-rst.po
diff --git a/doc-tools-check-languages.conf b/doc-tools-check-languages.conf
index 91c162a53..6a657b342 100644
--- a/doc-tools-check-languages.conf
+++ b/doc-tools-check-languages.conf
@@ -47,5 +47,5 @@ SPECIAL_BOOKS=(
     ["api-quick-start"]="RST"
     ["firstapp"]="RST"
     # These are translated in openstack-manuals
-    ["common-rst"]="skip"
+    ["common"]="skip"
 )
diff --git a/firstapp/source/common b/firstapp/source/common
index 70c1930ee..dc879abe9 120000
--- a/firstapp/source/common
+++ b/firstapp/source/common
@@ -1 +1 @@
-../../common-rst
\ No newline at end of file
+../../common
\ No newline at end of file
diff --git a/tools/build-rst.sh b/tools/build-rst.sh
index c4b838301..c08dfc997 100755
--- a/tools/build-rst.sh
+++ b/tools/build-rst.sh
@@ -56,7 +56,7 @@ done
 
 if [ "$GLOSSARY" -eq "1" ] ; then
     echo "Generating Glossary"
-    tools/glossary2rst.py doc/common-rst/glossary.rst
+    tools/glossary2rst.py doc/common/glossary.rst
 fi
 
 if [ -z "$BUILD" ] ; then
diff --git a/tools/generatepot-rst.sh b/tools/generatepot-rst.sh
index 1bba00070..3f7740edb 100755
--- a/tools/generatepot-rst.sh
+++ b/tools/generatepot-rst.sh
@@ -31,14 +31,14 @@ fi
 
 
 # We're not doing anything for this directory. But we need to handle
-# it by this script so that the common-rst.pot file gets registered.
-if [[ "$DOCNAME" = "common-rst" ]] ; then
+# it by this script so that the common.pot file gets registered.
+if [[ "$DOCNAME" = "common" ]] ; then
     exit 0
 fi
 
 if [ "$REPOSITORY" = "openstack-manuals" ] ; then
     # Build Glossary
-    tools/glossary2rst.py doc/common-rst/glossary.rst
+    tools/glossary2rst.py doc/common/glossary.rst
 fi
 # First remove the old pot file, otherwise the new file will contain
 # old references
@@ -61,18 +61,18 @@ if [ "$REPOSITORY" = "openstack-manuals" ] ; then
     sed -i -e 's/^"Project-Id-Version: [a-zA-Z0-9\. ]+\\n"$/"Project-Id-Version: \\n"/' \
         ${DIRECTORY}/source/locale/common.pot
     # Create the common pot file
-    msgcat --sort-by-file ${TOPDIR}common-rst/source/locale/common-rst.pot \
+    msgcat --sort-by-file ${TOPDIR}common/source/locale/common.pot \
         ${DIRECTORY}/source/locale/common.pot | \
         sed -e 's/^"Project-Id-Version: [a-zA-Z0-9\. ]+\\n"$/"Project-Id-Version: \\n"/' | \
         awk '$0 !~ /^\# [a-z0-9]+$/' | awk '$0 !~ /^\# \#-\#-\#-\#-\# /' \
-        > ${DIRECTORY}/source/locale/common-rst.pot
-    mv -f ${DIRECTORY}/source/locale/common-rst.pot \
-        ${TOPDIR}common-rst/source/locale/common-rst.pot
+        > ${DIRECTORY}/source/locale/common.pot
+    mv -f ${DIRECTORY}/source/locale/common.pot \
+        ${TOPDIR}common/source/locale/common.pot
     rm -f ${DIRECTORY}/source/locale/common.pot
 
     # Simplify metadata
-    rm -f ${TOPDIR}common-rst/source/locale/dummy.po
-    cat << EOF > ${TOPDIR}common-rst/source/locale/dummy.po
+    rm -f ${TOPDIR}common/source/locale/dummy.po
+    cat << EOF > ${TOPDIR}common/source/locale/dummy.po
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
@@ -85,14 +85,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 EOF
-    msgmerge -N ${TOPDIR}common-rst/source/locale/dummy.po \
-        ${TOPDIR}common-rst/source/locale/common-rst.pot \
-        > ${TOPDIR}common-rst/source/locale/tmp.pot
-    mv -f ${TOPDIR}common-rst/source/locale/tmp.pot \
-        ${TOPDIR}common-rst/source/locale/common-rst.pot
-    rm -f ${TOPDIR}common-rst/source/locale/dummy.po
+    msgmerge -N ${TOPDIR}common/source/locale/dummy.po \
+        ${TOPDIR}common/source/locale/common.pot \
+        > ${TOPDIR}common/source/locale/tmp.pot
+    mv -f ${TOPDIR}common/source/locale/tmp.pot \
+        ${TOPDIR}common/source/locale/common.pot
+    rm -f ${TOPDIR}common/source/locale/dummy.po
 else
-    # common-rst is translated as part of openstack-manuals, do not
+    # common is translated as part of openstack-manuals, do not
     # include the file in the combined tree if it exists.
     if [ -f ${DIRECTORY}/source/locale/common.pot ] ; then
         rm ${DIRECTORY}/source/locale/common.pot
diff --git a/tox.ini b/tox.ini
index a16bc95a4..c2e103f01 100644
--- a/tox.ini
+++ b/tox.ini
@@ -168,7 +168,7 @@ commands =
 [doc8]
 # Settings for doc8:
 # Ignore target directories
-ignore-path = firstapp/build*,common-rst/
+ignore-path = firstapp/build*,common/
 # File extensions to use
 extensions = .rst,.txt
 # Ignore lines longer than 79 chars