diff --git a/neutron/agent/dhcp/agent.py b/neutron/agent/dhcp/agent.py
index bc1538a30b6..bdb250081ce 100644
--- a/neutron/agent/dhcp/agent.py
+++ b/neutron/agent/dhcp/agent.py
@@ -76,7 +76,7 @@ class DhcpAgent(manager.Manager):
     of an rpc interface.  The neutron server uses
     neutron.api.rpc.agentnotifiers.dhcp_rpc_agent_api.DhcpAgentNotifyApi as the
     client side to execute the methods here.  For more information about
-    changing rpc interfaces, see doc/source/devref/rpc_api.rst.
+    changing rpc interfaces, see doc/source/contributor/internals/rpc_api.rst.
     """
     target = oslo_messaging.Target(version='1.0')
 
@@ -536,7 +536,8 @@ class DhcpPluginApi(object):
     This class implements the client side of an rpc interface.  The server side
     of this interface can be found in
     neutron.api.rpc.handlers.dhcp_rpc.DhcpRpcCallback.  For more information
-    about changing rpc interfaces, see doc/source/devref/rpc_api.rst.
+    about changing rpc interfaces, see
+    doc/source/contributor/internals/rpc_api.rst.
 
     API version history:
         1.0 - Initial version.
diff --git a/neutron/agent/metadata/agent.py b/neutron/agent/metadata/agent.py
index d3cdb9302d9..43c27d7e730 100644
--- a/neutron/agent/metadata/agent.py
+++ b/neutron/agent/metadata/agent.py
@@ -53,7 +53,7 @@ class MetadataPluginAPI(object):
     side is defined in
     neutron.api.rpc.handlers.metadata_rpc.MetadataRpcCallback.  For more
     information about changing rpc interfaces, see
-    doc/source/devref/rpc_api.rst.
+    doc/source/contributor/internals/rpc_api.rst.
 
     API version history:
         1.0 - Initial version.
diff --git a/neutron/agent/rpc.py b/neutron/agent/rpc.py
index 144094217d7..204f92d0736 100644
--- a/neutron/agent/rpc.py
+++ b/neutron/agent/rpc.py
@@ -69,7 +69,8 @@ class PluginReportStateAPI(object):
 
     This class implements the client side of an rpc interface.  The server side
     can be found in neutron.db.agents_db.AgentExtRpcCallback.  For more
-    information on changing rpc interfaces, see doc/source/devref/rpc_api.rst.
+    information on changing rpc interfaces, see
+    doc/source/contributor/internals/rpc_api.rst.
     """
     def __init__(self, topic):
         target = oslo_messaging.Target(topic=topic, version='1.0',
diff --git a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
index 64a2a67be16..7dde995f388 100644
--- a/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
+++ b/neutron/api/rpc/agentnotifiers/dhcp_rpc_agent_api.py
@@ -36,7 +36,7 @@ class DhcpAgentNotifyAPI(object):
 
     This class implements the client side of an rpc interface.  The server side
     is neutron.agent.dhcp.agent.DhcpAgent.  For more information about changing
-    rpc interfaces, please see doc/source/devref/rpc_api.rst.
+    rpc interfaces, please see doc/source/contributor/internals/rpc_api.rst.
     """
     # It seems dhcp agent does not support bulk operation
     VALID_RESOURCES = ['network', 'subnet', 'port']
diff --git a/neutron/api/rpc/handlers/dhcp_rpc.py b/neutron/api/rpc/handlers/dhcp_rpc.py
index 56817611114..d97a4317eea 100644
--- a/neutron/api/rpc/handlers/dhcp_rpc.py
+++ b/neutron/api/rpc/handlers/dhcp_rpc.py
@@ -48,7 +48,7 @@ class DhcpRpcCallback(object):
     This class implements the server side of an rpc interface.  The client
     side of this interface can be found in
     neutron.agent.dhcp.agent.DhcpPluginApi.  For more information about
-    changing rpc interfaces, see doc/source/devref/rpc_api.rst.
+    changing rpc interfaces, see doc/source/contributor/internals/rpc_api.rst.
     """
 
     # API version history:
diff --git a/neutron/api/rpc/handlers/dvr_rpc.py b/neutron/api/rpc/handlers/dvr_rpc.py
index b85f4c69204..f211adea7b7 100644
--- a/neutron/api/rpc/handlers/dvr_rpc.py
+++ b/neutron/api/rpc/handlers/dvr_rpc.py
@@ -30,7 +30,7 @@ class DVRServerRpcApi(object):
 
     This class implements the client side of an rpc interface.  The server side
     can be found below: DVRServerRpcCallback.  For more information on changing
-    rpc interfaces, see doc/source/devref/rpc_api.rst.
+    rpc interfaces, see doc/source/contributor/internals/rpc_api.rst.
     """
     # 1.0 Initial Version
     # 1.1 Support for passing 'fixed_ips' in get_subnet_for_dvr function.
@@ -71,7 +71,7 @@ class DVRServerRpcCallback(object):
 
     This class implements the server side of an rpc interface.  The client side
     can be found above: DVRServerRpcApi.  For more information on changing rpc
-    interfaces, see doc/source/devref/rpc_api.rst.
+    interfaces, see doc/source/contributor/internals/rpc_api.rst.
     """
 
     # History
diff --git a/neutron/api/rpc/handlers/metadata_rpc.py b/neutron/api/rpc/handlers/metadata_rpc.py
index 7b5df2b9114..2aa540eca1b 100644
--- a/neutron/api/rpc/handlers/metadata_rpc.py
+++ b/neutron/api/rpc/handlers/metadata_rpc.py
@@ -26,7 +26,7 @@ class MetadataRpcCallback(object):
     metadata service to make calls back into the Neutron plugin.  The client
     side is defined in neutron.agent.metadata.agent.MetadataPluginAPI.  For
     more information about changing rpc interfaces, see
-    doc/source/devref/rpc_api.rst.
+    doc/source/contributor/internals/rpc_api.rst.
     """
 
     # 1.0  MetadataPluginAPI BASE_RPC_API_VERSION
diff --git a/neutron/api/rpc/handlers/securitygroups_rpc.py b/neutron/api/rpc/handlers/securitygroups_rpc.py
index 5300ace2491..6da15d01667 100644
--- a/neutron/api/rpc/handlers/securitygroups_rpc.py
+++ b/neutron/api/rpc/handlers/securitygroups_rpc.py
@@ -37,7 +37,7 @@ class SecurityGroupServerRpcApi(object):
     is used by agents to call security group related methods implemented on the
     plugin side.  The other side of this interface is defined in
     SecurityGroupServerRpcCallback.  For more information about changing rpc
-    interfaces, see doc/source/devref/rpc_api.rst.
+    interfaces, see doc/source/contributor/internals/rpc_api.rst.
     """
     def __init__(self, topic):
         target = oslo_messaging.Target(
@@ -65,7 +65,7 @@ class SecurityGroupServerRpcCallback(object):
 
     This class implements the server side of an rpc interface.  The client side
     can be found in SecurityGroupServerRpcApi. For more information on changing
-    rpc interfaces, see doc/source/devref/rpc_api.rst.
+    rpc interfaces, see doc/source/contributor/internals/rpc_api.rst.
     """
 
     # API version history:
@@ -126,7 +126,7 @@ class SecurityGroupAgentRpcApiMixin(object):
     is used by plugins to call security group methods implemented on the
     agent side.  The other side of this interface can be found in
     SecurityGroupAgentRpcCallbackMixin.  For more information about changing
-    rpc interfaces, see doc/source/devref/rpc_api.rst.
+    rpc interfaces, see doc/source/contributor/internals/rpc_api.rst.
     """
 
     # history
@@ -164,7 +164,7 @@ class SecurityGroupAgentRpcCallbackMixin(object):
 
     This class implements the server side of an rpc interface.  The client side
     can be found in SecurityGroupAgentRpcApiMixin. For more information on
-    changing rpc interfaces, see doc/source/devref/rpc_api.rst.
+    changing rpc interfaces, see doc/source/contributor/internals/rpc_api.rst.
 
     The sg_agent reference implementation is available in neutron/agent
     """
diff --git a/neutron/db/agents_db.py b/neutron/db/agents_db.py
index 989a92307fc..44c54c0bd79 100644
--- a/neutron/db/agents_db.py
+++ b/neutron/db/agents_db.py
@@ -397,7 +397,8 @@ class AgentExtRpcCallback(object):
 
     This class implements the server side of an rpc interface.  The client side
     can be found in neutron.agent.rpc.PluginReportStateAPI.  For more
-    information on changing rpc interfaces, see doc/source/devref/rpc_api.rst.
+    information on changing rpc interfaces, see
+    doc/source/contributor/internals/rpc_api.rst.
 
     API version history:
         1.0 - Initial version.