diff --git a/doc/source/conf.py b/doc/source/conf.py
index c5449ec05..4ea44c302 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -246,7 +246,7 @@ bug_tag = 'doc'
 # -- Options for oslo_config.sphinxconfiggen ---------------------------------
 
 _config_generator_config_files = [
-    'l3_agent.ini',
+    'vpn_agent.ini',
     'neutron_vpnaas.conf',
 ]
 
diff --git a/doc/source/configuration/l3_agent.rst b/doc/source/configuration/l3_agent.rst
index 6bb8bd388..9d3b982f2 100644
--- a/doc/source/configuration/l3_agent.rst
+++ b/doc/source/configuration/l3_agent.rst
@@ -1,6 +1,9 @@
-============
-l3_agent.ini
-============
+=============
+vpn_agent.ini
+=============
+
+This is a configuration file for the VPNaaS L3 agent
+extension of the neutron l3-agent.
 
 .. show-options::
-   :config-file: etc/oslo-config-generator/l3_agent.ini
+   :config-file: etc/oslo-config-generator/vpn_agent.ini
diff --git a/doc/source/configuration/samples/l3_agent.rst b/doc/source/configuration/samples/l3_agent.rst
deleted file mode 100644
index 5533384ed..000000000
--- a/doc/source/configuration/samples/l3_agent.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-===================
-Sample l3_agent.ini
-===================
-
-This sample configuration can also be viewed in `the raw format
-<../../_static/config_samples/l3_agent.conf.sample>`_.
-
-.. literalinclude:: ../../_static/config_samples/l3_agent.conf.sample
diff --git a/doc/source/configuration/samples/vpn_agent.rst b/doc/source/configuration/samples/vpn_agent.rst
new file mode 100644
index 000000000..be88515e6
--- /dev/null
+++ b/doc/source/configuration/samples/vpn_agent.rst
@@ -0,0 +1,8 @@
+====================
+Sample vpn_agent.ini
+====================
+
+This sample configuration can also be viewed in `the raw format
+<../../_static/config_samples/vpn_agent.conf.sample>`_.
+
+.. literalinclude:: ../../_static/config_samples/vpn_agent.conf.sample
diff --git a/etc/oslo-config-generator/l3_agent.ini b/etc/oslo-config-generator/vpn_agent.ini
similarity index 60%
rename from etc/oslo-config-generator/l3_agent.ini
rename to etc/oslo-config-generator/vpn_agent.ini
index f58b86a83..875202cee 100644
--- a/etc/oslo-config-generator/l3_agent.ini
+++ b/etc/oslo-config-generator/vpn_agent.ini
@@ -1,5 +1,5 @@
 [DEFAULT]
-output_file = etc/l3_agent.ini.sample
+output_file = etc/vpn_agent.ini.sample
 wrap_width = 79
 
 namespace = neutron.vpnaas.agent