diff --git a/addons/switchunits/CfgEventHandlers.hpp b/addons/switchunits/CfgEventHandlers.hpp
index 689e06c529..44b6e8e6ff 100644
--- a/addons/switchunits/CfgEventHandlers.hpp
+++ b/addons/switchunits/CfgEventHandlers.hpp
@@ -1,12 +1,11 @@
 class Extended_PreInit_EventHandlers {
-  class ADDON {
-    init = QUOTE( call COMPILE_FILE(XEH_preInit) );
-  };
+    class ADDON {
+        init = QUOTE( call COMPILE_FILE(XEH_preInit) );
+    };
 };
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        clientInit = QUOTE( call COMPILE_FILE(XEH_clientInit) );
+        init = QUOTE( call COMPILE_FILE(XEH_postInit) );
     };
 };
-
diff --git a/addons/switchunits/CfgVehicles.hpp b/addons/switchunits/CfgVehicles.hpp
index d2548448b1..bf5b402b74 100644
--- a/addons/switchunits/CfgVehicles.hpp
+++ b/addons/switchunits/CfgVehicles.hpp
@@ -50,4 +50,4 @@ class CfgVehicles {
       description = "$STR_ACE_SwitchUnits_Module_Description";
     };
   };
-};
\ No newline at end of file
+};
diff --git a/addons/switchunits/XEH_clientInit.sqf b/addons/switchunits/XEH_postInit.sqf
similarity index 91%
rename from addons/switchunits/XEH_clientInit.sqf
rename to addons/switchunits/XEH_postInit.sqf
index 6a908071c9..5928804d7b 100644
--- a/addons/switchunits/XEH_clientInit.sqf
+++ b/addons/switchunits/XEH_postInit.sqf
@@ -16,6 +16,7 @@
 
 #include "script_component.hpp"
 
+
 if (missionNamespace getVariable [QGVAR(EnableSwitchUnits), false]) then {
     [player] call FUNC(startSwitchUnits);
 } else {
@@ -24,5 +25,5 @@ if (missionNamespace getVariable [QGVAR(EnableSwitchUnits), false]) then {
         if ((_name == QGVAR(EnableSwitchUnits)) && {_value}) then {
             [player] call FUNC(startSwitchUnits);
         };
-    }] call EFUNC(common,addEventhandler); 
+    }] call EFUNC(common,addEventhandler);
 };
diff --git a/addons/switchunits/config.cpp b/addons/switchunits/config.cpp
index 8e792381c3..3b1d11f460 100644
--- a/addons/switchunits/config.cpp
+++ b/addons/switchunits/config.cpp
@@ -14,4 +14,4 @@ class CfgPatches {
 
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
-#include "ACE_Settings.hpp"
\ No newline at end of file
+#include "ACE_Settings.hpp"