diff --git a/doc/source/admin/blockstorage.rst b/doc/source/admin/index.rst
similarity index 100%
rename from doc/source/admin/blockstorage.rst
rename to doc/source/admin/index.rst
diff --git a/doc/source/configuration/block-storage.rst b/doc/source/configuration/index.rst
similarity index 100%
rename from doc/source/configuration/block-storage.rst
rename to doc/source/configuration/index.rst
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 9b004b834f4..975f17f483a 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -55,7 +55,7 @@ Cinder installation.
 .. toctree::
    :maxdepth: 2
 
-   admin/blockstorage
+   admin/index
 
 Contributor/Developer Docs
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -116,7 +116,7 @@ available for Cinder including a sample configuration file.
 .. toctree::
     :maxdepth: 1
 
-    configuration/block-storage
+    configuration/index
     sample_config
 
 Indices and tables