diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc
index 9d18850c5..16eb7055b 100644
--- a/src/etc/inc/plugins.inc.d/ipsec.inc
+++ b/src/etc/inc/plugins.inc.d/ipsec.inc
@@ -120,7 +120,7 @@ function ipsec_configure()
 {
     return [
         'ipsec' => ['ipsec_configure_do:2'],
-        'vpn_map' => ['ipsec_configure_do:2'],
+        'vpn' => ['ipsec_configure_do:2'],
     ];
 }
 
diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
index 7bb262a7a..ddaf839a5 100644
--- a/src/etc/inc/plugins.inc.d/openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -37,7 +37,7 @@ function openvpn_configure()
         'crl' => ['openvpn_refresh_crls:0'],
         'remote' => ['openvpn_configure_do'],
         'openvpn' => ['openvpn_configure_do:2'],
-        'vpn_map' => ['openvpn_configure_do:2'],
+        'vpn' => ['openvpn_configure_do:2'],
     ];
 }
 
diff --git a/src/etc/inc/plugins.inc.d/wireguard.inc b/src/etc/inc/plugins.inc.d/wireguard.inc
index 61be4cf72..0817aa223 100644
--- a/src/etc/inc/plugins.inc.d/wireguard.inc
+++ b/src/etc/inc/plugins.inc.d/wireguard.inc
@@ -145,7 +145,7 @@ function wireguard_configure()
 {
     return [
         'newwanip_map' => ['wireguard_sync'],
-        'vpn_map' => ['wireguard_configure_do'],
+        'vpn' => ['wireguard_configure_do'],
     ];
 }
 
diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index 60ade4d4a..b079ca61e 100755
--- a/src/etc/rc.bootup
+++ b/src/etc/rc.bootup
@@ -98,7 +98,7 @@ plugins_configure('dns', true);
 
 filter_configure_sync(true);
 plugins_configure('monitor', true);
-plugins_configure('vpn_map', true);
+plugins_configure('vpn', true);
 plugins_configure('bootup', true);
 
 system_powerd_configure(true); /* XXX this seems misplaced */
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
index 46e76b05f..d2c199455 100755
--- a/src/etc/rc.newwanip
+++ b/src/etc/rc.newwanip
@@ -115,6 +115,5 @@ if (is_ipaddr($cacheip) && $ip != $cacheip) {
 /* register IP change not before this point as basic connectivity is needed */
 @file_put_contents($cacheip_file, $ip . PHP_EOL);
 
-/* XXX after 25.1 drop the "_map" suffix again */
-plugins_configure('vpn_map', false, [$interface, 'inet']);
+plugins_configure('vpn', false, [$interface, 'inet']);
 plugins_configure('newwanip_map', false, [$interface, 'inet']);
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index 178815c2a..90adc976b 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -124,6 +124,5 @@ system_routing_configure(false, $interfaces, true, 'inet6');
 
 filter_configure_sync();
 
-/* XXX after 25.1 drop the "_map" suffix again */
-plugins_configure('vpn_map', false, [join(',', $interfaces), 'inet6']);
+plugins_configure('vpn', false, [join(',', $interfaces), 'inet6']);
 plugins_configure('newwanip_map', false, [join(',', $interfaces), 'inet6']);
diff --git a/src/etc/rc.reload_all b/src/etc/rc.reload_all
index 96eb1e4fa..aa33114f0 100755
--- a/src/etc/rc.reload_all
+++ b/src/etc/rc.reload_all
@@ -54,7 +54,7 @@ interfaces_configure(true);
 system_routing_configure(true);
 filter_configure_sync(true);
 plugins_configure('local', true);
-plugins_configure('vpn_map', true);
+plugins_configure('vpn', true);
 
 /* plugins service reload */
 passthru('/usr/local/etc/rc.freebsd stop');
diff --git a/src/opnsense/scripts/shell/setports.php b/src/opnsense/scripts/shell/setports.php
index 97c125adb..e1d989266 100755
--- a/src/opnsense/scripts/shell/setports.php
+++ b/src/opnsense/scripts/shell/setports.php
@@ -44,5 +44,5 @@ if (set_networking_interfaces_ports()) {
     system_routing_configure(true);
     filter_configure_sync(true);
     plugins_configure('local', true);
-    plugins_configure('vpn_map', true);
+    plugins_configure('vpn', true);
 }