diff --git a/net/l2tp/Makefile b/net/l2tp/Makefile
index 2fc69b5ad..794c0a93e 100644
--- a/net/l2tp/Makefile
+++ b/net/l2tp/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		l2tp
 PLUGIN_PRIVATE=		yes
-PLUGIN_VERSION=		0.1
+PLUGIN_VERSION=		0.2
 PLUGIN_DEPENDS=		mpd5
 PLUGIN_COMMENT=		LT2P server based on MPD5
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
index 32095ea26..46fd8a6c7 100644
--- a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
+++ b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/ACL/ACL.xml
@@ -4,7 +4,7 @@
         <name>WebCfg - Diagnostics: Logs: L2TP page</name>
         <description>Allow access to the 'Diagnostics: Logs: L2TP' page.</description>
         <patterns>
-            <pattern>diag_logs_l2tp.php*</pattern>
+            <pattern>vpn_l2tp_log.php*</pattern>
         </patterns>
     </page-diagnostics-logs-l2tp>
     <page-vpn-vpnl2tp>
diff --git a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml
index 774d3fdc7..5a548e1a1 100644
--- a/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml
+++ b/net/l2tp/src/opnsense/mvc/app/models/OPNsense/L2TP/Menu/Menu.xml
@@ -5,8 +5,8 @@
             <Users order="20" url="/vpn_l2tp_users.php">
                 <Edit url="/vpn_l2tp_users_edit.php*" visibility="hidden"/>
             </Users>
-            <LogFile order="30" VisibleName="Log File" url="/diag_logs_l2tp.php">
-                <Type url="/diag_logs_l2tp.php*" visibility="hidden"/>
+            <LogFile order="30" VisibleName="Log File" url="/vpn_l2tp_log.php">
+                <Type url="/vpn_l2tp_log.php*" visibility="hidden"/>
             </LogFile>
         </L2TP>
     </VPN>
diff --git a/net/l2tp/src/www/diag_logs_l2tp.inc b/net/l2tp/src/www/vpn_l2tp_log.inc
similarity index 100%
rename from net/l2tp/src/www/diag_logs_l2tp.inc
rename to net/l2tp/src/www/vpn_l2tp_log.inc
diff --git a/net/l2tp/src/www/diag_logs_l2tp.php b/net/l2tp/src/www/vpn_l2tp_log.php
similarity index 61%
rename from net/l2tp/src/www/diag_logs_l2tp.php
rename to net/l2tp/src/www/vpn_l2tp_log.php
index 78b3bc6e7..ff933765a 100644
--- a/net/l2tp/src/www/diag_logs_l2tp.php
+++ b/net/l2tp/src/www/vpn_l2tp_log.php
@@ -5,7 +5,7 @@ if (htmlspecialchars($_POST['mode'])) {
 } elseif (htmlspecialchars($_GET['mode'])) {
     $mode = htmlspecialchars($_GET['mode']);
 } else {
-    $mode = "login";
+    $mode = 'login';
 }
 
 if ($mode != 'raw') {
@@ -17,9 +17,9 @@ if ($mode != 'raw') {
 $logtype = 'l2tp';
 
 $tab_array = array();
-$tab_array[] = array(gettext("L2TP Logins"), $mode != "raw", "/diag_logs_l2tp.php");
-$tab_array[] = array(gettext("L2TP Raw"), $mode == "raw", "/diag_logs_l2tp.php?mode=raw");
+$tab_array[] = array(gettext('L2TP Logins'), $mode != 'raw', '/vpn_l2tp_logs.php');
+$tab_array[] = array(gettext('L2TP Raw'), $mode == 'raw', '/vpn_l2tp_logs.php?mode=raw');
 
 $service_hook = 'l2tpd';
 
-require_once 'diag_logs_l2tp.inc';
+require_once 'vpn_l2tp_logs.inc';
diff --git a/net/pppoe/Makefile b/net/pppoe/Makefile
index 6c4153231..09a47ca40 100644
--- a/net/pppoe/Makefile
+++ b/net/pppoe/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		pppoe
 PLUGIN_PRIVATE=		yes
-PLUGIN_VERSION=		0.1
+PLUGIN_VERSION=		0.2
 PLUGIN_DEPENDS=		mpd5
 PLUGIN_COMMENT=		PPPoE server based on MPD5
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml b/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml
index 1461b5889..2c3f08f66 100644
--- a/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml
+++ b/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/ACL/ACL.xml
@@ -4,7 +4,7 @@
         <name>WebCfg - Diagnostics: Logs: PPPoE page</name>
         <description>Allow access to the 'Diagnostics: Logs: PPPoE' page.</description>
         <patterns>
-            <pattern>diag_logs_poes.php*</pattern>
+            <pattern>vpn_pppoe_log.php*</pattern>
         </patterns>
     </page-diagnostics-logs-poes>
     <page-services-pppoeserver>
diff --git a/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/Menu/Menu.xml b/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/Menu/Menu.xml
index 1cfd5d311..e4f037a79 100644
--- a/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/Menu/Menu.xml
+++ b/net/pppoe/src/opnsense/mvc/app/models/OPNsense/PPPoE/Menu/Menu.xml
@@ -4,8 +4,8 @@
             <Settings order="10" url="/vpn_pppoe.php">
                 <Edit url="/vpn_pppoe_edit.php*" visibility="hidden"/>
             </Settings>
-            <LogFile order="20" VisibleName="Log File" url="/diag_logs_poes.php">
-                <Type url="/diag_logs_poes.php*" visibility="hidden"/>
+            <LogFile order="20" VisibleName="Log File" url="/vpn_pppoe_log.php">
+                <Type url="/vpn_pppoe_log.php*" visibility="hidden"/>
             </LogFile>
         </PPPoE>
     </VPN>
diff --git a/net/pppoe/src/www/diag_logs_poes.inc b/net/pppoe/src/www/vpn_pppoe_log.inc
similarity index 100%
rename from net/pppoe/src/www/diag_logs_poes.inc
rename to net/pppoe/src/www/vpn_pppoe_log.inc
diff --git a/net/pppoe/src/www/diag_logs_poes.php b/net/pppoe/src/www/vpn_pppoe_log.php
similarity index 59%
rename from net/pppoe/src/www/diag_logs_poes.php
rename to net/pppoe/src/www/vpn_pppoe_log.php
index 59c7a7e91..baa877c36 100644
--- a/net/pppoe/src/www/diag_logs_poes.php
+++ b/net/pppoe/src/www/vpn_pppoe_log.php
@@ -5,7 +5,7 @@ if (htmlspecialchars($_POST['mode'])) {
 } elseif (htmlspecialchars($_GET['mode'])) {
     $mode = htmlspecialchars($_GET['mode']);
 } else {
-    $mode = "login";
+    $mode = 'login';
 }
 
 if ($mode != 'raw') {
@@ -17,7 +17,7 @@ if ($mode != 'raw') {
 $logtype = 'poes';
 
 $tab_array = array();
-$tab_array[] = array(gettext("PPPoE Logins"), $mode != "raw", "/diag_logs_poes.php");
-$tab_array[] = array(gettext("PPPoE Raw"), $mode == "raw", "/diag_logs_poes.php?mode=raw");
+$tab_array[] = array(gettext('PPPoE Logins'), $mode != 'raw', '/vpn_pppoe_log.php');
+$tab_array[] = array(gettext('PPPoE Raw'), $mode == 'raw', '/vpn_pppoe_log.php?mode=raw');
 
-require_once 'diag_logs_poes.inc';
+require_once 'vpn_pppoe_log.inc';
diff --git a/net/pptp/Makefile b/net/pptp/Makefile
index 0ca44eed3..49006ed18 100644
--- a/net/pptp/Makefile
+++ b/net/pptp/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		pptp
 PLUGIN_PRIVATE=		yes
-PLUGIN_VERSION=		0.1
+PLUGIN_VERSION=		0.2
 PLUGIN_DEPENDS=		mpd5
 PLUGIN_COMMENT=		PPTP server based on MPD5
 PLUGIN_MAINTAINER=	franco@opnsense.org
diff --git a/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml b/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml
index b32bd4733..e0bd4443a 100644
--- a/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml
+++ b/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/ACL/ACL.xml
@@ -4,7 +4,7 @@
         <name>WebCfg - Diagnostics: Logs: PPTP page</name>
         <description>Allow access to the 'Diagnostics: Logs: PPTP' page.</description>
         <patterns>
-            <pattern>diag_logs_pptp.php*</pattern>
+            <pattern>vpn_pptp_log.php*</pattern>
         </patterns>
     </page-diagnostics-logs-pptp>
     <page-vpn-vpnpptp>
diff --git a/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/Menu/Menu.xml b/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/Menu/Menu.xml
index 7f2ebae21..66e6d55d1 100644
--- a/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/Menu/Menu.xml
+++ b/net/pptp/src/opnsense/mvc/app/models/OPNsense/PPTP/Menu/Menu.xml
@@ -5,8 +5,8 @@
             <Users order="20" url="/vpn_pptp_users.php">
                 <Edit url="/vpn_pptp_users_edit.php*" visibility="hidden"/>
             </Users>
-            <LogFile order="30" VisibleName="Log File" url="/diag_logs_pptp.php">
-                <Type url="/diag_logs_pptp.php*" visibility="hidden"/>
+            <LogFile order="30" VisibleName="Log File" url="/vpn_pptp_log.php">
+                <Type url="/vpn_pptp_log.php*" visibility="hidden"/>
             </LogFile>
         </PPTP>
     </VPN>
diff --git a/net/pptp/src/www/diag_logs_pptp.inc b/net/pptp/src/www/vpn_pptp_log.inc
similarity index 100%
rename from net/pptp/src/www/diag_logs_pptp.inc
rename to net/pptp/src/www/vpn_pptp_log.inc
diff --git a/net/pptp/src/www/diag_logs_pptp.php b/net/pptp/src/www/vpn_pptp_log.php
similarity index 61%
rename from net/pptp/src/www/diag_logs_pptp.php
rename to net/pptp/src/www/vpn_pptp_log.php
index 4a08e2f73..4b844ce9e 100644
--- a/net/pptp/src/www/diag_logs_pptp.php
+++ b/net/pptp/src/www/vpn_pptp_log.php
@@ -5,7 +5,7 @@ if (htmlspecialchars($_POST['mode'])) {
 } elseif (htmlspecialchars($_GET['mode'])) {
     $mode = htmlspecialchars($_GET['mode']);
 } else {
-    $mode = "login";
+    $mode = 'login';
 }
 
 if ($mode != 'raw') {
@@ -17,9 +17,9 @@ if ($mode != 'raw') {
 $logtype = 'pptp';
 
 $tab_array = array();
-$tab_array[] = array(gettext("PPTP Logins"), $mode != "raw", "/diag_logs_pptp.php");
-$tab_array[] = array(gettext("PPTP Raw"), $mode == "raw", "/diag_logs_pptp.php?mode=raw");
+$tab_array[] = array(gettext('PPTP Logins'), $mode != 'raw', '/vpn_pptp_log.php');
+$tab_array[] = array(gettext('PPTP Raw'), $mode == 'raw', '/vpn_pptp_log.php?mode=raw');
 
 $service_hook = 'pptpd';
 
-require_once 'diag_logs_pptp.inc';
+require_once 'vpn_pptp_log.inc';