Index: sources/device/DeviceGlobals.h
===================================================================
diff -u -r25c40729f182b567f22e01a4c6f3eda7ccaac04d -ra2a273600d25e863214833ead3324a63fb4759f1
--- sources/device/DeviceGlobals.h	(.../DeviceGlobals.h)	(revision 25c40729f182b567f22e01a4c6f3eda7ccaac04d)
+++ sources/device/DeviceGlobals.h	(.../DeviceGlobals.h)	(revision a2a273600d25e863214833ead3324a63fb4759f1)
@@ -205,7 +205,7 @@
     DEVICE_DEV_PARENT           ( USBMount                                                                      )   \
     DEVICE_DEV_PARENT           ( WifiList                                                                      )   \
     DEVICE_DEV_PARENT           ( WifiInfo                                                                      )   \
-    DEVICE_DEV_PARENT           ( ConnectWifi                                                                   )   \
+    DEVICE_DEV_PARENT           ( WifiConnect                                                                   )   \
 
 /*
     DEVICE_DEV_PARENT           ( BluetoothPairedReset                                                          )   \
@@ -222,7 +222,7 @@
     DEVICE_DEV_INIT_CONNECTIONS ( USBMount                                                                      )   \
     DEVICE_DEV_INIT_CONNECTIONS ( WifiList                                                                      )   \
     DEVICE_DEV_INIT_CONNECTIONS ( WifiInfo                                                                      )   \
-    DEVICE_DEV_INIT_CONNECTIONS ( ConnectWifi                                                                   )   \
+    DEVICE_DEV_INIT_CONNECTIONS ( WifiConnect                                                                   )   \
 /*
     DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedReset                                                          )   \
     DEVICE_DEV_INIT_CONNECTIONS ( BluetoothPairedQuery                                                          )   \
@@ -238,7 +238,7 @@
     DEVICE_DEV_DEFINITION       ( USBMount                                                                      )   \
     DEVICE_DEV_DEFINITION       ( WifiList                                                                      )   \
     DEVICE_DEV_DEFINITION       ( WifiInfo                                                                      )   \
-    DEVICE_DEV_DEFINITION       ( ConnectWifi                                                                   )   \
+    DEVICE_DEV_DEFINITION       ( WifiConnect                                                                   )   \
 /*
     DEVICE_DEV_DEFINITION       ( BluetoothPairedReset                                                          )   \
     DEVICE_DEV_DEFINITION       ( BluetoothPairedQuery                                                          )   \
@@ -254,7 +254,7 @@
     DEVICE_DEV_DECLARATION      ( USBMount                                                                      )   \
     DEVICE_DEV_DECLARATION      ( WifiList                                                                      )   \
     DEVICE_DEV_DECLARATION      ( WifiInfo                                                                      )   \
-    DEVICE_DEV_DECLARATION      ( ConnectWifi                                                                   )   \
+    DEVICE_DEV_DECLARATION      ( WifiConnect                                                                   )   \
 /*
     DEVICE_DEV_DECLARATION      ( BluetoothPairedReset                                                          )   \
     DEVICE_DEV_DECLARATION      ( BluetoothPairedQuery                                                          )   \
@@ -271,7 +271,7 @@
     DEVICE_APP_INIT_CONNECTIONS ( Brightness                                                                    )   \
     DEVICE_APP_INIT_CONNECTIONS ( WifiList                                                                      )   \
     DEVICE_APP_INIT_CONNECTIONS ( WifiInfo                                                                      )   \
-    DEVICE_APP_INIT_CONNECTIONS ( ConnectWifi                                                                   )   \
+    DEVICE_APP_INIT_CONNECTIONS ( WifiConnect                                                                   )   \
 /*
     DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedReset                                                          )   \
     DEVICE_APP_INIT_CONNECTIONS ( BluetoothPairedQuery                                                          )   \
@@ -286,7 +286,7 @@
     DEVICE_APP_BRIDGE_DEFINITION( USBMount                                                                      )   \
     DEVICE_APP_BRIDGE_DEFINITION( WifiList                                                                      )   \
     DEVICE_APP_BRIDGE_DEFINITION( WifiInfo                                                                      )   \
-    DEVICE_APP_BRIDGE_DEFINITION( ConnectWifi                                                                   )   \
+    DEVICE_APP_BRIDGE_DEFINITION( WifiConnect                                                                   )   \
 /*
     DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedReset                                                          )   \
     DEVICE_APP_BRIDGE_DEFINITION( BluetoothPairedQuery                                                          )   \
@@ -303,7 +303,7 @@
     DEVICE_GUI_INIT_CONNECTIONS ( Brightness                                                                    )   \
     DEVICE_GUI_INIT_CONNECTIONS ( WifiList                                                                      )   \
     DEVICE_GUI_INIT_CONNECTIONS ( WifiInfo                                                                      )   \
-    DEVICE_GUI_INIT_CONNECTIONS ( ConnectWifi                                                                   )   \
+    DEVICE_GUI_INIT_CONNECTIONS ( WifiConnect                                                                   )   \
 /*
     DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedReset                                                          )   \
     DEVICE_GUI_INIT_CONNECTIONS ( BluetoothPairedQuery                                                          )   \
@@ -317,7 +317,7 @@
     DEVICE_GUI_BRIDGE_DEFINITION( Brightness                                                                    )   \
     DEVICE_GUI_BRIDGE_DEFINITION( WifiList                                                                      )   \
     DEVICE_GUI_BRIDGE_DEFINITION( WifiInfo                                                                      )   \
-    DEVICE_GUI_BRIDGE_DEFINITION( ConnectWifi                                                                   )   \
+    DEVICE_GUI_BRIDGE_DEFINITION( WifiConnect                                                                   )   \
 /*
     DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedReset                                                          )   \
     DEVICE_GUI_BRIDGE_DEFINITION( BluetoothPairedQuery                                                          )   \
@@ -334,7 +334,7 @@
     DEVICE_VIEW_INIT_CONNECTIONS( Brightness                                                                    )   \
     DEVICE_VIEW_INIT_CONNECTIONS( WifiList                                                                      )   \
     DEVICE_VIEW_INIT_CONNECTIONS( WifiInfo                                                                      )   \
-    DEVICE_VIEW_INIT_CONNECTIONS( ConnectWifi                                                                   )   \
+    DEVICE_VIEW_INIT_CONNECTIONS( WifiConnect                                                                   )   \
 /*
     DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedReset                                                          )   \
     DEVICE_VIEW_INIT_CONNECTIONS( BluetoothPairedQuery                                                          )   \