Fix more privilege text/name/page inconsistencies

27 files changed, 94 insertions, 98 deletions

diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc
index 3ff3953..fa9f19b 100644
--- a/src/etc/inc/priv.defs.inc
+++ b/src/etc/inc/priv.defs.inc
@@ -1,6 +1,13 @@
 <?php
 /*
- * priv.defs.inc - Generated privilege definitions
+ * priv.defs.inc - Default Privilege Definitions
+ * Generated by pfSense/tools/scripts/generate-privdefs.php
+ *
+ * ***************************************************
+ * DO NOT EDIT THIS FILE. IT IS GENERATED BY A SCRIPT.
+ * ***************************************************
+ *
+ * Text is pulled from metadata headers in the referenced files.
  *
  */
 
@@ -66,11 +73,11 @@ $priv_list['page-diagnostics-showstates']['descr'] = gettext("Allow access to th
 $priv_list['page-diagnostics-showstates']['match'] = array();
 $priv_list['page-diagnostics-showstates']['match'][] = "diag_dump_states.php*";
 
-$priv_list['page-diagnostics-showstates'] = array();
-$priv_list['page-diagnostics-showstates']['name'] = gettext("WebCfg - Diagnostics: Show States");
-$priv_list['page-diagnostics-showstates']['descr'] = gettext("Allow access to the 'Diagnostics: Show States' page.");
-$priv_list['page-diagnostics-showstates']['match'] = array();
-$priv_list['page-diagnostics-showstates']['match'][] = "diag_dump_states.php*";
+$priv_list['page-diagnostics-sourcetracking'] = array();
+$priv_list['page-diagnostics-sourcetracking']['name'] = gettext("WebCfg - Diagnostics: Show Source Tracking");
+$priv_list['page-diagnostics-sourcetracking']['descr'] = gettext("Allow access to the 'Diagnostics: Show Source Tracking' page.");
+$priv_list['page-diagnostics-sourcetracking']['match'] = array();
+$priv_list['page-diagnostics-sourcetracking']['match'][] = "diag_dump_states_sources.php*";
 
 $priv_list['page-diagnostics-gmirror'] = array();
 $priv_list['page-diagnostics-gmirror']['name'] = gettext("WebCfg - Diagnostics: GEOM Mirrors");
@@ -115,8 +122,8 @@ $priv_list['page-diagnostics-logs-system']['match'] = array();
 $priv_list['page-diagnostics-logs-system']['match'][] = "diag_logs.php";
 
 $priv_list['page-diagnostics-logs-firewall'] = array();
-$priv_list['page-diagnostics-logs-firewall']['name'] = gettext("WebCfg - Diagnostics: Logs: Firewall");
-$priv_list['page-diagnostics-logs-firewall']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: Firewall' page.");
+$priv_list['page-diagnostics-logs-firewall']['name'] = gettext("WebCfg - Status: Logs: Firewall");
+$priv_list['page-diagnostics-logs-firewall']['descr'] = gettext("Allow access to the 'Status: Logs: Firewall' page.");
 $priv_list['page-diagnostics-logs-firewall']['match'] = array();
 $priv_list['page-diagnostics-logs-firewall']['match'][] = "diag_logs_filter.php*";
 
@@ -133,14 +140,14 @@ $priv_list['page-diagnostics-logs-firewall-summary']['match'] = array();
 $priv_list['page-diagnostics-logs-firewall-summary']['match'][] = "diag_logs_filter_summary.php*";
 
 $priv_list['page-diagnostics-logs-settings'] = array();
-$priv_list['page-diagnostics-logs-settings']['name'] = gettext("WebCfg - Diagnostics: Logs: Settings");
-$priv_list['page-diagnostics-logs-settings']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: Settings' page.");
+$priv_list['page-diagnostics-logs-settings']['name'] = gettext("WebCfg - Status: Logs: Settings");
+$priv_list['page-diagnostics-logs-settings']['descr'] = gettext("Allow access to the 'Status: Logs: Settings' page.");
 $priv_list['page-diagnostics-logs-settings']['match'] = array();
 $priv_list['page-diagnostics-logs-settings']['match'][] = "diag_logs_settings.php*";
 
 $priv_list['page-diagnostics-logs-pptpvpn'] = array();
-$priv_list['page-diagnostics-logs-pptpvpn']['name'] = gettext("WebCfg - Diagnostics: Logs: VPN");
-$priv_list['page-diagnostics-logs-pptpvpn']['descr'] = gettext("Allow access to the 'Diagnostics: Logs: VPN' page.");
+$priv_list['page-diagnostics-logs-pptpvpn']['name'] = gettext("WebCfg - Status: Logs: VPN");
+$priv_list['page-diagnostics-logs-pptpvpn']['descr'] = gettext("Allow access to the 'Status: Logs: VPN' page.");
 $priv_list['page-diagnostics-logs-pptpvpn']['match'] = array();
 $priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "diag_logs_vpn.php*";
 
@@ -181,8 +188,8 @@ $priv_list['page-status-packagelogs']['match'] = array();
 $priv_list['page-status-packagelogs']['match'][] = "diag_pkglogs.php*";
 
 $priv_list['page-diagnostics-resetstate'] = array();
-$priv_list['page-diagnostics-resetstate']['name'] = gettext("WebCfg - Diagnostics: Reset state");
-$priv_list['page-diagnostics-resetstate']['descr'] = gettext("Allow access to the 'Diagnostics: Reset state' page.");
+$priv_list['page-diagnostics-resetstate']['name'] = gettext("WebCfg - Diagnostics: Reset states");
+$priv_list['page-diagnostics-resetstate']['descr'] = gettext("Allow access to the 'Diagnostics: Reset states' page.");
 $priv_list['page-diagnostics-resetstate']['match'] = array();
 $priv_list['page-diagnostics-resetstate']['match'][] = "diag_resetstate.php*";
 
@@ -223,7 +230,7 @@ $priv_list['page-diagnostics-system-pftop']['match'] = array();
 $priv_list['page-diagnostics-system-pftop']['match'][] = "diag_system_pftop.php*";
 
 $priv_list['page-diagnostics-tables'] = array();
-$priv_list['page-diagnostics-tables']['name'] = gettext("WebCfg - Diagnostics: PF Table IP addresses");
+$priv_list['page-diagnostics-tables']['name'] = gettext("WebCfg - Diagnostics: pf Table IP addresses");
 $priv_list['page-diagnostics-tables']['descr'] = gettext("Allow access to the 'Diagnostics: Tables' page.");
 $priv_list['page-diagnostics-tables']['match'] = array();
 $priv_list['page-diagnostics-tables']['match'][] = "diag_tables.php*";
@@ -247,7 +254,7 @@ $priv_list['page-firewall-easyrule']['match'] = array();
 $priv_list['page-firewall-easyrule']['match'][] = "easyrule.php*";
 
 $priv_list['page-diagnostics-edit'] = array();
-$priv_list['page-diagnostics-edit']['name'] = gettext("WebCfg - Diagnostics: Edit FIle");
+$priv_list['page-diagnostics-edit']['name'] = gettext("WebCfg - Diagnostics: Edit File");
 $priv_list['page-diagnostics-edit']['descr'] = gettext("Allow access to the 'Diagnostics: Edit File' page.");
 $priv_list['page-diagnostics-edit']['match'] = array();
 $priv_list['page-diagnostics-edit']['match'][] = "edit.php*";
@@ -303,8 +310,8 @@ $priv_list['page-firewall-nat-portforward-edit']['match'] = array();
 $priv_list['page-firewall-nat-portforward-edit']['match'][] = "firewall_nat_edit.php*";
 
 $priv_list['page-firewall-nat-npt'] = array();
-$priv_list['page-firewall-nat-npt']['name'] = gettext("WebCfg - Firewall: NAT: NPT");
-$priv_list['page-firewall-nat-npt']['descr'] = gettext("Allow access to the 'Firewall: NAT: NPT' page.");
+$priv_list['page-firewall-nat-npt']['name'] = gettext("WebCfg - Firewall: NAT: NPt");
+$priv_list['page-firewall-nat-npt']['descr'] = gettext("Allow access to the 'Firewall: NAT: NPt' page.");
 $priv_list['page-firewall-nat-npt']['match'] = array();
 $priv_list['page-firewall-nat-npt']['match'][] = "firewall_nat_npt.php*";
 
@@ -409,6 +416,7 @@ $priv_list['page-diagnostics-cpuutilization']['name'] = gettext("WebCfg - Diagno
 $priv_list['page-diagnostics-cpuutilization']['descr'] = gettext("Allow access to the 'Diagnostics: CPU Utilization' page.");
 $priv_list['page-diagnostics-cpuutilization']['match'] = array();
 $priv_list['page-diagnostics-cpuutilization']['match'][] = "graph_cpu.php*";
+$priv_list['page-diagnostics-cpuutilization']['match'][] = "stats.php*";
 
 $priv_list['page-diagnostics-haltsystem'] = array();
 $priv_list['page-diagnostics-haltsystem']['name'] = gettext("WebCfg - Diagnostics: Halt system");
@@ -501,8 +509,8 @@ $priv_list['page-interfaces-lagg-edit']['match'] = array();
 $priv_list['page-interfaces-lagg-edit']['match'][] = "interfaces_lagg_edit.php*";
 
 $priv_list['page-interfaces-ppps'] = array();
-$priv_list['page-interfaces-ppps']['name'] = gettext("WebCfg - Interfaces: ppps");
-$priv_list['page-interfaces-ppps']['descr'] = gettext("Allow access to the 'Interfaces: ppps' page.");
+$priv_list['page-interfaces-ppps']['name'] = gettext("WebCfg - Interfaces: PPPs");
+$priv_list['page-interfaces-ppps']['descr'] = gettext("Allow access to the 'Interfaces: PPPs' page.");
 $priv_list['page-interfaces-ppps']['match'] = array();
 $priv_list['page-interfaces-ppps']['match'][] = "interfaces_ppps.php*";
 
@@ -543,8 +551,8 @@ $priv_list['page-interfaces-wireless']['match'] = array();
 $priv_list['page-interfaces-wireless']['match'][] = "interfaces_wireless.php*";
 
 $priv_list['page-interfaces-wireless-edit'] = array();
-$priv_list['page-interfaces-wireless-edit']['name'] = gettext("WebCfg - Interfaces: Wireless edit");
-$priv_list['page-interfaces-wireless-edit']['descr'] = gettext("Allow access to the 'Interfaces: Wireless : Edit' page.");
+$priv_list['page-interfaces-wireless-edit']['name'] = gettext("WebCfg - Interfaces: Wireless: Edit");
+$priv_list['page-interfaces-wireless-edit']['descr'] = gettext("Allow access to the 'Interfaces: Wireless: Edit' page.");
 $priv_list['page-interfaces-wireless-edit']['match'] = array();
 $priv_list['page-interfaces-wireless-edit']['match'][] = "interfaces_wireless_edit.php*";
 
@@ -579,7 +587,7 @@ $priv_list['page-loadbalancer-pool-edit']['match'] = array();
 $priv_list['page-loadbalancer-pool-edit']['match'][] = "load_balancer_pool_edit.php*";
 
 $priv_list['page-services-loadbalancer-setting'] = array();
-$priv_list['page-services-loadbalancer-setting']['name'] = gettext("WebCfg - Services: Load Balancer: setting");
+$priv_list['page-services-loadbalancer-setting']['name'] = gettext("WebCfg - Services: Load Balancer: Settings");
 $priv_list['page-services-loadbalancer-setting']['descr'] = gettext("Allow access to the 'Settings: Load Balancer: Settings' page.");
 $priv_list['page-services-loadbalancer-setting']['match'] = array();
 $priv_list['page-services-loadbalancer-setting']['match'][] = "load_balancer_setting.php*";
@@ -633,8 +641,8 @@ $priv_list['page-diagnostics-rebootsystem']['match'] = array();
 $priv_list['page-diagnostics-rebootsystem']['match'][] = "reboot.php*";
 
 $priv_list['page-diagnostics-restart-httpd'] = array();
-$priv_list['page-diagnostics-restart-httpd']['name'] = gettext("WebCfg - Diagnostics: Restart HTTPD : System");
-$priv_list['page-diagnostics-restart-httpd']['descr'] = gettext("Allow access to the 'Diagnostics: Restart HTTPD: System' page.");
+$priv_list['page-diagnostics-restart-httpd']['name'] = gettext("WebCfg - Diagnostics: Restart Web Server Daemon");
+$priv_list['page-diagnostics-restart-httpd']['descr'] = gettext("Allow access to the 'Diagnostics: Restart Web Server Daemon' page.");
 $priv_list['page-diagnostics-restart-httpd']['match'] = array();
 $priv_list['page-diagnostics-restart-httpd']['match'][] = "restart_httpd.php*";
 
@@ -711,14 +719,14 @@ $priv_list['page-services-captiveportal-editzones']['match'] = array();
 $priv_list['page-services-captiveportal-editzones']['match'][] = "services_captiveportal_zones_edit.php*";
 
 $priv_list['page-services-dhcpserver'] = array();
-$priv_list['page-services-dhcpserver']['name'] = gettext("WebCfg - Services: DHCP server");
-$priv_list['page-services-dhcpserver']['descr'] = gettext("Allow access to the 'Services: DHCP server' page.");
+$priv_list['page-services-dhcpserver']['name'] = gettext("WebCfg - Services: DHCP Server");
+$priv_list['page-services-dhcpserver']['descr'] = gettext("Allow access to the 'Services: DHCP Server' page.");
 $priv_list['page-services-dhcpserver']['match'] = array();
 $priv_list['page-services-dhcpserver']['match'][] = "services_dhcp.php*";
 
 $priv_list['page-services-dhcpserver-editstaticmapping'] = array();
-$priv_list['page-services-dhcpserver-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCP Server : Edit static mapping");
-$priv_list['page-services-dhcpserver-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCP Server : Edit static mapping' page.");
+$priv_list['page-services-dhcpserver-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCP Server: Edit static mapping");
+$priv_list['page-services-dhcpserver-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCP Server: Edit static mapping' page.");
 $priv_list['page-services-dhcpserver-editstaticmapping']['match'] = array();
 $priv_list['page-services-dhcpserver-editstaticmapping']['match'][] = "services_dhcp_edit.php*";
 
@@ -735,7 +743,7 @@ $priv_list['page-services-dhcpv6server']['match'] = array();
 $priv_list['page-services-dhcpv6server']['match'][] = "services_dhcpv6.php*";
 
 $priv_list['page-services-dhcpserverv6-editstaticmapping'] = array();
-$priv_list['page-services-dhcpserverv6-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCPv6 Server : Edit static mapping");
+$priv_list['page-services-dhcpserverv6-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCPv6 Server: Edit static mapping");
 $priv_list['page-services-dhcpserverv6-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCPv6 Server : Edit static mapping' page.");
 $priv_list['page-services-dhcpserverv6-editstaticmapping']['match'] = array();
 $priv_list['page-services-dhcpserverv6-editstaticmapping']['match'][] = "services_dhcpv6_edit.php*";
@@ -796,13 +804,13 @@ $priv_list['page-services-ntpd']['match'][] = "services_ntpd.php*";
 
 $priv_list['page-services-ntpd-gps'] = array();
 $priv_list['page-services-ntpd-gps']['name'] = gettext("WebCfg - Services: NTP Serial GPS");
-$priv_list['page-services-ntpd-gps']['descr'] = gettext("Allow access to the 'Services: NTP Serial GPS' page..");
+$priv_list['page-services-ntpd-gps']['descr'] = gettext("Allow access to the 'Services: NTP Serial GPS' page.");
 $priv_list['page-services-ntpd-gps']['match'] = array();
 $priv_list['page-services-ntpd-gps']['match'][] = "services_ntpd_gps.php*";
 
 $priv_list['page-services-ntpd-pps'] = array();
 $priv_list['page-services-ntpd-pps']['name'] = gettext("WebCfg - Services: NTP PPS");
-$priv_list['page-services-ntpd-pps']['descr'] = gettext("Allow access to the 'Services: NTP PPS' page..");
+$priv_list['page-services-ntpd-pps']['descr'] = gettext("Allow access to the 'Services: NTP PPS' page.");
 $priv_list['page-services-ntpd-pps']['match'] = array();
 $priv_list['page-services-ntpd-pps']['match'][] = "services_ntpd_pps.php*";
 
@@ -872,12 +880,6 @@ $priv_list['page-services-wakeonlan-edit']['descr'] = gettext("Allow access to t
 $priv_list['page-services-wakeonlan-edit']['match'] = array();
 $priv_list['page-services-wakeonlan-edit']['match'][] = "services_wol_edit.php*";
 
-$priv_list['page-diagnostics-cpuutilization'] = array();
-$priv_list['page-diagnostics-cpuutilization']['name'] = gettext("WebCfg - Diagnostics: CPU Utilization");
-$priv_list['page-diagnostics-cpuutilization']['descr'] = gettext("Allow access to the 'Diagnostics: CPU Utilization' page.");
-$priv_list['page-diagnostics-cpuutilization']['match'] = array();
-$priv_list['page-diagnostics-cpuutilization']['match'][] = "stats.php*";
-
 $priv_list['page-hidden-detailedstatus'] = array();
 $priv_list['page-hidden-detailedstatus']['name'] = gettext("WebCfg - Hidden: Detailed Status");
 $priv_list['page-hidden-detailedstatus']['descr'] = gettext("Allow access to the 'Hidden: Detailed Status' page.");
@@ -1003,8 +1005,8 @@ $priv_list['page-status-rrdgraphs']['match'][] = "status_rrd_graph.php*";
 $priv_list['page-status-rrdgraphs']['match'][] = "status_rrd_graph_img.php*";
 
 $priv_list['page-status-rrdgraph-settings'] = array();
-$priv_list['page-status-rrdgraph-settings']['name'] = gettext("WebCfg - Status: RRD Graphs settings");
-$priv_list['page-status-rrdgraph-settings']['descr'] = gettext("Allow access to the 'Status: RRD Graphs: settings' page.");
+$priv_list['page-status-rrdgraph-settings']['name'] = gettext("WebCfg - Status: RRD Graphs: Settings");
+$priv_list['page-status-rrdgraph-settings']['descr'] = gettext("Allow access to the 'Status: RRD Graphs: Settings' page.");
 $priv_list['page-status-rrdgraph-settings']['match'] = array();
 $priv_list['page-status-rrdgraph-settings']['match'][] = "status_rrd_graph_settings.php*";
 
@@ -1171,8 +1173,8 @@ $priv_list['page-system-usermanager-passwordmg']['match'] = array();
 $priv_list['page-system-usermanager-passwordmg']['match'][] = "system_usermanager_passwordmg.php*";
 
 $priv_list['page-system-usermanager-settings'] = array();
-$priv_list['page-system-usermanager-settings']['name'] = gettext("WebCfg - System: User Manager: settings");
-$priv_list['page-system-usermanager-settings']['descr'] = gettext("Allow access to the 'System: User Manager: settings' page.");
+$priv_list['page-system-usermanager-settings']['name'] = gettext("WebCfg - System: User Manager: Settings");
+$priv_list['page-system-usermanager-settings']['descr'] = gettext("Allow access to the 'System: User Manager: Settings' page.");
 $priv_list['page-system-usermanager-settings']['match'] = array();
 $priv_list['page-system-usermanager-settings']['match'][] = "system_usermanager_settings.php*";
 
@@ -1180,7 +1182,7 @@ $priv_list['page-system-usermanager-settings-ldappicker'] = array();
 $priv_list['page-system-usermanager-settings-ldappicker']['name'] = gettext("WebCfg - System: User Manager: Settings: LDAP Picker");
 $priv_list['page-system-usermanager-settings-ldappicker']['descr'] = gettext("Allow access to the 'System: User Manager: Settings: LDAP Picker' page.");
 $priv_list['page-system-usermanager-settings-ldappicker']['match'] = array();
-$priv_list['page-system-usermanager-settings-ldappicker']['match'][] = "system_usermanager_settings_ldappicker.php*";
+$priv_list['page-system-usermanager-settings-ldappicker']['match'][] = "system_usermanager_settings_ldapacpicker.php*";
 
 $priv_list['page-system-usermanager-settings-testldap'] = array();
 $priv_list['page-system-usermanager-settings-testldap']['name'] = gettext("WebCfg - System: User Manager: Settings: Test LDAP");
@@ -1237,20 +1239,20 @@ $priv_list['page-vpn-ipsec-settings']['match'] = array();
 $priv_list['page-vpn-ipsec-settings']['match'][] = "vpn_ipsec_settings.php*";
 
 $priv_list['page-vpn-vpnl2tp'] = array();
-$priv_list['page-vpn-vpnl2tp']['name'] = gettext("WebCfg - VPN: VPN L2TP");
-$priv_list['page-vpn-vpnl2tp']['descr'] = gettext("Allow access to the 'VPN: VPN L2TP' page.");
+$priv_list['page-vpn-vpnl2tp']['name'] = gettext("WebCfg - VPN: L2TP");
+$priv_list['page-vpn-vpnl2tp']['descr'] = gettext("Allow access to the 'VPN: L2TP' page.");
 $priv_list['page-vpn-vpnl2tp']['match'] = array();
 $priv_list['page-vpn-vpnl2tp']['match'][] = "vpn_l2tp.php*";
 
 $priv_list['page-vpn-vpnl2tp-users'] = array();
-$priv_list['page-vpn-vpnl2tp-users']['name'] = gettext("WebCfg - VPN: VPN L2TP : Users");
-$priv_list['page-vpn-vpnl2tp-users']['descr'] = gettext("Allow access to the 'VPN: VPN L2TP : Users' page.");
+$priv_list['page-vpn-vpnl2tp-users']['name'] = gettext("WebCfg - VPN: L2TP: Users");
+$priv_list['page-vpn-vpnl2tp-users']['descr'] = gettext("Allow access to the 'VPN: L2TP: Users' page.");
 $priv_list['page-vpn-vpnl2tp-users']['match'] = array();
 $priv_list['page-vpn-vpnl2tp-users']['match'][] = "vpn_l2tp_users.php*";
 
 $priv_list['page-vpn-vpnl2tp-users-edit'] = array();
-$priv_list['page-vpn-vpnl2tp-users-edit']['name'] = gettext("WebCfg - VPN: VPN L2TP : Users : Edit");
-$priv_list['page-vpn-vpnl2tp-users-edit']['descr'] = gettext("Allow access to the 'VPN: VPN L2TP : Users : Edit' page.");
+$priv_list['page-vpn-vpnl2tp-users-edit']['name'] = gettext("WebCfg - VPN: L2TP: Users: Edit");
+$priv_list['page-vpn-vpnl2tp-users-edit']['descr'] = gettext("Allow access to the 'VPN: L2TP: Users: Edit' page.");
 $priv_list['page-vpn-vpnl2tp-users-edit']['match'] = array();
 $priv_list['page-vpn-vpnl2tp-users-edit']['match'][] = "vpn_l2tp_users_edit.php*";
 
diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php
index 7a578d1..2e11a85 100644
--- a/src/usr/local/www/diag_dump_states_sources.php
+++ b/src/usr/local/www/diag_dump_states_sources.php
@@ -60,10 +60,10 @@
 */
 
 ##|+PRIV
-##|*IDENT=page-diagnostics-showstates
-##|*NAME=Diagnostics: Show States
-##|*DESCR=Allow access to the 'Diagnostics: Show States' page.
-##|*MATCH=diag_dump_states.php*
+##|*IDENT=page-diagnostics-sourcetracking
+##|*NAME=Diagnostics: Show Source Tracking
+##|*DESCR=Allow access to the 'Diagnostics: Show Source Tracking' page.
+##|*MATCH=diag_dump_states_sources.php*
 ##|-PRIV
 
 require_once("guiconfig.inc");
diff --git a/src/usr/local/www/diag_logs_filter.php b/src/usr/local/www/diag_logs_filter.php
index bae0c8b..6e7387c 100644
--- a/src/usr/local/www/diag_logs_filter.php
+++ b/src/usr/local/www/diag_logs_filter.php
@@ -63,8 +63,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-logs-firewall
-##|*NAME=Diagnostics: Logs: Firewall
-##|*DESCR=Allow access to the 'Diagnostics: Logs: Firewall' page.
+##|*NAME=Status: Logs: Firewall
+##|*DESCR=Allow access to the 'Status: Logs: Firewall' page.
 ##|*MATCH=diag_logs_filter.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/diag_logs_settings.php b/src/usr/local/www/diag_logs_settings.php
index b7729d1..e8d8731 100644
--- a/src/usr/local/www/diag_logs_settings.php
+++ b/src/usr/local/www/diag_logs_settings.php
@@ -62,8 +62,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-logs-settings
-##|*NAME=Diagnostics: Logs: Settings
-##|*DESCR=Allow access to the 'Diagnostics: Logs: Settings' page.
+##|*NAME=Status: Logs: Settings
+##|*DESCR=Allow access to the 'Status: Logs: Settings' page.
 ##|*MATCH=diag_logs_settings.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/diag_logs_vpn.php b/src/usr/local/www/diag_logs_vpn.php
index ff76793..d14a8a5 100755
--- a/src/usr/local/www/diag_logs_vpn.php
+++ b/src/usr/local/www/diag_logs_vpn.php
@@ -64,8 +64,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-logs-pptpvpn
-##|*NAME=Diagnostics: Logs: VPN
-##|*DESCR=Allow access to the 'Diagnostics: Logs: VPN' page.
+##|*NAME=Status: Logs: VPN
+##|*DESCR=Allow access to the 'Status: Logs: VPN' page.
 ##|*MATCH=diag_logs_vpn.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/diag_resetstate.php b/src/usr/local/www/diag_resetstate.php
index 6e8f341..494e842 100644
--- a/src/usr/local/www/diag_resetstate.php
+++ b/src/usr/local/www/diag_resetstate.php
@@ -62,8 +62,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-resetstate
-##|*NAME=Diagnostics: Reset state
-##|*DESCR=Allow access to the 'Diagnostics: Reset state' page.
+##|*NAME=Diagnostics: Reset states
+##|*DESCR=Allow access to the 'Diagnostics: Reset states' page.
 ##|*MATCH=diag_resetstate.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php
index 8c8ae36..845d7a7 100644
--- a/src/usr/local/www/diag_tables.php
+++ b/src/usr/local/www/diag_tables.php
@@ -60,7 +60,7 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-tables
-##|*NAME=Diagnostics: PF Table IP addresses
+##|*NAME=Diagnostics: pf Table IP addresses
 ##|*DESCR=Allow access to the 'Diagnostics: Tables' page.
 ##|*MATCH=diag_tables.php*
 ##|-PRIV
diff --git a/src/usr/local/www/edit.php b/src/usr/local/www/edit.php
index 9bcf7a5..055020e 100644
--- a/src/usr/local/www/edit.php
+++ b/src/usr/local/www/edit.php
@@ -58,7 +58,7 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-edit
-##|*NAME=Diagnostics: Edit FIle
+##|*NAME=Diagnostics: Edit File
 ##|*DESCR=Allow access to the 'Diagnostics: Edit File' page.
 ##|*MATCH=edit.php*
 ##|*MATCH=browser.php*
diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php
index 159962a..1fabdea 100644
--- a/src/usr/local/www/firewall_nat_npt.php
+++ b/src/usr/local/www/firewall_nat_npt.php
@@ -62,8 +62,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-firewall-nat-npt
-##|*NAME=Firewall: NAT: NPT
-##|*DESCR=Allow access to the 'Firewall: NAT: NPT' page.
+##|*NAME=Firewall: NAT: NPt
+##|*DESCR=Allow access to the 'Firewall: NAT: NPt' page.
 ##|*MATCH=firewall_nat_npt.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php
index 157fb44..b81a602 100644
--- a/src/usr/local/www/firewall_rules_edit.php
+++ b/src/usr/local/www/firewall_rules_edit.php
@@ -1351,7 +1351,7 @@ $section->addInput(new Form_Checkbox(
 	$pconfig['log']
 ))->setHelp('Hint: the firewall has limited local log space. Don\'t turn on logging '.
 	'for everything. If you want to do a lot of logging, consider using a remote '.
-	'syslog server (see the <a href="diag_logs_settings.php">Diagnostics: System logs: '.
+	'syslog server (see the <a href="diag_logs_settings.php">Status: System logs: '.
 	'Settings</a> page).');
 
 $section->addInput(new Form_Input(
diff --git a/src/usr/local/www/graph_cpu.php b/src/usr/local/www/graph_cpu.php
index 484b536..74bf639 100644
--- a/src/usr/local/www/graph_cpu.php
+++ b/src/usr/local/www/graph_cpu.php
@@ -66,6 +66,7 @@
 ##|*NAME=Diagnostics: CPU Utilization
 ##|*DESCR=Allow access to the 'Diagnostics: CPU Utilization' page.
 ##|*MATCH=graph_cpu.php*
+##|*MATCH=stats.php*
 ##|-PRIV
 
 require_once("guiconfig.inc");
diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php
index 87bb0b9..076ecf7 100644
--- a/src/usr/local/www/interfaces_ppps.php
+++ b/src/usr/local/www/interfaces_ppps.php
@@ -62,8 +62,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-ppps
-##|*NAME=Interfaces: ppps
-##|*DESCR=Allow access to the 'Interfaces: ppps' page.
+##|*NAME=Interfaces: PPPs
+##|*DESCR=Allow access to the 'Interfaces: PPPs' page.
 ##|*MATCH=interfaces_ppps.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/interfaces_wireless_edit.php b/src/usr/local/www/interfaces_wireless_edit.php
index 8cddf9b..4dd7930 100644
--- a/src/usr/local/www/interfaces_wireless_edit.php
+++ b/src/usr/local/www/interfaces_wireless_edit.php
@@ -59,8 +59,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-interfaces-wireless-edit
-##|*NAME=Interfaces: Wireless edit
-##|*DESCR=Allow access to the 'Interfaces: Wireless : Edit' page.
+##|*NAME=Interfaces: Wireless: Edit
+##|*DESCR=Allow access to the 'Interfaces: Wireless: Edit' page.
 ##|*MATCH=interfaces_wireless_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php
index 492aece..13dacb5 100644
--- a/src/usr/local/www/load_balancer_setting.php
+++ b/src/usr/local/www/load_balancer_setting.php
@@ -60,7 +60,7 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-loadbalancer-setting
-##|*NAME=Services: Load Balancer: setting
+##|*NAME=Services: Load Balancer: Settings
 ##|*DESCR=Allow access to the 'Settings: Load Balancer: Settings' page.
 ##|*MATCH=load_balancer_setting.php*
 ##|-PRIV
diff --git a/src/usr/local/www/restart_httpd.php b/src/usr/local/www/restart_httpd.php
index 02d3bd2..bcbb7be 100644
--- a/src/usr/local/www/restart_httpd.php
+++ b/src/usr/local/www/restart_httpd.php
@@ -60,8 +60,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-diagnostics-restart-httpd
-##|*NAME=Diagnostics: Restart HTTPD : System
-##|*DESCR=Allow access to the 'Diagnostics: Restart HTTPD: System' page.
+##|*NAME=Diagnostics: Restart Web Server Daemon
+##|*DESCR=Allow access to the 'Diagnostics: Restart Web Server Daemon' page.
 ##|*MATCH=restart_httpd.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php
index 239eee3..465b9f0 100644
--- a/src/usr/local/www/services_dhcp.php
+++ b/src/usr/local/www/services_dhcp.php
@@ -62,8 +62,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-dhcpserver
-##|*NAME=Services: DHCP server
-##|*DESCR=Allow access to the 'Services: DHCP server' page.
+##|*NAME=Services: DHCP Server
+##|*DESCR=Allow access to the 'Services: DHCP Server' page.
 ##|*MATCH=services_dhcp.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php
index 1040b60..76a6cca 100644
--- a/src/usr/local/www/services_dhcp_edit.php
+++ b/src/usr/local/www/services_dhcp_edit.php
@@ -62,8 +62,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-dhcpserver-editstaticmapping
-##|*NAME=Services: DHCP Server : Edit static mapping
-##|*DESCR=Allow access to the 'Services: DHCP Server : Edit static mapping' page.
+##|*NAME=Services: DHCP Server: Edit static mapping
+##|*DESCR=Allow access to the 'Services: DHCP Server: Edit static mapping' page.
 ##|*MATCH=services_dhcp_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php
index 295f91d..910479f 100644
--- a/src/usr/local/www/services_dhcpv6_edit.php
+++ b/src/usr/local/www/services_dhcpv6_edit.php
@@ -63,7 +63,7 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-dhcpserverv6-editstaticmapping
-##|*NAME=Services: DHCPv6 Server : Edit static mapping
+##|*NAME=Services: DHCPv6 Server: Edit static mapping
 ##|*DESCR=Allow access to the 'Services: DHCPv6 Server : Edit static mapping' page.
 ##|*MATCH=services_dhcpv6_edit.php*
 ##|-PRIV
diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php
index 8a5e548..ef4946b 100644
--- a/src/usr/local/www/services_ntpd_gps.php
+++ b/src/usr/local/www/services_ntpd_gps.php
@@ -60,7 +60,7 @@
 ##|+PRIV
 ##|*IDENT=page-services-ntpd-gps
 ##|*NAME=Services: NTP Serial GPS
-##|*DESCR=Allow access to the 'Services: NTP Serial GPS' page..
+##|*DESCR=Allow access to the 'Services: NTP Serial GPS' page.
 ##|*MATCH=services_ntpd_gps.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php
index 5c15d0a..1f836cf 100644
--- a/src/usr/local/www/services_ntpd_pps.php
+++ b/src/usr/local/www/services_ntpd_pps.php
@@ -60,7 +60,7 @@
 ##|+PRIV
 ##|*IDENT=page-services-ntpd-pps
 ##|*NAME=Services: NTP PPS
-##|*DESCR=Allow access to the 'Services: NTP PPS' page..
+##|*DESCR=Allow access to the 'Services: NTP PPS' page.
 ##|*MATCH=services_ntpd_pps.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/stats.php b/src/usr/local/www/stats.php
index b898f36..41dc6e4 100644
--- a/src/usr/local/www/stats.php
+++ b/src/usr/local/www/stats.php
@@ -53,13 +53,6 @@
  *
  */
 
-##|+PRIV
-##|*IDENT=page-diagnostics-cpuutilization
-##|*NAME=Diagnostics: CPU Utilization
-##|*DESCR=Allow access to the 'Diagnostics: CPU Utilization' page.
-##|*MATCH=stats.php*
-##|-PRIV
-
 require_once("guiconfig.inc");
 require_once("includes/functions.inc.php");
 
diff --git a/src/usr/local/www/status_rrd_graph_settings.php b/src/usr/local/www/status_rrd_graph_settings.php
index 9e4d616..6eaf9dc 100644
--- a/src/usr/local/www/status_rrd_graph_settings.php
+++ b/src/usr/local/www/status_rrd_graph_settings.php
@@ -60,8 +60,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-status-rrdgraph-settings
-##|*NAME=Status: RRD Graphs settings
-##|*DESCR=Allow access to the 'Status: RRD Graphs: settings' page.
+##|*NAME=Status: RRD Graphs: Settings
+##|*DESCR=Allow access to the 'Status: RRD Graphs: Settings' page.
 ##|*MATCH=status_rrd_graph_settings.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php
index 29dc338..4133edb 100644
--- a/src/usr/local/www/system_usermanager_settings.php
+++ b/src/usr/local/www/system_usermanager_settings.php
@@ -59,8 +59,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-system-usermanager-settings
-##|*NAME=System: User Manager: settings
-##|*DESCR=Allow access to the 'System: User Manager: settings' page.
+##|*NAME=System: User Manager: Settings
+##|*DESCR=Allow access to the 'System: User Manager: Settings' page.
 ##|*MATCH=system_usermanager_settings.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
index 2a300da..415c2a7 100644
--- a/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
+++ b/src/usr/local/www/system_usermanager_settings_ldapacpicker.php
@@ -60,7 +60,7 @@
 ##|*IDENT=page-system-usermanager-settings-ldappicker
 ##|*NAME=System: User Manager: Settings: LDAP Picker
 ##|*DESCR=Allow access to the 'System: User Manager: Settings: LDAP Picker' page.
-##|*MATCH=system_usermanager_settings_ldappicker.php*
+##|*MATCH=system_usermanager_settings_ldapacpicker.php*
 ##|-PRIV
 
 require("guiconfig.inc");
diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php
index 2a07210..bd61f1e 100644
--- a/src/usr/local/www/vpn_l2tp.php
+++ b/src/usr/local/www/vpn_l2tp.php
@@ -55,8 +55,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-vpn-vpnl2tp
-##|*NAME=VPN: VPN L2TP
-##|*DESCR=Allow access to the 'VPN: VPN L2TP' page.
+##|*NAME=VPN: L2TP
+##|*DESCR=Allow access to the 'VPN: L2TP' page.
 ##|*MATCH=vpn_l2tp.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/vpn_l2tp_users.php b/src/usr/local/www/vpn_l2tp_users.php
index 5775e25..7e714c1 100644
--- a/src/usr/local/www/vpn_l2tp_users.php
+++ b/src/usr/local/www/vpn_l2tp_users.php
@@ -55,8 +55,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-vpn-vpnl2tp-users
-##|*NAME=VPN: VPN L2TP : Users
-##|*DESCR=Allow access to the 'VPN: VPN L2TP : Users' page.
+##|*NAME=VPN: L2TP: Users
+##|*DESCR=Allow access to the 'VPN: L2TP: Users' page.
 ##|*MATCH=vpn_l2tp_users.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/vpn_l2tp_users_edit.php b/src/usr/local/www/vpn_l2tp_users_edit.php
index a35badd..6d6e360 100644
--- a/src/usr/local/www/vpn_l2tp_users_edit.php
+++ b/src/usr/local/www/vpn_l2tp_users_edit.php
@@ -55,8 +55,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-vpn-vpnl2tp-users-edit
-##|*NAME=VPN: VPN L2TP : Users : Edit
-##|*DESCR=Allow access to the 'VPN: VPN L2TP : Users : Edit' page.
+##|*NAME=VPN: L2TP: Users: Edit
+##|*DESCR=Allow access to the 'VPN: L2TP: Users: Edit' page.
 ##|*MATCH=vpn_l2tp_users_edit.php*
 ##|-PRIV