Standardize privilege name capitalization

While looking at some privilege stuff, I noticed that various
capitlization looked inconsistent down the list. This makes the list
look more consistent.

(cherry picked from commit 48157a04dde7b3a56776417cdc7b5e457a660733)

19 files changed, 72 insertions, 72 deletions

diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc
index 8deb4d7..455be30 100644
--- a/src/etc/inc/priv.defs.inc
+++ b/src/etc/inc/priv.defs.inc
@@ -575,74 +575,74 @@ $priv_list['page-diagnostics-restart-httpd']['match'] = array();
 $priv_list['page-diagnostics-restart-httpd']['match'][] = "restart_httpd.php*";
 
 $priv_list['page-services-captiveportal'] = array();
-$priv_list['page-services-captiveportal']['name'] = gettext("WebCfg - Services: Captive portal");
-$priv_list['page-services-captiveportal']['descr'] = gettext("Allow access to the 'Services: Captive portal' page.");
+$priv_list['page-services-captiveportal']['name'] = gettext("WebCfg - Services: Captive Portal");
+$priv_list['page-services-captiveportal']['descr'] = gettext("Allow access to the 'Services: Captive Portal' page.");
 $priv_list['page-services-captiveportal']['match'] = array();
 $priv_list['page-services-captiveportal']['match'][] = "services_captiveportal.php*";
 
 $priv_list['page-services-captiveportal-filemanager'] = array();
-$priv_list['page-services-captiveportal-filemanager']['name'] = gettext("WebCfg - Services: Captive portal: File Manager");
-$priv_list['page-services-captiveportal-filemanager']['descr'] = gettext("Allow access to the 'Services: Captive portal: File Manager' page.");
+$priv_list['page-services-captiveportal-filemanager']['name'] = gettext("WebCfg - Services: Captive Portal: File Manager");
+$priv_list['page-services-captiveportal-filemanager']['descr'] = gettext("Allow access to the 'Services: Captive Portal: File Manager' page.");
 $priv_list['page-services-captiveportal-filemanager']['match'] = array();
 $priv_list['page-services-captiveportal-filemanager']['match'][] = "services_captiveportal_filemanager.php*";
 
 $priv_list['page-services-captiveportal-allowedhostnames'] = array();
-$priv_list['page-services-captiveportal-allowedhostnames']['name'] = gettext("WebCfg - Services: Captive portal: Allowed Hostnames");
-$priv_list['page-services-captiveportal-allowedhostnames']['descr'] = gettext("Allow access to the 'Services: Captive portal: Allowed Hostnames' page.");
+$priv_list['page-services-captiveportal-allowedhostnames']['name'] = gettext("WebCfg - Services: Captive Portal: Allowed Hostnames");
+$priv_list['page-services-captiveportal-allowedhostnames']['descr'] = gettext("Allow access to the 'Services: Captive Portal: Allowed Hostnames' page.");
 $priv_list['page-services-captiveportal-allowedhostnames']['match'] = array();
 $priv_list['page-services-captiveportal-allowedhostnames']['match'][] = "services_captiveportal_hostname.php*";
 
 $priv_list['page-services-captiveportal-editallowedhostnames'] = array();
-$priv_list['page-services-captiveportal-editallowedhostnames']['name'] = gettext("WebCfg - Services: Captive portal: Edit Allowed Hostnames");
-$priv_list['page-services-captiveportal-editallowedhostnames']['descr'] = gettext("Allow access to the 'Services: Captive portal: Edit Allowed Hostnames' page.");
+$priv_list['page-services-captiveportal-editallowedhostnames']['name'] = gettext("WebCfg - Services: Captive Portal: Edit Allowed Hostnames");
+$priv_list['page-services-captiveportal-editallowedhostnames']['descr'] = gettext("Allow access to the 'Services: Captive Portal: Edit Allowed Hostnames' page.");
 $priv_list['page-services-captiveportal-editallowedhostnames']['match'] = array();
 $priv_list['page-services-captiveportal-editallowedhostnames']['match'][] = "services_captiveportal_hostname_edit.php*";
 
 $priv_list['page-services-captiveportal-allowedips'] = array();
-$priv_list['page-services-captiveportal-allowedips']['name'] = gettext("WebCfg - Services: Captive portal: Allowed IPs");
-$priv_list['page-services-captiveportal-allowedips']['descr'] = gettext("Allow access to the 'Services: Captive portal: Allowed IPs' page.");
+$priv_list['page-services-captiveportal-allowedips']['name'] = gettext("WebCfg - Services: Captive Portal: Allowed IPs");
+$priv_list['page-services-captiveportal-allowedips']['descr'] = gettext("Allow access to the 'Services: Captive Portal: Allowed IPs' page.");
 $priv_list['page-services-captiveportal-allowedips']['match'] = array();
 $priv_list['page-services-captiveportal-allowedips']['match'][] = "services_captiveportal_ip.php*";
 
 $priv_list['page-services-captiveportal-editallowedips'] = array();
-$priv_list['page-services-captiveportal-editallowedips']['name'] = gettext("WebCfg - Services: Captive portal: Edit Allowed IPs");
-$priv_list['page-services-captiveportal-editallowedips']['descr'] = gettext("Allow access to the 'Services: Captive portal: Edit Allowed IPs' page.");
+$priv_list['page-services-captiveportal-editallowedips']['name'] = gettext("WebCfg - Services: Captive Portal: Edit Allowed IPs");
+$priv_list['page-services-captiveportal-editallowedips']['descr'] = gettext("Allow access to the 'Services: Captive Portal: Edit Allowed IPs' page.");
 $priv_list['page-services-captiveportal-editallowedips']['match'] = array();
 $priv_list['page-services-captiveportal-editallowedips']['match'][] = "services_captiveportal_ip_edit.php*";
 
 $priv_list['page-services-captiveportal-macaddresses'] = array();
-$priv_list['page-services-captiveportal-macaddresses']['name'] = gettext("WebCfg - Services: Captive portal: Mac Addresses");
-$priv_list['page-services-captiveportal-macaddresses']['descr'] = gettext("Allow access to the 'Services: Captive portal: Mac Addresses' page.");
+$priv_list['page-services-captiveportal-macaddresses']['name'] = gettext("WebCfg - Services: Captive Portal: Mac Addresses");
+$priv_list['page-services-captiveportal-macaddresses']['descr'] = gettext("Allow access to the 'Services: Captive Portal: Mac Addresses' page.");
 $priv_list['page-services-captiveportal-macaddresses']['match'] = array();
 $priv_list['page-services-captiveportal-macaddresses']['match'][] = "services_captiveportal_mac.php*";
 
 $priv_list['page-services-captiveportal-editmacaddresses'] = array();
-$priv_list['page-services-captiveportal-editmacaddresses']['name'] = gettext("WebCfg - Services: Captive portal: Edit MAC Addresses");
-$priv_list['page-services-captiveportal-editmacaddresses']['descr'] = gettext("Allow access to the 'Services: Captive portal: Edit MAC Addresses' page.");
+$priv_list['page-services-captiveportal-editmacaddresses']['name'] = gettext("WebCfg - Services: Captive Portal: Edit MAC Addresses");
+$priv_list['page-services-captiveportal-editmacaddresses']['descr'] = gettext("Allow access to the 'Services: Captive Portal: Edit MAC Addresses' page.");
 $priv_list['page-services-captiveportal-editmacaddresses']['match'] = array();
 $priv_list['page-services-captiveportal-editmacaddresses']['match'][] = "services_captiveportal_mac_edit.php*";
 
 $priv_list['page-services-captiveportal-vouchers'] = array();
-$priv_list['page-services-captiveportal-vouchers']['name'] = gettext("WebCfg - Services: Captive portal Vouchers");
-$priv_list['page-services-captiveportal-vouchers']['descr'] = gettext("Allow access to the 'Services: Captive portal Vouchers' page.");
+$priv_list['page-services-captiveportal-vouchers']['name'] = gettext("WebCfg - Services: Captive Portal Vouchers");
+$priv_list['page-services-captiveportal-vouchers']['descr'] = gettext("Allow access to the 'Services: Captive Portal Vouchers' page.");
 $priv_list['page-services-captiveportal-vouchers']['match'] = array();
 $priv_list['page-services-captiveportal-vouchers']['match'][] = "services_captiveportal_vouchers.php*";
 
 $priv_list['page-services-captiveportal-voucher-edit'] = array();
-$priv_list['page-services-captiveportal-voucher-edit']['name'] = gettext("WebCfg - Services: Captive portal Voucher Rolls");
-$priv_list['page-services-captiveportal-voucher-edit']['descr'] = gettext("Allow access to the 'Services: Captive portal Edit Voucher Rolls' page.");
+$priv_list['page-services-captiveportal-voucher-edit']['name'] = gettext("WebCfg - Services: Captive Portal Voucher Rolls");
+$priv_list['page-services-captiveportal-voucher-edit']['descr'] = gettext("Allow access to the 'Services: Captive Portal Edit Voucher Rolls' page.");
 $priv_list['page-services-captiveportal-voucher-edit']['match'] = array();
 $priv_list['page-services-captiveportal-voucher-edit']['match'][] = "services_captiveportal_vouchers_edit.php*";
 
 $priv_list['page-services-captiveportal-zones'] = array();
-$priv_list['page-services-captiveportal-zones']['name'] = gettext("WebCfg - Services: Captive portal Zones");
-$priv_list['page-services-captiveportal-zones']['descr'] = gettext("Allow access to the 'Services: Captive portal Zones' page.");
+$priv_list['page-services-captiveportal-zones']['name'] = gettext("WebCfg - Services: Captive Portal Zones");
+$priv_list['page-services-captiveportal-zones']['descr'] = gettext("Allow access to the 'Services: Captive Portal Zones' page.");
 $priv_list['page-services-captiveportal-zones']['match'] = array();
 $priv_list['page-services-captiveportal-zones']['match'][] = "services_captiveportal_zones.php*";
 
 $priv_list['page-services-captiveportal-editzones'] = array();
-$priv_list['page-services-captiveportal-editzones']['name'] = gettext("WebCfg - Services: Captive portal: Edit Zones");
-$priv_list['page-services-captiveportal-editzones']['descr'] = gettext("Allow access to the 'Services: Captive portal: Edit Zones' page.");
+$priv_list['page-services-captiveportal-editzones']['name'] = gettext("WebCfg - Services: Captive Portal: Edit Zones");
+$priv_list['page-services-captiveportal-editzones']['descr'] = gettext("Allow access to the 'Services: Captive Portal: Edit Zones' page.");
 $priv_list['page-services-captiveportal-editzones']['match'] = array();
 $priv_list['page-services-captiveportal-editzones']['match'][] = "services_captiveportal_zones_edit.php*";
 
@@ -677,8 +677,8 @@ $priv_list['page-services-dhcprelay']['match'] = array();
 $priv_list['page-services-dhcprelay']['match'][] = "services_dhcp_relay.php*";
 
 $priv_list['page-services-dhcpv6server'] = array();
-$priv_list['page-services-dhcpv6server']['name'] = gettext("WebCfg - Services: DHCPv6 server");
-$priv_list['page-services-dhcpv6server']['descr'] = gettext("Allow access to the 'Services: DHCPv6 server' page.");
+$priv_list['page-services-dhcpv6server']['name'] = gettext("WebCfg - Services: DHCPv6 Server");
+$priv_list['page-services-dhcpv6server']['descr'] = gettext("Allow access to the 'Services: DHCPv6 Server' page.");
 $priv_list['page-services-dhcpv6server']['match'] = array();
 $priv_list['page-services-dhcpv6server']['match'][] = "services_dhcpv6.php*";
 
@@ -845,8 +845,8 @@ $priv_list['page-hidden-detailedstatus']['match'] = array();
 $priv_list['page-hidden-detailedstatus']['match'][] = "status.php*";
 
 $priv_list['page-status-captiveportal'] = array();
-$priv_list['page-status-captiveportal']['name'] = gettext("WebCfg - Status: Captive portal");
-$priv_list['page-status-captiveportal']['descr'] = gettext("Allow access to the 'Status: Captive portal' page.");
+$priv_list['page-status-captiveportal']['name'] = gettext("WebCfg - Status: Captive Portal");
+$priv_list['page-status-captiveportal']['descr'] = gettext("Allow access to the 'Status: Captive Portal' page.");
 $priv_list['page-status-captiveportal']['match'] = array();
 $priv_list['page-status-captiveportal']['match'][] = "status_captiveportal.php*";
 
@@ -863,14 +863,14 @@ $priv_list['page-status-captiveportal-test']['match'] = array();
 $priv_list['page-status-captiveportal-test']['match'][] = "status_captiveportal_test.php*";
 
 $priv_list['page-status-captiveportal-voucher-rolls'] = array();
-$priv_list['page-status-captiveportal-voucher-rolls']['name'] = gettext("WebCfg - Status: Captive portal Voucher Rolls");
-$priv_list['page-status-captiveportal-voucher-rolls']['descr'] = gettext("Allow access to the 'Status: Captive portal Voucher Rolls' page.");
+$priv_list['page-status-captiveportal-voucher-rolls']['name'] = gettext("WebCfg - Status: Captive Portal Voucher Rolls");
+$priv_list['page-status-captiveportal-voucher-rolls']['descr'] = gettext("Allow access to the 'Status: Captive Portal Voucher Rolls' page.");
 $priv_list['page-status-captiveportal-voucher-rolls']['match'] = array();
 $priv_list['page-status-captiveportal-voucher-rolls']['match'][] = "status_captiveportal_voucher_rolls.php*";
 
 $priv_list['page-status-captiveportal-vouchers'] = array();
-$priv_list['page-status-captiveportal-vouchers']['name'] = gettext("WebCfg - Status: Captive portal Vouchers");
-$priv_list['page-status-captiveportal-vouchers']['descr'] = gettext("Allow access to the 'Status: Captive portal Vouchers' page.");
+$priv_list['page-status-captiveportal-vouchers']['name'] = gettext("WebCfg - Status: Captive Portal Vouchers");
+$priv_list['page-status-captiveportal-vouchers']['descr'] = gettext("Allow access to the 'Status: Captive Portal Vouchers' page.");
 $priv_list['page-status-captiveportal-vouchers']['match'] = array();
 $priv_list['page-status-captiveportal-vouchers']['match'][] = "status_captiveportal_vouchers.php*";
 
@@ -1022,8 +1022,8 @@ $priv_list['page-status-packagelogs']['match'] = array();
 $priv_list['page-status-packagelogs']['match'][] = "status_pkglogs.php*";
 
 $priv_list['page-status-trafficshaper-queues'] = array();
-$priv_list['page-status-trafficshaper-queues']['name'] = gettext("WebCfg - Status: Traffic shaper: Queues");
-$priv_list['page-status-trafficshaper-queues']['descr'] = gettext("Allow access to the 'Status: Traffic shaper: Queues' page.");
+$priv_list['page-status-trafficshaper-queues']['name'] = gettext("WebCfg - Status: Traffic Shaper: Queues");
+$priv_list['page-status-trafficshaper-queues']['descr'] = gettext("Allow access to the 'Status: Traffic Shaper: Queues' page.");
 $priv_list['page-status-trafficshaper-queues']['match'] = array();
 $priv_list['page-status-trafficshaper-queues']['match'][] = "status_queues.php*";
 
@@ -1136,8 +1136,8 @@ $priv_list['page-system-gateways-editgateway']['match'] = array();
 $priv_list['page-system-gateways-editgateway']['match'][] = "system_gateways_edit.php*";
 
 $priv_list['page-system-groupmanager'] = array();
-$priv_list['page-system-groupmanager']['name'] = gettext("WebCfg - System: Group manager");
-$priv_list['page-system-groupmanager']['descr'] = gettext("Allow access to the 'System: Group manager' page.");
+$priv_list['page-system-groupmanager']['name'] = gettext("WebCfg - System: Group Manager");
+$priv_list['page-system-groupmanager']['descr'] = gettext("Allow access to the 'System: Group Manager' page.");
 $priv_list['page-system-groupmanager']['match'] = array();
 $priv_list['page-system-groupmanager']['match'][] = "system_groupmanager.php*";
 
diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php
index 5b78c04..d78a0c2 100644
--- a/src/usr/local/www/services_captiveportal.php
+++ b/src/usr/local/www/services_captiveportal.php
@@ -57,8 +57,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal
-##|*NAME=Services: Captive portal
-##|*DESCR=Allow access to the 'Services: Captive portal' page.
+##|*NAME=Services: Captive Portal
+##|*DESCR=Allow access to the 'Services: Captive Portal' page.
 ##|*MATCH=services_captiveportal.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php
index c4febdd..027f760 100644
--- a/src/usr/local/www/services_captiveportal_filemanager.php
+++ b/src/usr/local/www/services_captiveportal_filemanager.php
@@ -59,8 +59,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-filemanager
-##|*NAME=Services: Captive portal: File Manager
-##|*DESCR=Allow access to the 'Services: Captive portal: File Manager' page.
+##|*NAME=Services: Captive Portal: File Manager
+##|*DESCR=Allow access to the 'Services: Captive Portal: File Manager' page.
 ##|*MATCH=services_captiveportal_filemanager.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php
index e349660..bfe4279 100644
--- a/src/usr/local/www/services_captiveportal_hostname.php
+++ b/src/usr/local/www/services_captiveportal_hostname.php
@@ -53,8 +53,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-allowedhostnames
-##|*NAME=Services: Captive portal: Allowed Hostnames
-##|*DESCR=Allow access to the 'Services: Captive portal: Allowed Hostnames' page.
+##|*NAME=Services: Captive Portal: Allowed Hostnames
+##|*DESCR=Allow access to the 'Services: Captive Portal: Allowed Hostnames' page.
 ##|*MATCH=services_captiveportal_hostname.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php
index 028fef2..3dbe419 100644
--- a/src/usr/local/www/services_captiveportal_hostname_edit.php
+++ b/src/usr/local/www/services_captiveportal_hostname_edit.php
@@ -53,8 +53,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-editallowedhostnames
-##|*NAME=Services: Captive portal: Edit Allowed Hostnames
-##|*DESCR=Allow access to the 'Services: Captive portal: Edit Allowed Hostnames' page.
+##|*NAME=Services: Captive Portal: Edit Allowed Hostnames
+##|*DESCR=Allow access to the 'Services: Captive Portal: Edit Allowed Hostnames' page.
 ##|*MATCH=services_captiveportal_hostname_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php
index f910af9..8fe8911 100644
--- a/src/usr/local/www/services_captiveportal_ip.php
+++ b/src/usr/local/www/services_captiveportal_ip.php
@@ -58,8 +58,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-allowedips
-##|*NAME=Services: Captive portal: Allowed IPs
-##|*DESCR=Allow access to the 'Services: Captive portal: Allowed IPs' page.
+##|*NAME=Services: Captive Portal: Allowed IPs
+##|*DESCR=Allow access to the 'Services: Captive Portal: Allowed IPs' page.
 ##|*MATCH=services_captiveportal_ip.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_ip_edit.php b/src/usr/local/www/services_captiveportal_ip_edit.php
index 50b3c27..c1508de 100644
--- a/src/usr/local/www/services_captiveportal_ip_edit.php
+++ b/src/usr/local/www/services_captiveportal_ip_edit.php
@@ -58,8 +58,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-editallowedips
-##|*NAME=Services: Captive portal: Edit Allowed IPs
-##|*DESCR=Allow access to the 'Services: Captive portal: Edit Allowed IPs' page.
+##|*NAME=Services: Captive Portal: Edit Allowed IPs
+##|*DESCR=Allow access to the 'Services: Captive Portal: Edit Allowed IPs' page.
 ##|*MATCH=services_captiveportal_ip_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php
index b29bbf6..1305f37 100644
--- a/src/usr/local/www/services_captiveportal_mac.php
+++ b/src/usr/local/www/services_captiveportal_mac.php
@@ -58,8 +58,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-macaddresses
-##|*NAME=Services: Captive portal: Mac Addresses
-##|*DESCR=Allow access to the 'Services: Captive portal: Mac Addresses' page.
+##|*NAME=Services: Captive Portal: Mac Addresses
+##|*DESCR=Allow access to the 'Services: Captive Portal: Mac Addresses' page.
 ##|*MATCH=services_captiveportal_mac.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php
index 73ed466..0261d23 100644
--- a/src/usr/local/www/services_captiveportal_mac_edit.php
+++ b/src/usr/local/www/services_captiveportal_mac_edit.php
@@ -58,8 +58,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-editmacaddresses
-##|*NAME=Services: Captive portal: Edit MAC Addresses
-##|*DESCR=Allow access to the 'Services: Captive portal: Edit MAC Addresses' page.
+##|*NAME=Services: Captive Portal: Edit MAC Addresses
+##|*DESCR=Allow access to the 'Services: Captive Portal: Edit MAC Addresses' page.
 ##|*MATCH=services_captiveportal_mac_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php
index c43d437..39568c4 100644
--- a/src/usr/local/www/services_captiveportal_vouchers.php
+++ b/src/usr/local/www/services_captiveportal_vouchers.php
@@ -54,8 +54,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-vouchers
-##|*NAME=Services: Captive portal Vouchers
-##|*DESCR=Allow access to the 'Services: Captive portal Vouchers' page.
+##|*NAME=Services: Captive Portal Vouchers
+##|*DESCR=Allow access to the 'Services: Captive Portal Vouchers' page.
 ##|*MATCH=services_captiveportal_vouchers.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_vouchers_edit.php b/src/usr/local/www/services_captiveportal_vouchers_edit.php
index 2593c89..029a520 100644
--- a/src/usr/local/www/services_captiveportal_vouchers_edit.php
+++ b/src/usr/local/www/services_captiveportal_vouchers_edit.php
@@ -54,8 +54,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-voucher-edit
-##|*NAME=Services: Captive portal Voucher Rolls
-##|*DESCR=Allow access to the 'Services: Captive portal Edit Voucher Rolls' page.
+##|*NAME=Services: Captive Portal Voucher Rolls
+##|*DESCR=Allow access to the 'Services: Captive Portal Edit Voucher Rolls' page.
 ##|*MATCH=services_captiveportal_vouchers_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_zones.php b/src/usr/local/www/services_captiveportal_zones.php
index 0951b40..61bc6b0 100644
--- a/src/usr/local/www/services_captiveportal_zones.php
+++ b/src/usr/local/www/services_captiveportal_zones.php
@@ -53,8 +53,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-zones
-##|*NAME=Services: Captive portal Zones
-##|*DESCR=Allow access to the 'Services: Captive portal Zones' page.
+##|*NAME=Services: Captive Portal Zones
+##|*DESCR=Allow access to the 'Services: Captive Portal Zones' page.
 ##|*MATCH=services_captiveportal_zones.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_captiveportal_zones_edit.php b/src/usr/local/www/services_captiveportal_zones_edit.php
index b5c0bfd..16e8d22 100644
--- a/src/usr/local/www/services_captiveportal_zones_edit.php
+++ b/src/usr/local/www/services_captiveportal_zones_edit.php
@@ -53,8 +53,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-captiveportal-editzones
-##|*NAME=Services: Captive portal: Edit Zones
-##|*DESCR=Allow access to the 'Services: Captive portal: Edit Zones' page.
+##|*NAME=Services: Captive Portal: Edit Zones
+##|*DESCR=Allow access to the 'Services: Captive Portal: Edit Zones' page.
 ##|*MATCH=services_captiveportal_zones_edit.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 2d29c99..7f5780e 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -58,8 +58,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-services-dhcpv6server
-##|*NAME=Services: DHCPv6 server
-##|*DESCR=Allow access to the 'Services: DHCPv6 server' page.
+##|*NAME=Services: DHCPv6 Server
+##|*DESCR=Allow access to the 'Services: DHCPv6 Server' page.
 ##|*MATCH=services_dhcpv6.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php
index 2bc6733..21eeefd 100644
--- a/src/usr/local/www/status_captiveportal.php
+++ b/src/usr/local/www/status_captiveportal.php
@@ -57,8 +57,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-status-captiveportal
-##|*NAME=Status: Captive portal
-##|*DESCR=Allow access to the 'Status: Captive portal' page.
+##|*NAME=Status: Captive Portal
+##|*DESCR=Allow access to the 'Status: Captive Portal' page.
 ##|*MATCH=status_captiveportal.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/status_captiveportal_voucher_rolls.php b/src/usr/local/www/status_captiveportal_voucher_rolls.php
index 0c4fa91..cb478e9 100644
--- a/src/usr/local/www/status_captiveportal_voucher_rolls.php
+++ b/src/usr/local/www/status_captiveportal_voucher_rolls.php
@@ -54,8 +54,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-status-captiveportal-voucher-rolls
-##|*NAME=Status: Captive portal Voucher Rolls
-##|*DESCR=Allow access to the 'Status: Captive portal Voucher Rolls' page.
+##|*NAME=Status: Captive Portal Voucher Rolls
+##|*DESCR=Allow access to the 'Status: Captive Portal Voucher Rolls' page.
 ##|*MATCH=status_captiveportal_voucher_rolls.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/status_captiveportal_vouchers.php b/src/usr/local/www/status_captiveportal_vouchers.php
index 5fe3845..1531df9 100644
--- a/src/usr/local/www/status_captiveportal_vouchers.php
+++ b/src/usr/local/www/status_captiveportal_vouchers.php
@@ -54,8 +54,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-status-captiveportal-vouchers
-##|*NAME=Status: Captive portal Vouchers
-##|*DESCR=Allow access to the 'Status: Captive portal Vouchers' page.
+##|*NAME=Status: Captive Portal Vouchers
+##|*DESCR=Allow access to the 'Status: Captive Portal Vouchers' page.
 ##|*MATCH=status_captiveportal_vouchers.php*
 ##|-PRIV
 
diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php
index f4081d5..e3442fe 100644
--- a/src/usr/local/www/status_queues.php
+++ b/src/usr/local/www/status_queues.php
@@ -53,8 +53,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-status-trafficshaper-queues
-##|*NAME=Status: Traffic shaper: Queues
-##|*DESCR=Allow access to the 'Status: Traffic shaper: Queues' page.
+##|*NAME=Status: Traffic Shaper: Queues
+##|*DESCR=Allow access to the 'Status: Traffic Shaper: Queues' page.
 ##|*MATCH=status_queues.php*
 ##|-PRIV
 /*
diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php
index 281044e..feb2e28 100644
--- a/src/usr/local/www/system_groupmanager.php
+++ b/src/usr/local/www/system_groupmanager.php
@@ -59,8 +59,8 @@
 
 ##|+PRIV
 ##|*IDENT=page-system-groupmanager
-##|*NAME=System: Group manager
-##|*DESCR=Allow access to the 'System: Group manager' page.
+##|*NAME=System: Group Manager
+##|*DESCR=Allow access to the 'System: Group Manager' page.
 ##|*MATCH=system_groupmanager.php*
 ##|-PRIV