diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 0519fd1316..e7a43e68d2 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -284,7 +284,7 @@ enableCamShake true;
 //////////////////////////////////////////////////
 
 // Set the name for the current player
-["ace_playerChanged", {
+["unit", {
     params ["_newPlayer","_oldPlayer"];
 
     if (alive _newPlayer) then {
@@ -294,7 +294,7 @@ enableCamShake true;
     if (alive _oldPlayer) then {
         [_oldPlayer] call FUNC(setName);
     };
-}] call CBA_fnc_addEventHandler;
+}] call CBA_fnc_addPlayerEventHandler;
 
 
 //////////////////////////////////////////////////
@@ -328,20 +328,19 @@ enableCamShake true;
 }] call CBA_fnc_addPlayerEventHandler;
 
 // "playerVisionModeChanged" event
-["visionmode", {
+["visionMode", {
     ["ace_playerVisionModeChanged", _this] call CBA_fnc_localEvent;
 }] call CBA_fnc_addPlayerEventHandler;
 
 // "cameraViewChanged" event
-["cameraview", {
+["cameraView", {
     ["ace_cameraViewChanged", _this] call CBA_fnc_localEvent;
 }] call CBA_fnc_addPlayerEventHandler;
 
-["visiblemap", {
+["visibleMap", {
     ["ace_visibleMapChanged", _this] call CBA_fnc_localEvent;
 }] call CBA_fnc_addPlayerEventHandler;
 
-
 GVAR(OldIsCamera) = false;
 
 [{
diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index 3d8525f20d..00d6fea0fb 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -108,7 +108,7 @@ call FUNC(determineZoom);
         }] call CBA_fnc_addPlayerEventHandler;
 
         if (GVAR(mapGlow)) then {
-            ["ace_visibleMapChanged", {
+            ["visibleMap", {
                 params ["_player", "_mapOn"];
                 if (_mapOn) then {
                     if (!alive _player && !isNull GVAR(glow)) then {
@@ -128,7 +128,7 @@ call FUNC(determineZoom);
                         [""] call FUNC(flashlightGlow);
                     };
                 };
-            }] call CBA_fnc_addEventHandler;
+            }] call CBA_fnc_addPlayerEventHandler;
         };
     };
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/maptools/XEH_postInitClient.sqf b/addons/maptools/XEH_postInitClient.sqf
index 388ffd6b81..8569f0eb9f 100644
--- a/addons/maptools/XEH_postInitClient.sqf
+++ b/addons/maptools/XEH_postInitClient.sqf
@@ -22,7 +22,7 @@ GVAR(mapTool_isRotating) = false;
     ((findDisplay 12) displayCtrl 51) ctrlAddEventHandler ["Draw", {_this call FUNC(updateMapToolMarkers);}];
 }, []] call CBA_fnc_waitUntilAndExecute;
 
-["ace_visibleMapChanged", {
+["visibleMap", {
     params ["", "_mapOn"];
     if (_mapOn) then {
         // Show GPS if required
@@ -31,4 +31,4 @@ GVAR(mapTool_isRotating) = false;
         // Hide GPS
         [false] call FUNC(openMapGps);
     };
-}] call CBA_fnc_addEventHandler;
+}] call CBA_fnc_addPlayerEventHandler;