diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8451ad1c2..588781568 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -55,7 +55,7 @@ function neutron_vpnaas_configure_agent {
 }
 
 function neutron_vpnaas_configure_ovn_agent {
-    cp $NEUTRON_VPNAAS_DIR/etc/neutron_ovn_vpn_agent.ini.sample $OVN_VPNAGENT_CONF
+    cp $NEUTRON_VPNAAS_DIR/etc/ovn_vpn_agent.ini.sample $OVN_VPNAGENT_CONF
 
     iniset $OVN_VPNAGENT_CONF DEFAULT interface_driver openvswitch
     iniset $OVN_VPNAGENT_CONF DEFAULT state_path $DATA_DIR/neutron
diff --git a/devstack/settings b/devstack/settings
index a75f90e07..cbfb82d59 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -45,4 +45,4 @@ NEUTRON_VPNAAS_DIR=$DEST/neutron-vpnaas
 NEUTRON_VPNAAS_CONF_FILE=neutron_vpnaas.conf
 NEUTRON_VPNAAS_CONF=$NEUTRON_CONF_DIR/$NEUTRON_VPNAAS_CONF_FILE
 
-OVN_VPNAGENT_CONF=$NEUTRON_CONF_DIR/neutron_ovn_vpn_agent.ini
+OVN_VPNAGENT_CONF=$NEUTRON_CONF_DIR/ovn_vpn_agent.ini
diff --git a/doc/source/conf.py b/doc/source/conf.py
index fe2bfdda7..152ec99ca 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -247,7 +247,7 @@ openstackdocs_bug_tag = 'doc'
 _config_generator_config_files = [
     'vpn_agent.ini',
     'neutron_vpnaas.conf',
-    'neutron_ovn_vpn_agent.ini',
+    'ovn_vpn_agent.ini',
 ]
 
 
diff --git a/doc/source/configuration/index.rst b/doc/source/configuration/index.rst
index 605a0dbb2..3e259356e 100644
--- a/doc/source/configuration/index.rst
+++ b/doc/source/configuration/index.rst
@@ -15,7 +15,7 @@ Neutron VPNaaS uses the following configuration files for its various services.
 
    neutron_vpnaas
    l3_agent
-   neutron_ovn_vpn_agent
+   ovn_vpn_agent
 
 The following are sample configuration files for Neutron VPNaaS services and
 utilities. These are generated from code and reflect the current state of code
diff --git a/doc/source/configuration/neutron_ovn_vpn_agent.rst b/doc/source/configuration/neutron_ovn_vpn_agent.rst
deleted file mode 100644
index d00225fe1..000000000
--- a/doc/source/configuration/neutron_ovn_vpn_agent.rst
+++ /dev/null
@@ -1,9 +0,0 @@
-=========================
-neutron_ovn_vpn_agent.ini
-=========================
-
-This is a configuration file for the standalone VPN agent
-for a setup based on OVN.
-
-.. show-options::
-   :config-file: etc/oslo-config-generator/neutron_ovn_vpn_agent.ini
diff --git a/doc/source/configuration/ovn_vpn_agent.rst b/doc/source/configuration/ovn_vpn_agent.rst
new file mode 100644
index 000000000..c57992e74
--- /dev/null
+++ b/doc/source/configuration/ovn_vpn_agent.rst
@@ -0,0 +1,9 @@
+=================
+ovn_vpn_agent.ini
+=================
+
+This is a configuration file for the standalone VPN agent
+for a setup based on OVN.
+
+.. show-options::
+   :config-file: etc/oslo-config-generator/ovn_vpn_agent.ini
diff --git a/doc/source/configuration/samples/neutron_ovn_vpn_agent.rst b/doc/source/configuration/samples/neutron_ovn_vpn_agent.rst
deleted file mode 100644
index 0275526d4..000000000
--- a/doc/source/configuration/samples/neutron_ovn_vpn_agent.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-================================
-Sample neutron_ovn_vpn_agent.ini
-================================
-
-This sample configuration can also be viewed in `the raw format
-<../../_static/config_samples/neutron_ovn_vpn_agent.conf.sample>`_.
-
-.. literalinclude:: ../../_static/config_samples/neutron_ovn_vpn_agent.conf.sample
diff --git a/doc/source/configuration/samples/ovn_vpn_agent.rst b/doc/source/configuration/samples/ovn_vpn_agent.rst
new file mode 100644
index 000000000..dee17a6bb
--- /dev/null
+++ b/doc/source/configuration/samples/ovn_vpn_agent.rst
@@ -0,0 +1,8 @@
+========================
+Sample ovn_vpn_agent.ini
+========================
+
+This sample configuration can also be viewed in `the raw format
+<../../_static/config_samples/ovn_vpn_agent.conf.sample>`_.
+
+.. literalinclude:: ../../_static/config_samples/ovn_vpn_agent.conf.sample
diff --git a/doc/source/contributor/vpnaas-for-ovn.rst b/doc/source/contributor/vpnaas-for-ovn.rst
index ee8f74a10..935bdf669 100644
--- a/doc/source/contributor/vpnaas-for-ovn.rst
+++ b/doc/source/contributor/vpnaas-for-ovn.rst
@@ -35,7 +35,7 @@ Enabling VPNaaS for OVN
       service_provider = VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ovn_ipsec.IPsecOvnVPNDriver
 
 #. With OVN there is no L3 agent. Instead a stand-alone VPN agent is installed. There is a new "binary" called
-   ``neutron-ovn-vpn-agent``. Create its configuration file ``/etc/neutron/neutron_ovn_vpn_agent.ini``
+   ``neutron-ovn-vpn-agent``. Create its configuration file ``/etc/neutron/ovn_vpn_agent.ini``
    with the following contents:
 
    .. code-block:: ini
diff --git a/etc/oslo-config-generator/neutron_ovn_vpn_agent.ini b/etc/oslo-config-generator/ovn_vpn_agent.ini
similarity index 55%
rename from etc/oslo-config-generator/neutron_ovn_vpn_agent.ini
rename to etc/oslo-config-generator/ovn_vpn_agent.ini
index e4a3e1721..14e9a4066 100644
--- a/etc/oslo-config-generator/neutron_ovn_vpn_agent.ini
+++ b/etc/oslo-config-generator/ovn_vpn_agent.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-output_file = etc/neutron_ovn_vpn_agent.ini.sample
+output_file = etc/ovn_vpn_agent.ini.sample
 wrap_width = 79
 
 namespace = neutron.vpnaas.ovn_agent