diff --git a/doc/admin-guide/source/networking-adv-config.rst b/doc/admin-guide/source/networking-adv-config.rst
index 321a44101b..3fe95a2bd8 100644
--- a/doc/admin-guide/source/networking-adv-config.rst
+++ b/doc/admin-guide/source/networking-adv-config.rst
@@ -28,14 +28,12 @@ service. The driver adds metering to the routing interface.
 | **Open vSwitch**                         |                                 |
 +------------------------------------------+---------------------------------+
 | interface\_driver                        |                                 |
-| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| neutron.agent.linux.interface.  |
-|                                          | OVSInterfaceDriver              |
+| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| openvswitch                     |
 +------------------------------------------+---------------------------------+
 | **Linux Bridge**                         |                                 |
 +------------------------------------------+---------------------------------+
 | interface\_driver                        |                                 |
-| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| neutron.agent.linux.interface.  |
-|                                          | BridgeInterfaceDriver           |
+| ($NEUTRON\_CONF\_DIR/metering\_agent.ini)| linuxbridge                     |
 +------------------------------------------+---------------------------------+
 
 L3 metering driver
diff --git a/doc/admin-guide/source/networking-config-agents.rst b/doc/admin-guide/source/networking-config-agents.rst
index caec952f55..2ffe1ddef0 100644
--- a/doc/admin-guide/source/networking-config-agents.rst
+++ b/doc/admin-guide/source/networking-config-agents.rst
@@ -135,7 +135,7 @@ These DHCP agent options are required in the
 
    [DEFAULT]
    enable_isolated_metadata = True
-   interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+   interface_driver = openvswitch
 
 DHCP agent setup: NSX plug-in
 -----------------------------
@@ -148,7 +148,19 @@ These DHCP agent options are required in the
    [DEFAULT]
    enable_metadata_network = True
    enable_isolated_metadata = True
-   interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+   interface_driver = openvswitch
+
+DHCP agent setup: Linux-bridge plug-in
+--------------------------------------
+
+These DHCP agent options are required in the
+``/etc/neutron/dhcp_agent.ini`` file for the Linux-bridge plug-in:
+
+.. code-block:: bash
+
+   [DEFAULT]
+   enabled_isolated_metadata = True
+   interface_driver = linuxbridge
 
 Configure L3 agent
 ~~~~~~~~~~~~~~~~~~
@@ -304,14 +316,13 @@ The Neutron Metering agent resides beside neutron-l3-agent.
 
       .. code-block:: ini
 
-         interface_driver = neutron.agent.linux.interface.OVSInterfaceDriver
+         interface_driver = openvswitch
 
    -  A plug-in that uses LinuxBridge:
 
       .. code-block:: ini
 
-         interface_driver = neutron.agent.linux.interface.
-         BridgeInterfaceDriver
+         interface_driver = linuxbridge
 
 #. To use the reference implementation, you must set:
 
diff --git a/doc/install-guide-debconf/source/neutron-controller-install-option1.rst b/doc/install-guide-debconf/source/neutron-controller-install-option1.rst
index 81be7a6ab3..660b80cb80 100644
--- a/doc/install-guide-debconf/source/neutron-controller-install-option1.rst
+++ b/doc/install-guide-debconf/source/neutron-controller-install-option1.rst
@@ -183,7 +183,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True
 
diff --git a/doc/install-guide-debconf/source/neutron-controller-install-option2.rst b/doc/install-guide-debconf/source/neutron-controller-install-option2.rst
index 285e5fd5f4..80ec5d754e 100644
--- a/doc/install-guide-debconf/source/neutron-controller-install-option2.rst
+++ b/doc/install-guide-debconf/source/neutron-controller-install-option2.rst
@@ -172,7 +172,7 @@ self-service virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        external_network_bridge =
 
     .. note::
@@ -196,7 +196,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True
 
diff --git a/doc/install-guide/source/neutron-controller-install-option1.rst b/doc/install-guide/source/neutron-controller-install-option1.rst
index 07bf20461a..e64c150f57 100644
--- a/doc/install-guide/source/neutron-controller-install-option1.rst
+++ b/doc/install-guide/source/neutron-controller-install-option1.rst
@@ -322,7 +322,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True
 
diff --git a/doc/install-guide/source/neutron-controller-install-option2.rst b/doc/install-guide/source/neutron-controller-install-option2.rst
index 9f0520cc52..f24a1bd5e4 100644
--- a/doc/install-guide/source/neutron-controller-install-option2.rst
+++ b/doc/install-guide/source/neutron-controller-install-option2.rst
@@ -353,7 +353,7 @@ self-service virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
 
     .. end
 
@@ -374,7 +374,7 @@ The :term:`DHCP agent` provides DHCP services for virtual networks.
 
        [DEFAULT]
        ...
-       interface_driver = neutron.agent.linux.interface.BridgeInterfaceDriver
+       interface_driver = linuxbridge
        dhcp_driver = neutron.agent.linux.dhcp.Dnsmasq
        enable_isolated_metadata = True