diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php
index e811e4eca6..f7b92e24ae 100644
--- a/src/usr/local/www/status.php
+++ b/src/usr/local/www/status.php
@@ -84 +84 @@ if (function_exists("system_get_thothid") &&
-		status_cmd_define("Product-Public Key", "/usr/local/sbin/ping-auth -p");
+		status_cmd_define("Product-Public-Key", "/usr/local/sbin/ping-auth -p");
@@ -90,3 +90,3 @@ status_cmd_define("Network-Interfaces", "/sbin/ifconfig -vvvvvam");
-status_cmd_define("Network-Interface Statistics", "/usr/bin/netstat -nWi");
-status_cmd_define("Network-Multicast Groups", "/usr/sbin/ifmcstat");
-status_cmd_define("Process-Top Usage", "/usr/bin/top | /usr/bin/head -n5");
+status_cmd_define("Network-Interface-Statistics", "/usr/bin/netstat -nWi");
+status_cmd_define("Network-Multicast-Groups", "/usr/sbin/ifmcstat");
+status_cmd_define("Process-Top-Usage", "/usr/bin/top | /usr/bin/head -n5");
@@ -94,12 +94,12 @@ status_cmd_define("Process-List", "/bin/ps xauwwd");
-status_cmd_define("Disk-Mounted Filesystems", "/sbin/mount");
-status_cmd_define("Disk-Free Space", "/bin/df -hi");
-status_cmd_define("Network-Routing tables", "/usr/bin/netstat -nWr");
-status_cmd_define("Network-IPv4 Nexthop Data", "/usr/bin/netstat -4onW");
-status_cmd_define("Network-IPv6 Nexthop Data", "/usr/bin/netstat -6onW");
-status_cmd_define("Network-IPv4 Nexthop Group Data", "/usr/bin/netstat -4OnW");
-status_cmd_define("Network-IPv6 Nexthop Group Data", "/usr/bin/netstat -6OnW");
-status_cmd_define("Network-Gateway Status", 'status_get_gateway_status', "php_func");
-status_cmd_define("Network-Mbuf Usage", "/usr/bin/netstat -mb");
-status_cmd_define("Network-Protocol Statistics", "/usr/bin/netstat -s");
-status_cmd_define("Network-Buffer and Timer Statistics", "/usr/bin/netstat -nWx");
-status_cmd_define("Network-Listen Queues", "/usr/bin/netstat -LaAn");
+status_cmd_define("Disk-Mounted-Filesystems", "/sbin/mount");
+status_cmd_define("Disk-Free-Space", "/bin/df -hi");
+status_cmd_define("Network-Routing-tables", "/usr/bin/netstat -nWr");
+status_cmd_define("Network-IPv4-Nexthop-Data", "/usr/bin/netstat -4onW");
+status_cmd_define("Network-IPv6-Nexthop-Data", "/usr/bin/netstat -6onW");
+status_cmd_define("Network-IPv4-Nexthop-Group-Data", "/usr/bin/netstat -4OnW");
+status_cmd_define("Network-IPv6-Nexthop-Group-Data", "/usr/bin/netstat -6OnW");
+status_cmd_define("Network-Gateway-Status", 'status_get_gateway_status', "php_func");
+status_cmd_define("Network-Mbuf-Usage", "/usr/bin/netstat -mb");
+status_cmd_define("Network-Protocol-Statistics", "/usr/bin/netstat -s");
+status_cmd_define("Network-Buffer-and-Timer-Statistics", "/usr/bin/netstat -nWx");
+status_cmd_define("Network-Listen-Queues", "/usr/bin/netstat -LaAn");
@@ -107,4 +107,4 @@ status_cmd_define("Network-Sockets", "/usr/bin/sockstat");
-status_cmd_define("Network-ARP Table", "/usr/sbin/arp -an");
-status_cmd_define("Network-NDP Table", "/usr/sbin/ndp -na");
-status_cmd_define("OS-Kernel Modules", "/sbin/kldstat -v");
-status_cmd_define("OS-Kernel VMStat", "/usr/bin/vmstat -afimsz");
+status_cmd_define("Network-ARP-Table", "/usr/sbin/arp -an");
+status_cmd_define("Network-NDP-Table", "/usr/sbin/ndp -na");
+status_cmd_define("OS-Kernel-Modules", "/sbin/kldstat -v");
+status_cmd_define("OS-Kernel-VMStat", "/usr/bin/vmstat -afimsz");
@@ -114 +114 @@ if (file_exists("/dev/etherswitch0")) {
-	status_cmd_define("Network-Switch Configuration", "/sbin/etherswitchcfg -f /dev/etherswitch0 info");
+	status_cmd_define("Network-Switch-Configuration", "/sbin/etherswitchcfg -f /dev/etherswitch0 info");
@@ -118,3 +118,3 @@ if (file_exists("/dev/etherswitch0")) {
-status_cmd_define("Firewall-Generated Ruleset", "/bin/cat " . g_get('tmp_path') . "/rules.debug");
-status_cmd_define("Firewall-Generated Ruleset Limiters", "/bin/cat " . g_get('tmp_path') . "/rules.limiter");
-status_cmd_define("Firewall-Generated Ruleset Limits", "/bin/cat " . g_get('tmp_path') . "/rules.limits");
+status_cmd_define("Firewall-Generated-Ruleset", "/bin/cat " . g_get('tmp_path') . "/rules.debug");
+status_cmd_define("Firewall-Generated-Ruleset-Limiters", "/bin/cat " . g_get('tmp_path') . "/rules.limiter");
+status_cmd_define("Firewall-Generated-Ruleset-Limits", "/bin/cat " . g_get('tmp_path') . "/rules.limits");
@@ -123 +123 @@ foreach (glob(g_get('tmp_path') . "/rules.packages.*") as $pkgrules) {
-	status_cmd_define("Firewall-Generated Package Invalid Ruleset {$pkgname}", "/bin/cat " . escapeshellarg($pkgrules));
+	status_cmd_define("Firewall-Generated-Package-Invalid-Ruleset-{$pkgname}", "/bin/cat " . escapeshellarg($pkgrules));
@@ -134 +134 @@ foreach ($ovpnradrules as $ovpns => $genrules) {
-	status_cmd_define("OpenVPN-Generated RADIUS ACL Ruleset for server{$ovpns}",
+	status_cmd_define("OpenVPN-Generated-RADIUS-ACL-Ruleset-for-server{$ovpns}",
@@ -137,16 +137,16 @@ foreach ($ovpnradrules as $ovpns => $genrules) {
-status_cmd_define("Firewall-pf NAT Rules", "/sbin/pfctl -vvsn");
-status_cmd_define("Firewall-pf Firewall Rules", "/sbin/pfctl -vvsr");
-status_cmd_define("Firewall-pf Tables", "/sbin/pfctl -vs Tables");
-status_cmd_define("Firewall-pf State Table Contents", "/sbin/pfctl -vvss");
-status_cmd_define("Firewall-pf Info", "/sbin/pfctl -si");
-status_cmd_define("Firewall-pf Show All", "/sbin/pfctl -sa");
-status_cmd_define("Firewall-pf Queues", "/sbin/pfctl -s queue -v");
-status_cmd_define("Firewall-pf OSFP", "/sbin/pfctl -s osfp");
-status_cmd_define("Firewall-pftop Default", "/usr/local/sbin/pftop -a -b");
-status_cmd_define("Firewall-pftop Long", "/usr/local/sbin/pftop -w 150 -a -b -v long");
-status_cmd_define("Firewall-pftop Queue", "/usr/local/sbin/pftop -w 150 -a -b -v queue");
-status_cmd_define("Firewall-pftop Rules", "/usr/local/sbin/pftop -w 150 -a -b -v rules");
-status_cmd_define("Firewall-pftop Size", "/usr/local/sbin/pftop -w 150 -a -b -v size");
-status_cmd_define("Firewall-pftop Speed", "/usr/local/sbin/pftop -w 150 -a -b -v speed");
-status_cmd_define("Firewall-Limiter Info", "/sbin/dnctl pipe show");
-status_cmd_define("Firewall-Queue Info", "/sbin/dnctl queue show");
+status_cmd_define("Firewall-pf-NAT-Rules", "/sbin/pfctl -vvsn");
+status_cmd_define("Firewall-pf-Firewall-Rules", "/sbin/pfctl -vvsr");
+status_cmd_define("Firewall-pf-Tables", "/sbin/pfctl -vs Tables");
+status_cmd_define("Firewall-pf-State-Table-Contents", "/sbin/pfctl -vvss");
+status_cmd_define("Firewall-pf-Info", "/sbin/pfctl -si");
+status_cmd_define("Firewall-pf-Show-All", "/sbin/pfctl -sa");
+status_cmd_define("Firewall-pf-Queues", "/sbin/pfctl -s queue -v");
+status_cmd_define("Firewall-pf-OSFP", "/sbin/pfctl -s osfp");
+status_cmd_define("Firewall-pftop-Default", "/usr/local/sbin/pftop -a -b");
+status_cmd_define("Firewall-pftop-Long", "/usr/local/sbin/pftop -w 150 -a -b -v long");
+status_cmd_define("Firewall-pftop-Queue", "/usr/local/sbin/pftop -w 150 -a -b -v queue");
+status_cmd_define("Firewall-pftop-Rules", "/usr/local/sbin/pftop -w 150 -a -b -v rules");
+status_cmd_define("Firewall-pftop-Size", "/usr/local/sbin/pftop -w 150 -a -b -v size");
+status_cmd_define("Firewall-pftop-Speed", "/usr/local/sbin/pftop -w 150 -a -b -v speed");
+status_cmd_define("Firewall-Limiter-Info", "/sbin/dnctl pipe show");
+status_cmd_define("Firewall-Queue-Info", "/sbin/dnctl queue show");
@@ -155,2 +155,2 @@ status_cmd_define("Firewall-Queue Info", "/sbin/dnctl queue show");
-status_cmd_define("Disk-Contents of var run", "/bin/ls /var/run");
-status_cmd_define("Disk-Contents of conf", "/bin/ls /conf");
+status_cmd_define("Disk-Contents-of-var-run", "/bin/ls /var/run");
+status_cmd_define("Disk-Contents-of-conf", "/bin/ls /conf");
@@ -158,6 +158,6 @@ status_cmd_define("config.xml", "dumpconfigxml");
-status_cmd_define("DNS-Resolution Configuration", "/bin/cat /etc/resolv.conf");
-status_cmd_define("DNS-Resolver Access Lists", "/bin/cat /var/unbound/access_lists.conf");
-status_cmd_define("DNS-Resolver Configuration", "/bin/cat /var/unbound/unbound.conf");
-status_cmd_define("DNS-Resolver Domain Overrides", "/bin/cat /var/unbound/domainoverrides.conf");
-status_cmd_define("DNS-Resolver Host Overrides", "/bin/cat /var/unbound/host_entries.conf");
-status_cmd_define("DHCP-IPv4 Configuration", '/usr/bin/sed "s/\([[:blank:]]secret \).*/\1<redacted>/" /var/dhcpd/etc/dhcpd.conf');
+status_cmd_define("DNS-Resolution-Configuration", "/bin/cat /etc/resolv.conf");
+status_cmd_define("DNS-Resolver-Access-Lists", "/bin/cat /var/unbound/access_lists.conf");
+status_cmd_define("DNS-Resolver-Configuration", "/bin/cat /var/unbound/unbound.conf");
+status_cmd_define("DNS-Resolver-Domain-Overrides", "/bin/cat /var/unbound/domainoverrides.conf");
+status_cmd_define("DNS-Resolver-Host-Overrides", "/bin/cat /var/unbound/host_entries.conf");
+status_cmd_define("DHCP-IPv4-Configuration", '/usr/bin/sed "s/\([[:blank:]]secret \).*/\1<redacted>/" /var/dhcpd/etc/dhcpd.conf');
@@ -165 +165 @@ status_cmd_define("DHCP-IPv6-Configuration", '/usr/bin/sed "s/\([[:blank:]]secre
-status_cmd_define("IPsec-strongSwan Configuration", '/usr/bin/sed "s/\([[:blank:]]secret = \).*/\1<redacted>/" /var/etc/ipsec/strongswan.conf');
+status_cmd_define("IPsec-strongSwan-Configuration", '/usr/bin/sed "s/\([[:blank:]]secret = \).*/\1<redacted>/" /var/etc/ipsec/strongswan.conf');
@@ -169 +169 @@ status_cmd_define("IPsec-Status-Connections", "/usr/local/sbin/swanctl --list-co
-status_cmd_define("IPsec-Status-Active SAs", "/usr/local/sbin/swanctl --list-sas");
+status_cmd_define("IPsec-Status-Active-SAs", "/usr/local/sbin/swanctl --list-sas");
@@ -176 +176 @@ if (file_exists("/cf/conf/upgrade_log.txt")) {
-	status_cmd_define("OS-Upgrade Log", "/bin/cat /cf/conf/upgrade_log.txt");
+	status_cmd_define("OS-Upgrade-Log", "/bin/cat /cf/conf/upgrade_log.txt");
@@ -179 +179 @@ if (file_exists("/cf/conf/upgrade_log.latest.txt")) {
-	status_cmd_define("OS-Upgrade Log Latest", "/bin/cat /cf/conf/upgrade_log.latest.txt");
+	status_cmd_define("OS-Upgrade-Log-Latest", "/bin/cat /cf/conf/upgrade_log.latest.txt");
@@ -182 +182 @@ if (file_exists("/boot/loader.conf")) {
-	status_cmd_define("OS-Boot Loader Configuration", "/bin/cat /boot/loader.conf");
+	status_cmd_define("OS-Boot-Loader-Configuration", "/bin/cat /boot/loader.conf");
@@ -185 +185 @@ if (file_exists("/boot/loader.conf.local")) {
-	status_cmd_define("OS-Boot Loader Configuration (Local)", "/bin/cat /boot/loader.conf.local");
+	status_cmd_define("OS-Boot-Loader-Configuration-(Local)", "/bin/cat /boot/loader.conf.local");
@@ -188 +188 @@ if (file_exists("/var/etc/filterdns.conf")) {
-	status_cmd_define("DNS-filterdns Daemon Configuration", "/bin/cat /var/etc/filterdns.conf");
+	status_cmd_define("DNS-filterdns-Daemon-Configuration", "/bin/cat /var/etc/filterdns.conf");
@@ -213 +213 @@ if (count($confvers) != 0) {
-	status_cmd_define("Config History", "echo " . escapeshellarg($conf_history));
+	status_cmd_define("Config-History", "echo " . escapeshellarg($conf_history));
@@ -224 +224 @@ status_log_add("OpenVPN", '/var/log/openvpn.log');
-status_log_add("Captive Portal Authentication", '/var/log/portalauth.log');
+status_log_add("Captive-Portal-Authentication", '/var/log/portalauth.log');
@@ -226 +226 @@ status_log_add("PPP", '/var/log/ppp.log');
-status_log_add("PPPoE Server", '/var/log/poes.log');
+status_log_add("PPPoE-Server", '/var/log/poes.log');
@@ -230 +230 @@ status_log_add("Wireless", '/var/log/wireless.log');
-status_log_add("PHP Errors", '/tmp/PHP_errors.log', 'all');
+status_log_add("PHP-Errors", '/tmp/PHP_errors.log', 'all');
@@ -232,2 +232,2 @@ status_log_add("PHP Errors", '/tmp/PHP_errors.log', 'all');
-status_cmd_define("OS-Message Buffer", "/sbin/dmesg -a");
-status_cmd_define("OS-Message Buffer (Boot)", "/bin/cat /var/log/dmesg.boot");
+status_cmd_define("OS-Message-Buffer", "/sbin/dmesg -a");
+status_cmd_define("OS-Message-Buffer-(Boot)", "/bin/cat /var/log/dmesg.boot");
@@ -236,7 +236,7 @@ status_cmd_define("OS-Message Buffer (Boot)", "/bin/cat /var/log/dmesg.boot");
-status_cmd_define("OS-sysctl values", "/sbin/sysctl -aq");
-status_cmd_define("OS-Kernel Environment", "/bin/kenv");
-status_cmd_define("OS-Kernel Memory Usage", "/usr/local/sbin/kmemusage.sh");
-status_cmd_define("OS-Installed Packages", "/usr/local/sbin/pkg-static info");
-status_cmd_define("OS-Package Manager Configuration", "/usr/local/sbin/pkg-static -vv");
-status_cmd_define("Hardware-PCI Devices", "/usr/sbin/pciconf -lvb");
-status_cmd_define("Hardware-USB Devices", "/usr/sbin/usbconfig dump_device_desc");
+status_cmd_define("OS-sysctl-values", "/sbin/sysctl -aq");
+status_cmd_define("OS-Kernel-Environment", "/bin/kenv");
+status_cmd_define("OS-Kernel-Memory-Usage", "/usr/local/sbin/kmemusage.sh");
+status_cmd_define("OS-Installed-Packages", "/usr/local/sbin/pkg-static info");
+status_cmd_define("OS-Package-Manager-Configuration", "/usr/local/sbin/pkg-static -vv");
+status_cmd_define("Hardware-PCI-Devices", "/usr/sbin/pciconf -lvb");
+status_cmd_define("Hardware-USB-Devices", "/usr/sbin/usbconfig dump_device_desc");
@@ -244,2 +244,2 @@ status_cmd_define("Hardware-USB Devices", "/usr/sbin/usbconfig dump_device_desc"
-status_cmd_define("Disk-Filesystem Table", "/bin/cat /etc/fstab");
-status_cmd_define("Disk-Swap Information", "/usr/sbin/swapinfo");
+status_cmd_define("Disk-Filesystem-Table", "/bin/cat /etc/fstab");
+status_cmd_define("Disk-Swap-Information", "/usr/sbin/swapinfo");
@@ -248,4 +248,4 @@ if (is_module_loaded("zfs.ko")) {
-	status_cmd_define("Disk-ZFS List", "/sbin/zfs list");
-	status_cmd_define("Disk-ZFS Properties", "/sbin/zfs get all");
-	status_cmd_define("Disk-ZFS Pool List", "/sbin/zpool list");
-	status_cmd_define("Disk-ZFS Pool Status", "/sbin/zpool status");
+	status_cmd_define("Disk-ZFS-List", "/sbin/zfs list");
+	status_cmd_define("Disk-ZFS-Properties", "/sbin/zfs get all");
+	status_cmd_define("Disk-ZFS-Pool-List", "/sbin/zpool list");
+	status_cmd_define("Disk-ZFS-Pool-Status", "/sbin/zpool status");
@@ -254,7 +254,7 @@ if (is_module_loaded("zfs.ko")) {
-status_cmd_define("Disk-GEOM Tree", "/sbin/geom -t");
-status_cmd_define("Disk-GEOM Disk List", "/sbin/geom disk list -a");
-status_cmd_define("Disk-GEOM Partition Summary", "/sbin/geom part show -p");
-status_cmd_define("Disk-GEOM Partition Details", "/sbin/geom part list");
-status_cmd_define("Disk-GEOM Label Status", "/sbin/geom label status");
-status_cmd_define("Disk-GEOM Label Details", "/sbin/geom label list");
-status_cmd_define("Disk-GEOM Mirror Status", "/sbin/gmirror status");
+status_cmd_define("Disk-GEOM-Tree", "/sbin/geom -t");
+status_cmd_define("Disk-GEOM-Disk-List", "/sbin/geom disk list -a");
+status_cmd_define("Disk-GEOM-Partition-Summary", "/sbin/geom part show -p");
+status_cmd_define("Disk-GEOM-Partition-Details", "/sbin/geom part list");
+status_cmd_define("Disk-GEOM-Label-Status", "/sbin/geom label status");
+status_cmd_define("Disk-GEOM-Label-Details", "/sbin/geom label list");
+status_cmd_define("Disk-GEOM-Mirror-Status", "/sbin/gmirror status");
