diff --git a/addons/web/doc/changelog-7.0.rst b/addons/web/doc/changelog-7.0.rst
index 96ed1ae18a2..b801c11b945 100644
--- a/addons/web/doc/changelog-7.0.rst
+++ b/addons/web/doc/changelog-7.0.rst
@@ -15,7 +15,7 @@ DataSet -> Model
 ----------------
 
 The 6.1 ``DataSet`` API has been deprecated in favor of the smaller
-and more orthogonal :doc:`Model </dev_rpc>` API, which more closely
+and more orthogonal :doc:`Model </rpc>` API, which more closely
 matches the API in OpenERP Web's Python side and in OpenObject addons
 and removes most stateful behavior of DataSet.
 
diff --git a/addons/web/doc/dev_client_action.rst b/addons/web/doc/client_action.rst
similarity index 100%
rename from addons/web/doc/dev_client_action.rst
rename to addons/web/doc/client_action.rst
diff --git a/addons/web/doc/internal_form.rst b/addons/web/doc/form_view.rst
similarity index 100%
rename from addons/web/doc/internal_form.rst
rename to addons/web/doc/form_view.rst
diff --git a/addons/web/doc/index.rst b/addons/web/doc/index.rst
index b79762431fa..3e436200a8c 100644
--- a/addons/web/doc/index.rst
+++ b/addons/web/doc/index.rst
@@ -14,14 +14,13 @@ Contents:
     presentation
     async
 
-    dev_rpc
-    dev_widget
-    dev_qweb
-    dev_client_action
-
-    internal_form
-    internal_list
-    internal_search
+    widget
+    qweb
+    rpc
+    client_action
+    form_view
+    search_view
+    list_view
 
     changelog-7.0
 
diff --git a/addons/web/doc/internal_list.rst b/addons/web/doc/list_view.rst
similarity index 99%
rename from addons/web/doc/internal_list.rst
rename to addons/web/doc/list_view.rst
index c1ed4dcde89..51188d95f7b 100644
--- a/addons/web/doc/internal_list.rst
+++ b/addons/web/doc/list_view.rst
@@ -451,7 +451,7 @@ formview, delegating instead to its
         created.
 
         The result should be a valid form view, see :doc:`Form Notes
-        <internal_form>` for various peculiarities of the form view
+        <form_view>` for various peculiarities of the form view
         format.
 
         :param editor: editor object asking for the view
diff --git a/addons/web/doc/dev_qweb.rst b/addons/web/doc/qweb.rst
similarity index 100%
rename from addons/web/doc/dev_qweb.rst
rename to addons/web/doc/qweb.rst
diff --git a/addons/web/doc/dev_rpc.rst b/addons/web/doc/rpc.rst
similarity index 100%
rename from addons/web/doc/dev_rpc.rst
rename to addons/web/doc/rpc.rst
diff --git a/addons/web/doc/internal_search.rst b/addons/web/doc/search_view.rst
similarity index 100%
rename from addons/web/doc/internal_search.rst
rename to addons/web/doc/search_view.rst
diff --git a/addons/web/doc/dev_widget.rst b/addons/web/doc/widget.rst
similarity index 100%
rename from addons/web/doc/dev_widget.rst
rename to addons/web/doc/widget.rst