diff --git a/addons/common/RscInfoType.hpp b/addons/common/RscInfoType.hpp
index b2b74e1ade..b62839f9ca 100644
--- a/addons/common/RscInfoType.hpp
+++ b/addons/common/RscInfoType.hpp
@@ -113,6 +113,6 @@ class RscInGameUI {
     };
 
     class RscStanceInfo {
-        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscStanceInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_2('infoDisplayChanged', [ARR_2(_this select 0, 'Stance')])] call FUNC(localEvent););
+        onLoad = QUOTE([ARR_4(""onLoad"",_this,""RscStanceInfo"",'IGUI')] call (uinamespace getvariable 'BIS_fnc_initDisplay'); [ARR_2('ace_infoDisplayChanged', [ARR_2(_this select 0, 'Stance')])] call CBA_fnc_localEvent;);
     };
 };
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 30e770c2c4..9763a1603c 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -189,10 +189,10 @@ call FUNC(checkFiles);
 
 
 //////////////////////////////////////////////////
-// Set up SettingsInitialized eventhandler
+// Set up ace_settingsInitialized eventhandler
 //////////////////////////////////////////////////
 
-["SettingsInitialized", {
+["ace_settingsInitialized", {
     [
         GVAR(checkPBOsAction),
         GVAR(checkPBOsCheckAll),
diff --git a/addons/common/functions/fnc_onAnswerRequest.sqf b/addons/common/functions/fnc_onAnswerRequest.sqf
index e462a4bbf8..8c77719256 100644
--- a/addons/common/functions/fnc_onAnswerRequest.sqf
+++ b/addons/common/functions/fnc_onAnswerRequest.sqf
@@ -20,7 +20,7 @@ if (!isNil "_info") then {
     _info params ["_caller", "_target", "_requestID", "_requestMessage", "_callBack"];
 
     private _replyParams = [_info, _accepted];
-    [QGVAR(requestCallback), _caller, _replyParams] call FUNC(objectEvent);
+    [QGVAR(requestCallback), _replyParams, _caller] call CBA_fnc_targetEvent;
     _unit setVariable [_id, nil];
 };
 
diff --git a/addons/common/functions/fnc_sendRequest.sqf b/addons/common/functions/fnc_sendRequest.sqf
index 6df60cf24d..a0c505c575 100644
--- a/addons/common/functions/fnc_sendRequest.sqf
+++ b/addons/common/functions/fnc_sendRequest.sqf
@@ -20,7 +20,7 @@ params ["_caller", "_target", "_requestID", "_requestMessage", "_callBack"];
 
 if (isPlayer _target) then {
     // Pass request on to target locality for player accept/decline.
-    [QGVAR(receiveRequest), _target, [_caller, _target, _requestID, _requestMessage, _callBack]] call FUNC(objectEvent);
+    [QGVAR(receiveRequest), [_caller, _target, _requestID, _requestMessage, _callBack], _target] call CBA_fnc_targetEvent;
 } else {
     // accept it, since it's an AI.
     [_caller, _target, true] call compile _callBack;
diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf
index 25b929f052..6900953a31 100644
--- a/addons/explosives/XEH_postInit.sqf
+++ b/addons/explosives/XEH_postInit.sqf
@@ -17,7 +17,7 @@
 
 //Event for setting explosive placement angle/pitch:
 [QGVAR(place), {_this call FUNC(setPosition)}] call CBA_fnc_addEventHandler;
-[QGVAR(startDefuse), FUNC(startDefuse)] call EFUNC(common,addEventHandler);
+[QGVAR(startDefuse), FUNC(startDefuse)] call CBA_fnc_addEventHandler;
 
 //When getting knocked out in medical, trigger deadman explosives:
 //Event is global, only run on server (ref: ace_medical_fnc_setUnconscious)
diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf
index e9ba668e0e..8e3f071661 100644
--- a/addons/explosives/functions/fnc_startDefuse.sqf
+++ b/addons/explosives/functions/fnc_startDefuse.sqf
@@ -44,7 +44,7 @@ if (STANCE _unit == "Prone") then {
 if (ACE_player != _unit) then {
     // If the unit is a player, call the function on the player.
     if (isPlayer _unit) then {
-        [QGVAR(startDefuse), _unit, [_unit, _target]] call EFUNC(common,objectEvent);
+        [QGVAR(startDefuse), [_unit, _target], _unit] call CBA_fnc_targetEvent;
     } else {
         _unit playActionNow _actionToPlay;
         _unit disableAI "MOVE";
diff --git a/addons/medical/XEH_postInit.sqf b/addons/medical/XEH_postInit.sqf
index 31707bde53..0d9d33f22a 100644
--- a/addons/medical/XEH_postInit.sqf
+++ b/addons/medical/XEH_postInit.sqf
@@ -264,7 +264,7 @@ GVAR(lastHeartBeatSound) = CBA_missionTime;
 }, 0, []] call CBA_fnc_addPerFrameHandler;
 };
 
-["SettingsInitialized", {
+["ace_settingsInitialized", {
     // Networked litter (need to wait for GVAR(litterCleanUpDelay) to be set)
     [QGVAR(createLitter), FUNC(handleCreateLitter), GVAR(litterCleanUpDelay)] call EFUNC(common,addSyncedEventHandler);
 
diff --git a/addons/repair/functions/fnc_useItem.sqf b/addons/repair/functions/fnc_useItem.sqf
index 4bae3e7918..eca88d7aca 100644
--- a/addons/repair/functions/fnc_useItem.sqf
+++ b/addons/repair/functions/fnc_useItem.sqf
@@ -20,7 +20,7 @@ params ["_unit", "_item"];
 TRACE_2("params",_unit,_item);
 
 if ([_unit, _item] call EFUNC(common,hasItem)) exitWith {
-    [QGVAR(useItem), _unit, [_unit, _item]] call EFUNC(common,objectEvent);
+    [QGVAR(useItem), [_unit, _item], _unit] call CBA_fnc_targetEvent;
     [true, _unit];
 };
 
diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf
index aa53c6741a..6ca816e8a4 100644
--- a/addons/respawn/functions/fnc_handleKilled.sqf
+++ b/addons/respawn/functions/fnc_handleKilled.sqf
@@ -25,5 +25,5 @@ if (ACE_player == _unit && {GVAR(SavePreDeathGear)}) then {
 };
 
 if (missionNamespace getVariable [QGVAR(showFriendlyFireMessage), false]) then {
-    [QGVAR(showFriendlyFireMessageEvent), _this] call EFUNC(common,objectEvent);
+    [QGVAR(showFriendlyFireMessageEvent), _this] call CBA_fnc_globalEvent;
 };
diff --git a/addons/spectator/XEH_postInit.sqf b/addons/spectator/XEH_postInit.sqf
index 8907858d3f..72c53a2af0 100644
--- a/addons/spectator/XEH_postInit.sqf
+++ b/addons/spectator/XEH_postInit.sqf
@@ -4,7 +4,7 @@
 // Add interaction menu exception
 ["isNotSpectating", {!(GETVAR((_this select 0),GVAR(isStaged),false))}] call EFUNC(common,addCanInteractWithCondition);
 
-["SettingsInitialized", {
+["ace_settingsInitialized", {
     GVAR(availableModes) = [[0,1,2], [1,2], [0], [1], [2]] select GVAR(restrictModes);
     GVAR(availableVisions) = [[-2,-1,0,1], [-2,-1], [-2,0,1], [-2]] select GVAR(restrictVisions);
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/spectator/functions/fnc_respawnTemplate.sqf b/addons/spectator/functions/fnc_respawnTemplate.sqf
index fde8ef05ad..0813f37755 100644
--- a/addons/spectator/functions/fnc_respawnTemplate.sqf
+++ b/addons/spectator/functions/fnc_respawnTemplate.sqf
@@ -23,7 +23,7 @@ private ["_vision","_pos"];
 
 // When all are dead with respawn type "None" the mission should end
 if ((_respawn == 0) && {{alive _x} count allPlayers <= 0}) exitWith {
-    ["BIS_fnc_endMission", ["endDeath", false]] call EFUNC(common,globalEvent);
+    ["BIS_fnc_endMission", ["endDeath", false]] call EFUNC(common,globalEvent); //???
 };
 
 // Some environment information can be used for the initial camera attributes
diff --git a/addons/spectator/functions/fnc_stageSpectator.sqf b/addons/spectator/functions/fnc_stageSpectator.sqf
index 425d4a3783..8e6c32f568 100644
--- a/addons/spectator/functions/fnc_stageSpectator.sqf
+++ b/addons/spectator/functions/fnc_stageSpectator.sqf
@@ -27,7 +27,7 @@ params [["_unit",player,[objNull]], ["_set",true,[true]]];
 if !(_set || (GETVAR(_unit,GVAR(isStaged),false))) exitWith {};
 
 if !(local _unit) exitWith {
-    [QGVAR(stageSpectator), _unit, [_unit, _set]] call EFUNC(common,objectEvent);
+    [QGVAR(stageSpectator), [_unit, _set], _unit] call CBA_fnc_targetEvent;
 };
 
 // Prevent unit falling into water
diff --git a/addons/switchunits/XEH_postInit.sqf b/addons/switchunits/XEH_postInit.sqf
index 9dc58e7769..dc143bc6ac 100644
--- a/addons/switchunits/XEH_postInit.sqf
+++ b/addons/switchunits/XEH_postInit.sqf
@@ -33,5 +33,5 @@ if (isServer) then {
         params ["_unit", "_player"];
         _unit setVariable [QGVAR(OriginalOwner), owner _unit, true];
         _unit setOwner (owner _player);
-    }] call EFUNC(common,addEventHandler);
+    }] call CBA_fnc_addEventHandler;
 };
diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf
index 64cc77c221..84b766de4d 100644
--- a/addons/switchunits/functions/fnc_switchUnit.sqf
+++ b/addons/switchunits/functions/fnc_switchUnit.sqf
@@ -40,7 +40,7 @@ if (_leave) exitWith {
 // should switch locality
 // This doesn't work anymore, because one's now able to switch to units from a different side
 //[_unit] joinSilent group player;
-[QGVAR(switchLocality), [_unit, player]] call EFUNC(common,serverEvent);
+[QGVAR(switchLocality), [_unit, player]] call CBA_fnc_serverEvent;
 
 [{
     params ["_args", "_pfhId"];
@@ -72,7 +72,7 @@ if (_leave) exitWith {
         // set owner back to original owner
         private _oldOwner = _oldUnit getVariable[QGVAR(OriginalOwner), -1];
         if (_oldOwner > -1) then {
-            ["setOwner", [_oldUnit, _oldOwner]] call EFUNC(common,serverEvent);
+            ["ace_setOwner", [_oldUnit, _oldOwner]] call CBA_fnc_serverEvent;
         };
 
         [localize LSTRING(SwitchedUnit)] call EFUNC(common,displayTextStructured);
diff --git a/addons/ui/XEH_clientInit.sqf b/addons/ui/XEH_clientInit.sqf
index ad9e9b14cc..9746862eaa 100644
--- a/addons/ui/XEH_clientInit.sqf
+++ b/addons/ui/XEH_clientInit.sqf
@@ -20,10 +20,10 @@ if (!hasInterface) exitWith {};
         // Execute local event for when it's safe to modify UI through this API
         // infoDisplayChanged can execute multiple times, make sure it only happens once
         if (!GVAR(interfaceInitialized)) then {
-            ["InterfaceInitialized", []] call CBA_fnc_localEvent
+            [QGVAR(InterfaceInitialized), []] call CBA_fnc_localEvent
             GVAR(interfaceInitialized) = true;
         };
-    }] call EFUNC(common,addEventHandler);
+    }] call CBA_fnc_addEventHandler;
 
     // On changing settings
     ["ace_settingChanged", {
diff --git a/addons/weather/XEH_postInit.sqf b/addons/weather/XEH_postInit.sqf
index 341d4f87ed..1e4496f7ca 100644
--- a/addons/weather/XEH_postInit.sqf
+++ b/addons/weather/XEH_postInit.sqf
@@ -59,7 +59,7 @@ simulWeatherSync;
 
 
 ["ace_settingsInitialized",{
-    TRACE_1("SettingsInitialized",GVAR(syncRain));
+    TRACE_1("ace_settingsInitialized eh",GVAR(syncRain));
 
     //Create a 0 sec delay PFEH to update rain every frame:
     if (GVAR(syncRain)) then {
diff --git a/addons/weather/XEH_postServerInit.sqf b/addons/weather/XEH_postServerInit.sqf
index c72dd8db4c..cd1fca2c4c 100644
--- a/addons/weather/XEH_postServerInit.sqf
+++ b/addons/weather/XEH_postServerInit.sqf
@@ -10,7 +10,7 @@ GVAR(rain_current_range) = -1+(random 2);
 call FUNC(initWind);
 
 ["ace_settingsInitialized", {
-    TRACE_2("SettingsInitialized",GVAR(enableServerController),GVAR(serverUpdateInterval));
+    TRACE_2("ace_settingsInitialized eh",GVAR(enableServerController),GVAR(serverUpdateInterval));
 
     if (GVAR(enableServerController)) then {
         [FUNC(serverController), GVAR(serverUpdateInterval)] call CBA_fnc_addPerFrameHandler;