diff --git a/doc/admin-guide/source/blockstorage-boot-from-volume.rst b/doc/admin-guide/source/blockstorage-boot-from-volume.rst
index ea26c34acb..c7bcab6697 100644
--- a/doc/admin-guide/source/blockstorage-boot-from-volume.rst
+++ b/doc/admin-guide/source/blockstorage-boot-from-volume.rst
@@ -6,5 +6,5 @@ In some cases, you can store and run instances from inside volumes.
 For information, see the `Launch an instance from a volume`_ section
 in the `OpenStack End User Guide`_.
 
-.. _`Launch an instance from a volume`: http://docs.openstack.org/user-guide/cli_nova_launch_instance_from_volume.html
+.. _`Launch an instance from a volume`: http://docs.openstack.org/user-guide/cli-nova-launch-instance-from-volume.html
 .. _`OpenStack End User Guide`: http://docs.openstack.org/user-guide/
diff --git a/doc/admin-guide/source/cli-admin-manage-ip-addresses.rst b/doc/admin-guide/source/cli-admin-manage-ip-addresses.rst
index 313d080a6e..c512dd1727 100644
--- a/doc/admin-guide/source/cli-admin-manage-ip-addresses.rst
+++ b/doc/admin-guide/source/cli-admin-manage-ip-addresses.rst
@@ -13,7 +13,7 @@ Internet.
   addresses with projects and instances. You can change user permissions for
   managing IP addresses by updating the ``/etc/nova/policy.json``
   file. For basic floating-IP procedures, refer to the `Allocate a
-  floating address to an instance <http://docs.openstack.org/user-guide/configure_access_and_security_for_instances.html#allocate-a-floating-ip-address-to-an-instance>`_
+  floating address to an instance <http://docs.openstack.org/user-guide/configure-access-and-security-for-instances.html#allocate-a-floating-ip-address-to-an-instance>`_
   section in the OpenStack End User Guide.
 
 - For details on creating public networks using OpenStack Networking
diff --git a/doc/admin-guide/source/cli-admin-manage-stacks.rst b/doc/admin-guide/source/cli-admin-manage-stacks.rst
index fd9241ce6e..f28638c3dd 100644
--- a/doc/admin-guide/source/cli-admin-manage-stacks.rst
+++ b/doc/admin-guide/source/cli-admin-manage-stacks.rst
@@ -20,7 +20,7 @@ For information about:
 
 -  basic creation and deletion of Orchestration stacks, refer
    to the `OpenStack End User Guide
-   <http://docs.openstack.org/user-guide/dashboard_stacks.html>`_
+   <http://docs.openstack.org/user-guide/dashboard-stacks.html>`_
 
 -  **openstack** CLI, see the `OpenStack Command-Line Interface
    Reference <http://docs.openstack.org/cli-reference/openstack.html>`_
diff --git a/doc/admin-guide/source/compute-configuring-migrations.rst b/doc/admin-guide/source/compute-configuring-migrations.rst
index 357733e5da..35951f6c5b 100644
--- a/doc/admin-guide/source/compute-configuring-migrations.rst
+++ b/doc/admin-guide/source/compute-configuring-migrations.rst
@@ -35,7 +35,7 @@ The migration types are:
 
    -  **Block live migration**. No shared storage is required.
       Incompatible with read-only devices such as CD-ROMs and
-      `Configuration Drive (config\_drive) <http://docs.openstack.org/user-guide/cli_config_drive.html>`_.
+      `Configuration Drive (config\_drive) <http://docs.openstack.org/user-guide/cli-config-drive.html>`_.
 
    -  **Volume-backed live migration**. Instances are backed by volumes
       rather than ephemeral disk, no shared storage is required, and
@@ -309,7 +309,7 @@ configuration is required.
       parameter with the live migration command.
 
    -  Block migration is incompatible with read-only devices such as
-      CD-ROMs and `Configuration Drive (config_drive) <http://docs.openstack.org/user-guide/cli_config_drive.html>`_.
+      CD-ROMs and `Configuration Drive (config_drive) <http://docs.openstack.org/user-guide/cli-config-drive.html>`_.
 
    -  Since the ephemeral drives are copied over the network in block
       migration, migrations of instances with heavy I/O loads may never
diff --git a/doc/admin-guide/source/dashboard-admin-manage-stacks.rst b/doc/admin-guide/source/dashboard-admin-manage-stacks.rst
index 23673cac04..9fe369e3f3 100644
--- a/doc/admin-guide/source/dashboard-admin-manage-stacks.rst
+++ b/doc/admin-guide/source/dashboard-admin-manage-stacks.rst
@@ -30,5 +30,5 @@ For information about:
 
 * the basic creation and deletion of Orchestration stacks, refer to
   the `OpenStack End User Guide
-  <http://docs.openstack.org/user-guide/dashboard_stacks.html>`__.
+  <http://docs.openstack.org/user-guide/dashboard-stacks.html>`__.
 
diff --git a/doc/admin-guide/source/dashboard-manage-images.rst b/doc/admin-guide/source/dashboard-manage-images.rst
index 399ab250fc..df8509b065 100644
--- a/doc/admin-guide/source/dashboard-manage-images.rst
+++ b/doc/admin-guide/source/dashboard-manage-images.rst
@@ -10,7 +10,7 @@ access.
 To create and manage images in specified projects as an end
 user, see the `upload and manage images with Dashboard in
 OpenStack End User Guide
-<http://docs.openstack.org/user-guide/dashboard_manage_images.html>`_
+<http://docs.openstack.org/user-guide/dashboard-manage-images.html>`_
 and `manage images with CLI in OpenStack End User Guide
 <http://docs.openstack.org/user-guide/common/cli-manage-images.html>`_ .
 
diff --git a/doc/admin-guide/source/dashboard-manage-instances.rst b/doc/admin-guide/source/dashboard-manage-instances.rst
index e00828be03..d127dca1e1 100644
--- a/doc/admin-guide/source/dashboard-manage-instances.rst
+++ b/doc/admin-guide/source/dashboard-manage-instances.rst
@@ -8,7 +8,7 @@ create a snapshot from, and migrate instances. You can also view the
 logs for instances or launch a VNC console for an instance.
 
 For information about using the Dashboard to launch instances as an end
-user, see the `OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard_launch_instances.html>`__.
+user, see the `OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard-launch-instances.html>`__.
 
 Create instance snapshots
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -30,7 +30,7 @@ Create instance snapshots
 #. To launch an instance from the snapshot, select the snapshot and
    click :guilabel:`Launch Instance`. For information about launching
    instances, see the
-   `OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard_launch_instances.html>`__.
+   `OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard-launch-instances.html>`__.
 
 Control the state of an instance
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/admin-guide/source/dashboard-manage-shares.rst b/doc/admin-guide/source/dashboard-manage-shares.rst
index 25a2328303..aba6504433 100644
--- a/doc/admin-guide/source/dashboard-manage-shares.rst
+++ b/doc/admin-guide/source/dashboard-manage-shares.rst
@@ -6,7 +6,7 @@ Shares are file storage that instances can access. Users can
 allow or deny a running instance to have access to a share at any time.
 For information about using the Dashboard to create and manage shares as
 an end user, see the
-`OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard_manage_shares.html>`_.
+`OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard-manage-shares.html>`_.
 
 As an administrative user, you can manage shares and share types for users
 in various projects. You can create and delete share types, and view
diff --git a/doc/admin-guide/source/dashboard-manage-volumes.rst b/doc/admin-guide/source/dashboard-manage-volumes.rst
index 3a3fa12842..afe8b71f95 100644
--- a/doc/admin-guide/source/dashboard-manage-volumes.rst
+++ b/doc/admin-guide/source/dashboard-manage-volumes.rst
@@ -6,7 +6,7 @@ Volumes are the Block Storage devices that you attach to instances to enable
 persistent storage. Users can attach a volume to a running instance or detach
 a volume and attach it to another instance at any time. For information about
 using the dashboard to create and manage volumes as an end user, see the
-`OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard_manage_volumes.html>`_.
+`OpenStack End User Guide <http://docs.openstack.org/user-guide/dashboard-manage-volumes.html>`_.
 
 As an administrative user, you can manage volumes and volume types for users
 in various projects. You can create and delete volume types, and you can view
diff --git a/doc/admin-guide/source/dashboard.rst b/doc/admin-guide/source/dashboard.rst
index accf747338..b98a49bc7d 100644
--- a/doc/admin-guide/source/dashboard.rst
+++ b/doc/admin-guide/source/dashboard.rst
@@ -30,8 +30,8 @@ for your operating system.
   <http://docs.openstack.org/developer/horizon/topics/deployment.html>`__.
 - To launch instances with the dashboard as an end user, see the
   `Launch and manage instances
-  <http://docs.openstack.org/user-guide/dashboard_launch_instances.html>`__.
+  <http://docs.openstack.org/user-guide/dashboard-launch-instances.html>`__.
   in the OpenStack End User Guide.
 - To create and manage ports, see the `Create and manage networks
-  <http://docs.openstack.org/user-guide/dashboard_create_networks.html#create-a-port>`__
+  <http://docs.openstack.org/user-guide/dashboard-create-networks.html#create-a-port>`__
   section of the OpenStack End User Guide.
diff --git a/doc/admin-guide/source/objectstorage-large-objects.rst b/doc/admin-guide/source/objectstorage-large-objects.rst
index 3b4046369b..f6c790b3ad 100644
--- a/doc/admin-guide/source/objectstorage-large-objects.rst
+++ b/doc/admin-guide/source/objectstorage-large-objects.rst
@@ -29,7 +29,7 @@ The large object is comprised of two types of objects:
    - **Dynamic large objects**
 
 To find out more information on large object support, see `Large objects
-<http://docs.openstack.org/user-guide/cli_swift_large_object_creation.html>`_
+<http://docs.openstack.org/user-guide/cli-swift-large-object-creation.html>`_
 in the OpenStack End User Guide, or `Large Object Support
 <http://docs.openstack.org/developer/swift/overview_large_objects.html>`_
 in the developer documentation.
diff --git a/doc/image-guide/source/obtain-images.rst b/doc/image-guide/source/obtain-images.rst
index 54e0800542..99a61fd632 100644
--- a/doc/image-guide/source/obtain-images.rst
+++ b/doc/image-guide/source/obtain-images.rst
@@ -10,7 +10,7 @@ Because many of the images disable SSH password authentication
 by default, boot the image with an injected key pair.
 You can ``SSH`` into the instance with the private key and default
 login account. See the `OpenStack End User Guide
-<http://docs.openstack.org/user-guide/configure_access_and_security_for_instances.html>`_
+<http://docs.openstack.org/user-guide/configure-access-and-security-for-instances.html>`_
 for more information on how to create and inject key pairs with OpenStack.
 
 CentOS
diff --git a/doc/image-guide/source/openstack-images.rst b/doc/image-guide/source/openstack-images.rst
index 08af39efee..6fb52f13c6 100644
--- a/doc/image-guide/source/openstack-images.rst
+++ b/doc/image-guide/source/openstack-images.rst
@@ -273,7 +273,7 @@ Process user data and other metadata (cloud-init)
 In addition to the ssh public key, an image might need
 additional information from OpenStack, such as
 `Provide user data to instances <http://docs.openstack.org/
-user-guide/cli_provide_user_data_to_instances.html>`_,
+user-guide/cli-provide-user-data-to-instances.html>`_,
 that the user submitted when requesting the image.
 For example, you might want to set the host name of the instance
 when it is booted. Or, you might wish to configure your image
@@ -281,7 +281,7 @@ so that it executes user data content as a script on boot.
 
 You can access this information through the metadata
 service or referring to `Store metadata on the configuration drive
-<http://docs.openstack.org/user-guide/cli_config_drive.html>`_.
+<http://docs.openstack.org/user-guide/cli-config-drive.html>`_.
 As the OpenStack metadata service is compatible with version
 2009-04-04 of the Amazon EC2 metadata service, consult the
 Amazon EC2 documentation on
diff --git a/doc/install-guide/source/launch-instance-manila-dhss-false-option1.rst b/doc/install-guide/source/launch-instance-manila-dhss-false-option1.rst
index 05b65eb601..03f0998755 100644
--- a/doc/install-guide/source/launch-instance-manila-dhss-false-option1.rst
+++ b/doc/install-guide/source/launch-instance-manila-dhss-false-option1.rst
@@ -163,7 +163,7 @@ Mount the share from an instance
 
 For more information about how to manage shares, see the
 `Manage shares
-<http://docs.openstack.org/user-guide/cli_manage_shares.html>`__ in
+<http://docs.openstack.org/user-guide/cli-manage-shares.html>`__ in
 OpenStack End User Guide.
 
 Return to :ref:`launch-instance`.
diff --git a/doc/install-guide/source/launch-instance-manila-dhss-true-option2.rst b/doc/install-guide/source/launch-instance-manila-dhss-true-option2.rst
index 744b11e808..86c91a426d 100644
--- a/doc/install-guide/source/launch-instance-manila-dhss-true-option2.rst
+++ b/doc/install-guide/source/launch-instance-manila-dhss-true-option2.rst
@@ -217,7 +217,7 @@ Mount the share from an instance
 
 For more information about how to manage shares, see the
 `Manage shares
-<http://docs.openstack.org/user-guide/cli_manage_shares.html>`__ in
+<http://docs.openstack.org/user-guide/cli-manage-shares.html>`__ in
 OpenStack End User Guide.
 
 Return to :ref:`launch-instance`.
diff --git a/doc/install-guide/source/launch-instance.rst b/doc/install-guide/source/launch-instance.rst
index f5724d349f..2a479cb767 100644
--- a/doc/install-guide/source/launch-instance.rst
+++ b/doc/install-guide/source/launch-instance.rst
@@ -12,7 +12,7 @@ network with one instance that uses it. The instructions in this
 section use command-line interface (CLI) tools on the controller
 node. For more information on the CLI tools, see the
 `OpenStack End User Guide
-<http://docs.openstack.org/user-guide/cli_launch_instances.html>`__.
+<http://docs.openstack.org/user-guide/cli-launch-instances.html>`__.
 To use the dashboard, see the
 `OpenStack End User Guide
 <http://docs.openstack.org/user-guide/dashboard.html>`__.
diff --git a/doc/ops-guide/source/ops-user-facing-operations.rst b/doc/ops-guide/source/ops-user-facing-operations.rst
index 86bbd0c83e..a17bf9b5e2 100644
--- a/doc/ops-guide/source/ops-user-facing-operations.rst
+++ b/doc/ops-guide/source/ops-user-facing-operations.rst
@@ -2046,13 +2046,13 @@ is now attached as ``/dev/vda``:
 
 Read more detailed instructions for launching an instance from a
 bootable volume in the `OpenStack End User
-Guide <http://docs.openstack.org/user-guide/cli_nova_launch_instance_from_volume.html>`__.
+Guide <http://docs.openstack.org/user-guide/cli-nova-launch-instance-from-volume.html>`__.
 
 To boot normally from an image and attach block storage, map to a device
 other than vda. You can find instructions for launching an instance and
 attaching a volume to the instance and for copying the image to the
 attached volume in the `OpenStack End User
-Guide <http://docs.openstack.org/user-guide/dashboard_launch_instances.html>`__.
+Guide <http://docs.openstack.org/user-guide/dashboard-launch-instances.html>`__.
 
 Taking Snapshots
 ~~~~~~~~~~~~~~~~