diff --git a/doc/config-reference/source/networking/networking_options_reference.rst b/doc/config-reference/source/networking/networking_options_reference.rst
index 5a6c368737..01bbdc6bd8 100644
--- a/doc/config-reference/source/networking/networking_options_reference.rst
+++ b/doc/config-reference/source/networking/networking_options_reference.rst
@@ -69,11 +69,6 @@ Modular Layer 2 (ml2) L2 Population Mechanism configuration options
 
 .. include:: ../tables/neutron-ml2_l2pop.rst
 
-Modular Layer 2 (ml2) MacVTap Mechanism configuration options
--------------------------------------------------------------
-
-.. include:: ../tables/neutron-ml2_macvtap.rst
-
 Modular Layer 2 (ml2) SR-IOV Mechanism configuration options
 ------------------------------------------------------------
 
@@ -158,6 +153,11 @@ SR-IOV agent configuration options
 
 .. include:: ../tables/neutron-sriov_agent.rst
 
+MacVTap Agent configuration options
+-----------------------------------
+
+.. include:: ../tables/neutron-macvtap_agent.rst
+
 IPv6 Prefix Delegation configuration options
 --------------------------------------------
 
diff --git a/doc/config-reference/source/tables/neutron-ml2_macvtap.rst b/doc/config-reference/source/tables/neutron-macvtap_agent.rst
similarity index 91%
rename from doc/config-reference/source/tables/neutron-ml2_macvtap.rst
rename to doc/config-reference/source/tables/neutron-macvtap_agent.rst
index 02bfd9ee41..8809926d93 100644
--- a/doc/config-reference/source/tables/neutron-ml2_macvtap.rst
+++ b/doc/config-reference/source/tables/neutron-macvtap_agent.rst
@@ -8,9 +8,9 @@
     autogenerate-config-doc tool from the openstack-doc-tools repository, or
     ask for help on the documentation mailing list, IRC channel or meeting.
 
-.. _neutron-ml2_macvtap:
+.. _neutron-macvtap_agent:
 
-.. list-table:: Description of ML2 MacVTap mechanism driver configuration options
+.. list-table:: Description of MacVTap agent configuration options
    :header-rows: 1
    :class: config-ref-table
 
diff --git a/tools/autogenerate-config-flagmappings/neutron.flagmappings b/tools/autogenerate-config-flagmappings/neutron.flagmappings
index 7264afc5ef..75e618f305 100644
--- a/tools/autogenerate-config-flagmappings/neutron.flagmappings
+++ b/tools/autogenerate-config-flagmappings/neutron.flagmappings
@@ -188,7 +188,7 @@ AGENT/minimize_polling openvswitch_agent
 AGENT/ovsdb_monitor_respawn_interval openvswitch_agent
 AGENT/polling_interval common
 AGENT/prevent_arp_spoofing openvswitch_agent linuxbridge_agent
-AGENT/quitting_rpc_timeout openvswitch_agent linuxbridge_agent ml2_macvtap
+AGENT/quitting_rpc_timeout openvswitch_agent linuxbridge_agent macvtap_agent
 AGENT/report_interval metering_agent
 AGENT/root_helper common
 AGENT/root_helper_daemon common
@@ -347,7 +347,7 @@ keystone_authtoken/revocation_cache_time disable
 keystone_authtoken/signing_dir disable
 keystone_authtoken/token_cache_time disable
 l2pop/agent_boot_time ml2_l2pop
-macvtap/physical_interface_mappings ml2_macvtap
+macvtap/physical_interface_mappings macvtap_agent
 matchmaker_redis/check_timeout redis
 matchmaker_redis/host redis
 matchmaker_redis/password redis
diff --git a/tools/autogenerate-config-flagmappings/neutron.headers b/tools/autogenerate-config-flagmappings/neutron.headers
index 70dc20728b..456a397e72 100644
--- a/tools/autogenerate-config-flagmappings/neutron.headers
+++ b/tools/autogenerate-config-flagmappings/neutron.headers
@@ -27,6 +27,7 @@ lbaas Load-Balancer-as-a-Service
 lbaas_agent LBaaS agent
 lbaas_services LBaaS Embrane, Radware, NetScaler, HAproxy, octavia plug-in
 linuxbridge_agent Linux Bridge agent
+macvtap_agent MacVTap agent
 metering_agent metering agent
 midonet Midonet
 ml2 ML2
@@ -43,7 +44,6 @@ ml2_fslsdn ML2 Freescale SDN mechanism driver
 ml2_geneve ML2 Geneve type driver
 ml2_gre ML2 GRE
 ml2_l2pop ML2 L2 population
-ml2_macvtap ML2 MacVTap mechanism driver
 ml2_mlnx Mellanox ML2 mechanism driver
 ml2_ncs ML2 NCS mechanism driver
 ml2_odl ML2 OpenDaylight mechanism driver