diff --git a/src/tabcontrollers/AccessibilityTabController.cpp b/src/tabcontrollers/AccessibilityTabController.cpp
index 6c8e34b..c2dfa9c 100644
--- a/src/tabcontrollers/AccessibilityTabController.cpp
+++ b/src/tabcontrollers/AccessibilityTabController.cpp
@@ -19,9 +19,9 @@ void AccessibilityTabController::initStage1() {
   reloadPttConfig();
 }
 
-void AccessibilityTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-  this->parent = parent;
-  this->widget = widget;
+void AccessibilityTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+  this->parent = var_parent;
+  this->widget = var_widget;
 }
 
 void AccessibilityTabController::setTrackingUniverse(int value) {
diff --git a/src/tabcontrollers/AudioTabController.cpp b/src/tabcontrollers/AudioTabController.cpp
index 84c89d4..ab79030 100644
--- a/src/tabcontrollers/AudioTabController.cpp
+++ b/src/tabcontrollers/AudioTabController.cpp
@@ -44,9 +44,9 @@ namespace advsettings {
 	}
 
 
-	void AudioTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-		this->parent = parent;
-		this->widget = widget;
+        void AudioTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+                this->parent = var_parent;
+                this->widget = var_widget;
 
 		std::string notifKey = std::string(OverlayController::applicationKey) + ".pptnotification";
 		vr::VROverlayError overlayError = vr::VROverlay()->CreateOverlay(notifKey.c_str(), notifKey.c_str(), &m_ulNotificationOverlayHandle);
diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp
index ce706ef..f286cd9 100644
--- a/src/tabcontrollers/ChaperoneTabController.cpp
+++ b/src/tabcontrollers/ChaperoneTabController.cpp
@@ -32,9 +32,9 @@ void ChaperoneTabController::initStage1() {
 }
 
 
-void ChaperoneTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-	this->parent = parent;
-	this->widget = widget;
+void ChaperoneTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+        this->parent = var_parent;
+        this->widget = var_widget;
 }
 
 
diff --git a/src/tabcontrollers/FixFloorTabController.cpp b/src/tabcontrollers/FixFloorTabController.cpp
index 8ac480d..34d2e69 100644
--- a/src/tabcontrollers/FixFloorTabController.cpp
+++ b/src/tabcontrollers/FixFloorTabController.cpp
@@ -9,9 +9,9 @@ namespace advsettings {
 void FixFloorTabController::initStage1() {
 }
 
-void FixFloorTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-	this->parent = parent;
-	this->widget = widget;
+void FixFloorTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+        this->parent = var_parent;
+        this->widget = var_widget;
 }
 
 void FixFloorTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses) {
diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp
index a6a6d13..1dec969 100644
--- a/src/tabcontrollers/MoveCenterTabController.cpp
+++ b/src/tabcontrollers/MoveCenterTabController.cpp
@@ -57,9 +57,9 @@ void MoveCenterTabController::initStage1() {
     lastMoveButtonClick[0] = lastMoveButtonClick[1] = clock::now();
 }
 
-void MoveCenterTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-	this->parent = parent;
-	this->widget = widget;
+void MoveCenterTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+        this->parent = var_parent;
+        this->widget = var_widget;
 }
 
 
diff --git a/src/tabcontrollers/ReviveTabController.cpp b/src/tabcontrollers/ReviveTabController.cpp
index 58994d8..78c7d80 100644
--- a/src/tabcontrollers/ReviveTabController.cpp
+++ b/src/tabcontrollers/ReviveTabController.cpp
@@ -167,9 +167,9 @@ namespace advsettings {
 		}
 	}
 
-	void ReviveTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-		this->parent = parent;
-		this->widget = widget;
+        void ReviveTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+                this->parent = var_parent;
+                this->widget = var_widget;
 	}
 
 	void ReviveTabController::eventLoopTick() {
diff --git a/src/tabcontrollers/SettingsTabController.cpp b/src/tabcontrollers/SettingsTabController.cpp
index 82bde48..ae747c5 100644
--- a/src/tabcontrollers/SettingsTabController.cpp
+++ b/src/tabcontrollers/SettingsTabController.cpp
@@ -17,9 +17,9 @@ void SettingsTabController::initStage1() {
 	}
 }
 
-void SettingsTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-	this->parent = parent;
-	this->widget = widget;
+void SettingsTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+        this->parent = var_parent;
+        this->widget = var_widget;
 }
 
 void SettingsTabController::eventLoopTick() {
diff --git a/src/tabcontrollers/StatisticsTabController.cpp b/src/tabcontrollers/StatisticsTabController.cpp
index 2195af5..6ee28d6 100644
--- a/src/tabcontrollers/StatisticsTabController.cpp
+++ b/src/tabcontrollers/StatisticsTabController.cpp
@@ -8,9 +8,9 @@ namespace advsettings {
 void StatisticsTabController::initStage1() {
 }
 
-void StatisticsTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-	this->parent = parent;
-	this->widget = widget;
+void StatisticsTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+        this->parent = var_parent;
+        this->widget = var_widget;
 }
 
 void StatisticsTabController::eventLoopTick(vr::TrackedDevicePose_t* devicePoses, float leftSpeed, float rightSpeed) {
diff --git a/src/tabcontrollers/SteamVRTabController.cpp b/src/tabcontrollers/SteamVRTabController.cpp
index 4643220..d3cfaba 100644
--- a/src/tabcontrollers/SteamVRTabController.cpp
+++ b/src/tabcontrollers/SteamVRTabController.cpp
@@ -24,9 +24,9 @@ void SteamVRTabController::initStage1() {
 }
 
 
-void SteamVRTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-	this->parent = parent;
-	this->widget = widget;
+void SteamVRTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+        this->parent = var_parent;
+        this->widget = var_widget;
 }
 
 
diff --git a/src/tabcontrollers/UtilitiesTabController.cpp b/src/tabcontrollers/UtilitiesTabController.cpp
index 705999a..c83cfd3 100644
--- a/src/tabcontrollers/UtilitiesTabController.cpp
+++ b/src/tabcontrollers/UtilitiesTabController.cpp
@@ -48,9 +48,9 @@ namespace advsettings {
 
 	}
 
-	void UtilitiesTabController::initStage2(OverlayController * parent, QQuickWindow * widget) {
-		this->parent = parent;
-		this->widget = widget;
+        void UtilitiesTabController::initStage2(OverlayController * var_parent, QQuickWindow * var_widget) {
+                this->parent = var_parent;
+                this->widget = var_widget;
 	}
 
 	void UtilitiesTabController::sendKeyboardInput(QString input) {
diff --git a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
index 7e41a32..89a1c06 100644
--- a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
+++ b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
@@ -31,7 +31,7 @@ AudioManagerWindows::~AudioManagerWindows() {
 	audioDeviceEnumerator->Release();
 }
 
-void AudioManagerWindows::init(AudioTabController* controller) {
+void AudioManagerWindows::init(AudioTabController* var_controller) {
 	std::lock_guard<std::recursive_mutex> lock(_mutex);
 	audioDeviceEnumerator = getAudioDeviceEnumerator();
 	if (!audioDeviceEnumerator) {
@@ -47,7 +47,7 @@ void AudioManagerWindows::init(AudioTabController* controller) {
 	} else {
 		LOG(WARNING) << "Could not find a default recording device.";
 	}
-	this->controller = controller;
+        this->controller = var_controller;
 	audioDeviceEnumerator->RegisterEndpointNotificationCallback((IMMNotificationClient*)this);
 	policyConfig = getPolicyConfig();
 	if (!policyConfig) {