Index: sources/device/DeviceController.cpp
===================================================================
diff -u -rf0c8b8720a2e314268445a4a20fe701292026f6f -ra2a273600d25e863214833ead3324a63fb4759f1
--- sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision f0c8b8720a2e314268445a4a20fe701292026f6f)
+++ sources/device/DeviceController.cpp	(.../DeviceController.cpp)	(revision a2a273600d25e863214833ead3324a63fb4759f1)
@@ -1078,32 +1078,32 @@
 }
 
 
-//////////////////////////////////////////////////////////////////////////////////////////////////   DeviceConnectWifi
-void DeviceController::onAttributeRequest(const DeviceConnectWifiRequestData &vData)
+//////////////////////////////////////////////////////////////////////////////////////////////////   DeviceWifiConnect
+void DeviceController::onAttributeRequest(const DeviceWifiConnectRequestData &vData)
 {
-    connectWifiRequest(vData);
+    wifiConnectRequest(vData);
 }
 
 /*!
- * \brief   DeviceController::connectWifiRequest
+ * \brief   DeviceController::wifiConnectRequest
  * \details Calls the Wifi connect/ disconnect script
  * \note    This function is created to be able to call independently if needed in this class.
  */
-void DeviceController::connectWifiRequest(const DeviceConnectWifiRequestData &vData)
+void DeviceController::wifiConnectRequest(const DeviceWifiConnectRequestData &vData)
 {
     DeviceError::Scripts_Error_Enum error = DeviceError::eDevice_OK;
 
     // ----- initializing the member variable models
-    _deviceConnectWifiRequest._data = vData;
+    _deviceWifiConnectRequest._data = vData;
 
     // ----- check that script exists.
     QString script;
-    if ( checkError( DeviceError::checkScript(script, (vData.mConnect ? Scripts_Wifi_Connect : Scripts_Wifi_Disconnect )), _deviceConnectWifiResponse, script) )
+    if ( checkError( DeviceError::checkScript(script, (vData.mConnect ? Scripts_Wifi_Connect : Scripts_Wifi_Disconnect )), _deviceWifiConnectResponse, script) )
         return;
 
     // ----- check if the process is not running
-    if ( _processConnectWifi.state() != QProcess::NotRunning  ) {
-        checkError(DeviceError::eDevice_Scripts_Error_IsRunning, _deviceConnectWifiResponse);
+    if ( _processWifiConnect.state() != QProcess::NotRunning  ) {
+        checkError(DeviceError::eDevice_Scripts_Error_IsRunning, _deviceWifiConnectResponse);
         return;
     }
 
@@ -1114,42 +1114,42 @@
     }
 
     if ( error ) {
-        checkError(error, _deviceConnectWifiResponse);
+        checkError(error, _deviceWifiConnectResponse);
         return;
     }
 
     // ----- run the process
     int timeout_ms = 10000;
-    TimedProcess *timedProcess = new TimedProcess(&_processConnectWifi, script, timeout_ms, params);
+    TimedProcess *timedProcess = new TimedProcess(&_processWifiConnect, script, timeout_ms, params);
     timedProcess->start();
 
-    MDeviceConnectWifiResponse model;
+    MDeviceWifiConnectResponse model;
     model._data.mConnect  = vData.mConnect;
     model._data.mAccepted  = false;
     model._data.mMessage   = vData.mConnect ? tr("Connecting to Wifi.") : tr("Disconnecting to Wifi.");
     emit didAttributeResponse(model.data());
 }
 
 /*!
- * \brief DeviceController::processConnectWifiResponse
+ * \brief DeviceController::processWifiConnectResponse
  * \param vExitCode
  * \param vStatus
  */
-void DeviceController::processConnectWifiResponse(int vExitCode, QProcess::ExitStatus vStatus, QProcess::ProcessChannel vChannel)
+void DeviceController::processWifiConnectResponse(int vExitCode, QProcess::ExitStatus vStatus, QProcess::ProcessChannel vChannel)
 {
     Q_UNUSED(vStatus    )
     Q_UNUSED(vChannel   )
-    static MDeviceConnectWifiResponse model;
+    static MDeviceWifiConnectResponse model;
 
     if ( vExitCode < 0 ) {
         emit didAttributeResponse(model.data());
         switch (vChannel) {
-            case QProcess::StandardOutput : processConnectWifiReadyOut(model); break;
-            case QProcess::StandardError  : processConnectWifiReadyErr(model); break;
+            case QProcess::StandardOutput : processWifiConnectReadyOut(model); break;
+            case QProcess::StandardError  : processWifiConnectReadyErr(model); break;
         }
     }
     else {
-        processConnectWifiComplete(model, vExitCode, vStatus);
+        processWifiConnectComplete(model, vExitCode, vStatus);
         emit didAttributeResponse(model.data());
         model._data.clear();
     }