diff --git a/{{cookiecutter.repo_name}}/CONTRIBUTING.rst b/{{cookiecutter.repo_name}}/CONTRIBUTING.rst
index c41aa75..ccca9b2 100644
--- a/{{cookiecutter.repo_name}}/CONTRIBUTING.rst
+++ b/{{cookiecutter.repo_name}}/CONTRIBUTING.rst
@@ -1,3 +1,7 @@
+=============================================
+Contributing to: {{ cookiecutter.repo_name }}
+=============================================
+
 If you would like to contribute to the development of OpenStack,
 you must follow the steps in the "If you're a developer, start here"
 section of this page:
diff --git a/{{cookiecutter.repo_name}}/doc/source/conf.py b/{{cookiecutter.repo_name}}/doc/source/conf.py
index aa62045..95300f0 100755
--- a/{{cookiecutter.repo_name}}/doc/source/conf.py
+++ b/{{cookiecutter.repo_name}}/doc/source/conf.py
@@ -23,7 +23,7 @@ sys.path.insert(0, os.path.abspath('../..'))
 extensions = [
     'sphinx.ext.autodoc',
     #'sphinx.ext.intersphinx',
-    'oslo.sphinx'
+    'oslosphinx'
 ]
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/{{cookiecutter.repo_name}}/doc/source/contributing.rst b/{{cookiecutter.repo_name}}/doc/source/contributing.rst
deleted file mode 100644
index ac7b6bc..0000000
--- a/{{cookiecutter.repo_name}}/doc/source/contributing.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../../CONTRIBUTING.rst
diff --git a/{{cookiecutter.repo_name}}/doc/source/contributing.rst b/{{cookiecutter.repo_name}}/doc/source/contributing.rst
new file mode 120000
index 0000000..e9a8ba6
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/doc/source/contributing.rst
@@ -0,0 +1 @@
+../../CONTRIBUTING.rst
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/doc/source/index.rst b/{{cookiecutter.repo_name}}/doc/source/index.rst
index 4b1762a..e5b2bda 100644
--- a/{{cookiecutter.repo_name}}/doc/source/index.rst
+++ b/{{cookiecutter.repo_name}}/doc/source/index.rst
@@ -18,9 +18,10 @@
 
 .. toctree::
    :maxdepth: 2
-   readme <readme>
-   contributing <contributing>
-   Sample Template <template.rst>
+
+   README <readme>
+   contributing
+   Sample Template <template>
 
 
 Indices and tables
diff --git a/{{cookiecutter.repo_name}}/doc/source/readme.rst b/{{cookiecutter.repo_name}}/doc/source/readme.rst
deleted file mode 100644
index 72a3355..0000000
--- a/{{cookiecutter.repo_name}}/doc/source/readme.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../README.rst
diff --git a/{{cookiecutter.repo_name}}/doc/source/readme.rst b/{{cookiecutter.repo_name}}/doc/source/readme.rst
new file mode 120000
index 0000000..c768ff7
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/doc/source/readme.rst
@@ -0,0 +1 @@
+../../README.rst
\ No newline at end of file
diff --git a/{{cookiecutter.repo_name}}/doc/source/template.rst b/{{cookiecutter.repo_name}}/doc/source/template.rst
deleted file mode 100644
index b92a6bd..0000000
--- a/{{cookiecutter.repo_name}}/doc/source/template.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../template.rst
diff --git a/{{cookiecutter.repo_name}}/doc/source/template.rst b/{{cookiecutter.repo_name}}/doc/source/template.rst
new file mode 120000
index 0000000..cf443d6
--- /dev/null
+++ b/{{cookiecutter.repo_name}}/doc/source/template.rst
@@ -0,0 +1 @@
+../../template.rst
\ No newline at end of file