diff --git a/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.xml b/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.xml
index 1cc6b6c4c9..4784473edf 100644
--- a/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.xml
+++ b/doc/admin-guide-cloud/networking/section_networking_adv_operational_features.xml
@@ -144,7 +144,7 @@ notification_topics = notifications</programlisting>
 # Logging driver
 # notification_driver = neutron.openstack.common.notifier.log_notifier
 # RPC driver
-notification_driver = neutron.openstack.common.notifier.rabbit_notifier
+notification_driver = neutron.openstack.common.notifier.rpc_notifier
 
 # default_notification_level is used to form actual topic names or to set logging level
 default_notification_level = INFO
diff --git a/doc/config-reference/compute/section_rpc.xml b/doc/config-reference/compute/section_rpc.xml
index aa5e05c45e..a44e3b0700 100644
--- a/doc/config-reference/compute/section_rpc.xml
+++ b/doc/config-reference/compute/section_rpc.xml
@@ -29,7 +29,7 @@
       scenarios, tune retries for RabbitMQ, and define the size of the
       RPC thread pool. To monitor notifications through RabbitMQ, you
       must set the <option>notification_driver</option> option to
-        <literal>nova.notifier.rabbit_notifier</literal> in the
+        <literal>nova.openstack.common.notifier.rpc_notifier</literal> in the
         <filename>nova.conf</filename> file. The default for sending
       usage data is sixty seconds plus a random number of seconds from
       zero to sixty.</para>
diff --git a/doc/config-reference/networking/section_rpc-for-networking.xml b/doc/config-reference/networking/section_rpc-for-networking.xml
index c79adf312d..944836a96c 100644
--- a/doc/config-reference/networking/section_rpc-for-networking.xml
+++ b/doc/config-reference/networking/section_rpc-for-networking.xml
@@ -38,7 +38,7 @@ rpc_backend=neutron.openstack.common.rpc.impl_kombu
       scenarios, tune retries for RabbitMQ, and define the size of the
       RPC thread pool. To monitor notifications through RabbitMQ, you
       must set the <option>notification_driver</option> option to
-        <literal>neutron.notifier.rabbit_notifier</literal> in the
+        <literal>neutron.openstack.common.notifier.rpc_notifier</literal> in the
         <filename>neutron.conf</filename> file:</para>
     <xi:include href="../../common/tables/neutron-rabbitmq.xml"/>
   </section>
diff --git a/doc/config-reference/orchestration/section_orchestration-rpc.xml b/doc/config-reference/orchestration/section_orchestration-rpc.xml
index 0c0b7983ab..cf4c7051e4 100644
--- a/doc/config-reference/orchestration/section_orchestration-rpc.xml
+++ b/doc/config-reference/orchestration/section_orchestration-rpc.xml
@@ -34,7 +34,7 @@
       scenarios, tune retries for RabbitMQ, and define the size of the
       RPC thread pool. To monitor notifications through RabbitMQ, you
       must set the <option>notification_driver</option> option to
-        <literal>heat.notifier.rabbit_notifier</literal> in the
+        <literal>heat.openstack.common.notifier.rpc_notifier</literal> in the
         <filename>heat.conf</filename> file:</para>
     <xi:include href="../../common/tables/heat-rabbitmq.xml"/>
   </section>
diff --git a/doc/networking-guide/section_networking_adv_operational_features.xml b/doc/networking-guide/section_networking_adv_operational_features.xml
index ac6deced7c..36bf2cec2c 100644
--- a/doc/networking-guide/section_networking_adv_operational_features.xml
+++ b/doc/networking-guide/section_networking_adv_operational_features.xml
@@ -144,7 +144,7 @@ notification_topics = notifications</programlisting>
 # Logging driver
 # notification_driver = neutron.openstack.common.notifier.log_notifier
 # RPC driver
-notification_driver = neutron.openstack.common.notifier.rabbit_notifier
+notification_driver = neutron.openstack.common.notifier.rpc_notifier
 
 # default_notification_level is used to form actual topic names or to set logging level
 default_notification_level = INFO