Index: sources/storage/StorageGlobals.h
===================================================================
diff -u -rd9b9df9b23da89b4c27f4672ff6e7f570adcc48a -r472c10e72a8d278f13d2343f9c81c1def14490ff
--- sources/storage/StorageGlobals.h	(.../StorageGlobals.h)	(revision d9b9df9b23da89b4c27f4672ff6e7f570adcc48a)
+++ sources/storage/StorageGlobals.h	(.../StorageGlobals.h)	(revision 472c10e72a8d278f13d2343f9c81c1def14490ff)
@@ -97,15 +97,15 @@
 
     // WiFi
     extern const char *Wifi_Scripts_Dir;
-    extern const char *Wifi_Disconnect_Network;
+    extern const char *Scripts_Wifi_Disconnect;
     extern const char *Wifi_Generate_WPA_Supplicant;
     extern const char *Wifi_Read_DNS;
     extern const char *Wifi_Read_Gateway;
     extern const char *Wifi_Read_IP_Settings;
     extern const char *Wifi_Get_Auto_Assigned_IP;
     extern const char *Wifi_Reset_Adapter;
     extern const char *Wifi_Reset_Interface;
-    extern const char *Wifi_Scan_For_Networks;
+    extern const char *Scripts_Wifi_Scan;
     extern const char *Wifi_Set_Auto_Assigned_IP;
     extern const char *Wifi_Set_DNS;
     extern const char *Wifi_Set_Static_IP;
@@ -115,11 +115,10 @@
     extern const char *Wifi_Read_Network_Info;
 
     // Brightness
-    extern const char *Brightness_Set;
-    extern const char *Brightness_Get;
+    extern const char *Scripts_Brightness;
 
     // RootSSHAccess
-    extern const char *RootSSHAccess;
+    extern const char *Scripts_Ssh_Access;
 
     // Bluetooth
     extern const char *Bluetooth_Paired_Reset;
@@ -129,18 +128,18 @@
     extern const char *Crypt_Setup;
 
     // Factory Reset
-    extern const char *Factory_Reset;
+    extern const char *Scripts_Factory_Reset;
 
     // Device Decommissioning
-    extern const char *Device_Decommission;
+    extern const char *Scripts_Device_Decommission;
 
     // Device Lockdown
-    extern const char *Device_Lockdown;
+    extern const char *Scripts_Device_Lockdown;
 
     extern const char *CloudSyncPath;
 
     // USB mount/unmount
-    extern const char *USB_Unmount;
-    extern const char *USB_Mount;
+    extern const char *Scripts_USB_Unmount;
+    extern const char *Scripts_USB_Mount;
 
 }