diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
index f9d78b5045..9d0dd0ee4b 100644
--- a/addons/advanced_ballistics/XEH_postInit.sqf
+++ b/addons/advanced_ballistics/XEH_postInit.sqf
@@ -19,11 +19,11 @@ if (!hasInterface) exitWith {};
     [] call FUNC(initializeTerrainExtension);
 
     // Register fire event handler
-    ["ace_firedPlayer", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
-    ["ace_firedPlayerNonLocal", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayer", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayerNonLocal", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
 
     // Register Perframe Handler
-    [FUNC(handleFirePFH), GVAR(simulationInterval)] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(handleFirePFH), GVAR(simulationInterval)] call CBA_fnc_addPerFrameHandler;
 
     //Add warnings for missing compat PBOs (only if AB is on)
     {
diff --git a/addons/advanced_throwing/XEH_postInit.sqf b/addons/advanced_throwing/XEH_postInit.sqf
index 1fc9400e99..930313fce0 100644
--- a/addons/advanced_throwing/XEH_postInit.sqf
+++ b/addons/advanced_throwing/XEH_postInit.sqf
@@ -2,7 +2,7 @@
 
 // Fired XEH
 GVAR(ammoEventHandlers) = createHashMap;
-[QGVAR(throwFiredXEH), FUNC(throwFiredXEH)] call CBA_fnc_addEventHandler;
+[QGVAR(throwFiredXEH), LINKFUNC(throwFiredXEH)] call CBA_fnc_addEventHandler;
 
 // Exit on HC
 if (!hasInterface) exitWith {};
diff --git a/addons/ai/XEH_postInit.sqf b/addons/ai/XEH_postInit.sqf
index fce5152e3d..7c4f79f8fb 100644
--- a/addons/ai/XEH_postInit.sqf
+++ b/addons/ai/XEH_postInit.sqf
@@ -16,7 +16,7 @@
     } forEach _sections;
 }] call CBA_fnc_addEventHandler;
 
-[QGVAR(unGarrison), FUNC(unGarrison)] call CBA_fnc_addEventHandler;
+[QGVAR(unGarrison), LINKFUNC(unGarrison)] call CBA_fnc_addEventHandler;
 
 [QGVAR(doMove), {
     params ["_unitsArray"];
@@ -73,6 +73,6 @@
 if (isServer) then {
     ["CAManBase", "init", {
         // wait for HMD to be assigned so `hmd _unit` works
-        [FUNC(assignNVG), _this, 1] call CBA_fnc_waitAndExecute;
+        [LINKFUNC(assignNVG), _this, 1] call CBA_fnc_waitAndExecute;
     }] call CBA_fnc_addClassEventHandler;
 };
diff --git a/addons/atragmx/XEH_postInit.sqf b/addons/atragmx/XEH_postInit.sqf
index 7914657b08..01eb14d928 100644
--- a/addons/atragmx/XEH_postInit.sqf
+++ b/addons/atragmx/XEH_postInit.sqf
@@ -7,4 +7,4 @@ if (!hasInterface) exitWith {};
 GVAR(active) = false;
 GVAR(initialised) = false;
 
-[QEGVAR(vector,rangefinderData), {_this call FUNC(sord)}] call CBA_fnc_addEventHandler;
+[QEGVAR(vector,rangefinderData), LINKFUNC(sord)] call CBA_fnc_addEventHandler;
diff --git a/addons/captives/XEH_postInit.sqf b/addons/captives/XEH_postInit.sqf
index 8d34c4fb40..951a710771 100644
--- a/addons/captives/XEH_postInit.sqf
+++ b/addons/captives/XEH_postInit.sqf
@@ -25,14 +25,14 @@ if (isServer) then {
 };
 
 ["unit", FUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
-[QGVAR(moveInCaptive), FUNC(vehicleCaptiveMoveIn)] call CBA_fnc_addEventHandler;
-[QGVAR(moveOutCaptive), FUNC(vehicleCaptiveMoveOut)] call CBA_fnc_addEventHandler;
+[QGVAR(moveInCaptive), LINKFUNC(vehicleCaptiveMoveIn)] call CBA_fnc_addEventHandler;
+[QGVAR(moveOutCaptive), LINKFUNC(vehicleCaptiveMoveOut)] call CBA_fnc_addEventHandler;
 
-[QGVAR(setHandcuffed), FUNC(setHandcuffed)] call CBA_fnc_addEventHandler;
-[QGVAR(setSurrendered), FUNC(setSurrendered)] call CBA_fnc_addEventHandler;
+[QGVAR(setHandcuffed), LINKFUNC(setHandcuffed)] call CBA_fnc_addEventHandler;
+[QGVAR(setSurrendered), LINKFUNC(setSurrendered)] call CBA_fnc_addEventHandler;
 
 //Medical Integration Events
-["ace_unconscious", FUNC(handleOnUnconscious)] call CBA_fnc_addEventHandler;
+["ace_unconscious", LINKFUNC(handleOnUnconscious)] call CBA_fnc_addEventHandler;
 
 if (!hasInterface) exitWith {};
 
diff --git a/addons/casings/XEH_postInit.sqf b/addons/casings/XEH_postInit.sqf
index e91ab96c0d..c1baad68e9 100644
--- a/addons/casings/XEH_postInit.sqf
+++ b/addons/casings/XEH_postInit.sqf
@@ -4,4 +4,4 @@ if (!hasInterface || !GVAR(enabled)) exitWith {};
 
 GVAR(cachedCasings) = createHashMap;
 GVAR(casings) = [];
-["CAManBase", "FiredMan", {call FUNC(createCasing)}] call CBA_fnc_addClassEventHandler;
+["CAManBase", "FiredMan", LINKFUNC(createCasing)] call CBA_fnc_addClassEventHandler;
diff --git a/addons/chemlights/XEH_postInit.sqf b/addons/chemlights/XEH_postInit.sqf
index 6b22de4a3c..b40ffb764e 100644
--- a/addons/chemlights/XEH_postInit.sqf
+++ b/addons/chemlights/XEH_postInit.sqf
@@ -2,6 +2,6 @@
 
 if (!hasInterface) exitWith {};
 
-["ace_firedPlayer", DFUNC(throwEH)] call CBA_fnc_addEventHandler;
-// ["ace_firedPlayerNonLocal", DFUNC(throwEH)] call CBA_fnc_addEventHandler;
-// ["ace_firedNonPlayer", DFUNC(throwEH)] call CBA_fnc_addEventHandler;
+["ace_firedPlayer", LINKFUNC(throwEH)] call CBA_fnc_addEventHandler;
+// ["ace_firedPlayerNonLocal", LINKFUNC(throwEH)] call CBA_fnc_addEventHandler;
+// ["ace_firedNonPlayer", LINKFUNC(throwEH)] call CBA_fnc_addEventHandler;
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index c5b9c55eb2..1f259c2e3d 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -18,7 +18,7 @@
 //////////////////////////////////////////////////
 
 //Status Effect EHs:
-[QGVAR(setStatusEffect), {_this call FUNC(statusEffect_set)}] call CBA_fnc_addEventHandler;
+[QGVAR(setStatusEffect), LINKFUNC(statusEffect_set)] call CBA_fnc_addEventHandler;
 ["forceWalk", false, ["ace_advanced_fatigue", "ACE_SwitchUnits", "ACE_Attach", "ace_dragging", "ACE_Explosives", "ACE_Ladder", "ACE_Sandbag", "ACE_refuel", "ACE_rearm", "ACE_Trenches", "ace_medical_fracture"]] call FUNC(statusEffect_addType);
 ["blockSprint", false, ["ace_advanced_fatigue", "ace_dragging", "ace_medical_fracture"]] call FUNC(statusEffect_addType);
 ["setCaptive", true, [QEGVAR(captives,Handcuffed), QEGVAR(captives,Surrendered)]] call FUNC(statusEffect_addType);
@@ -157,9 +157,9 @@ if (isServer) then {
     INFO_2("Headbug Used: Name: %1, Animation: %2",_profileName,_animation);
 }] call CBA_fnc_addEventHandler;
 
-[QGVAR(fixCollision), FUNC(fixCollision)] call CBA_fnc_addEventHandler;
-[QGVAR(fixFloating), FUNC(fixFloating)] call CBA_fnc_addEventHandler;
-[QGVAR(fixPosition), FUNC(fixPosition)] call CBA_fnc_addEventHandler;
+[QGVAR(fixCollision), LINKFUNC(fixCollision)] call CBA_fnc_addEventHandler;
+[QGVAR(fixFloating), LINKFUNC(fixFloating)] call CBA_fnc_addEventHandler;
+[QGVAR(fixPosition), LINKFUNC(fixPosition)] call CBA_fnc_addEventHandler;
 
 ["ace_loadPersonEvent", LINKFUNC(loadPersonLocal)] call CBA_fnc_addEventHandler;
 ["ace_unloadPersonEvent", LINKFUNC(unloadPersonLocal)] call CBA_fnc_addEventHandler;
@@ -209,8 +209,8 @@ if (isServer) then {
 }] call CBA_fnc_addEventHandler;
 
 // Request framework
-[QGVAR(requestCallback), FUNC(requestCallback)] call CBA_fnc_addEventHandler;
-[QGVAR(receiveRequest), FUNC(receiveRequest)] call CBA_fnc_addEventHandler;
+[QGVAR(requestCallback), LINKFUNC(requestCallback)] call CBA_fnc_addEventHandler;
+[QGVAR(receiveRequest), LINKFUNC(receiveRequest)] call CBA_fnc_addEventHandler;
 
 [QGVAR(systemChatGlobal), {systemChat _this}] call CBA_fnc_addEventHandler;
 
@@ -219,7 +219,7 @@ if (isServer) then {
     [QGVAR(enableSimulationGlobal), {(_this select 0) enableSimulationGlobal (_this select 1)}] call CBA_fnc_addEventHandler;
     [QGVAR(setShotParents), {(_this select 0) setShotParents [_this select 1, _this select 2]}] call CBA_fnc_addEventHandler;
     ["ace_setOwner", {(_this select 0) setOwner (_this select 1)}] call CBA_fnc_addEventHandler;
-    [QGVAR(serverLog), FUNC(serverLog)] call CBA_fnc_addEventHandler;
+    [QGVAR(serverLog), LINKFUNC(serverLog)] call CBA_fnc_addEventHandler;
     [QGVAR(claimSafe), LINKFUNC(claimSafeServer)] call CBA_fnc_addEventHandler;
 };
 
@@ -236,14 +236,14 @@ if (!isServer) then {
         ["ACEa", [player]] call CBA_fnc_serverEvent;
     }] call CBA_fnc_addEventHandler;
 } else {
-    ["ACEa", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
+    ["ACEa", LINKFUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
 };
 
-["ACEe", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
-["ACEs", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
+["ACEe", LINKFUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
+["ACEs", LINKFUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
 
 if (isServer) then {
-    [FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
 };
 
 
@@ -392,8 +392,8 @@ addMissionEventHandler ["PlayerViewChanged", {
 // Eventhandlers for player controlled machines
 //////////////////////////////////////////////////
 
-[QGVAR(displayTextStructured), {_this call FUNC(displayTextStructured)}] call CBA_fnc_addEventHandler;
-[QGVAR(displayTextPicture), {_this call FUNC(displayTextPicture)}] call CBA_fnc_addEventHandler;
+[QGVAR(displayTextStructured), LINKFUNC(displayTextStructured)] call CBA_fnc_addEventHandler;
+[QGVAR(displayTextPicture), LINKFUNC(displayTextPicture)] call CBA_fnc_addEventHandler;
 
 ["ace_unconscious", {
     params ["_unit", "_isUnconscious"];
@@ -403,7 +403,7 @@ addMissionEventHandler ["PlayerViewChanged", {
     };
 }] call CBA_fnc_addEventHandler;
 
-["ace_useItem", DFUNC(useItem)] call CBA_fnc_addEventHandler;
+["ace_useItem", LINKFUNC(useItem)] call CBA_fnc_addEventHandler;
 
 
 //////////////////////////////////////////////////
diff --git a/addons/common/functions/fnc_addSyncedEventHandler.sqf b/addons/common/functions/fnc_addSyncedEventHandler.sqf
index dbe0612e95..616897842b 100644
--- a/addons/common/functions/fnc_addSyncedEventHandler.sqf
+++ b/addons/common/functions/fnc_addSyncedEventHandler.sqf
@@ -24,7 +24,7 @@ if (_name in GVAR(syncedEvents)) exitWith {
     false
 };
 
-private _eventId = [_name, FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
+private _eventId = [_name, LINKFUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
 private _data = [_handler, [], _ttl, _eventId];
 
 GVAR(syncedEvents) set [_name, _data];
diff --git a/addons/concertina_wire/XEH_postInit.sqf b/addons/concertina_wire/XEH_postInit.sqf
index 7cb8909c81..bb3f022534 100644
--- a/addons/concertina_wire/XEH_postInit.sqf
+++ b/addons/concertina_wire/XEH_postInit.sqf
@@ -10,4 +10,4 @@ GVAR(deployPFH) = -1;
     };
 }] call CBA_fnc_addEventHandler;
 
-[QGVAR(vehicleDamage), {_this call FUNC(vehicleDamage)}] call CBA_fnc_addEventHandler;
+[QGVAR(vehicleDamage), LINKFUNC(vehicleDamage)] call CBA_fnc_addEventHandler;
diff --git a/addons/cookoff/XEH_postInit.sqf b/addons/cookoff/XEH_postInit.sqf
index b33723619e..eba4eeced0 100644
--- a/addons/cookoff/XEH_postInit.sqf
+++ b/addons/cookoff/XEH_postInit.sqf
@@ -1,15 +1,15 @@
 #include "script_component.hpp"
 
-[QGVAR(engineFire), FUNC(engineFire)] call CBA_fnc_addEventHandler;
+[QGVAR(engineFire), LINKFUNC(engineFire)] call CBA_fnc_addEventHandler;
 [QGVAR(cookOff), {
     params ["_vehicle"];
     if (local _vehicle) then {
         _this call FUNC(cookOff);
     };
 }] call CBA_fnc_addEventHandler;
-[QGVAR(cookOffEffect), FUNC(cookOffEffect)] call CBA_fnc_addEventHandler;
-[QGVAR(smoke), FUNC(smoke)] call CBA_fnc_addEventHandler;
-[QGVAR(cookOffBox), FUNC(cookOffBox)] call CBA_fnc_addEventHandler;
+[QGVAR(cookOffEffect), LINKFUNC(cookOffEffect)] call CBA_fnc_addEventHandler;
+[QGVAR(smoke), LINKFUNC(smoke)] call CBA_fnc_addEventHandler;
+[QGVAR(cookOffBox), LINKFUNC(cookOffBox)] call CBA_fnc_addEventHandler;
 
 // handle cleaning up effects when vehicle is deleted mid-cookoff
 [QGVAR(addCleanupHandlers), {
diff --git a/addons/disarming/XEH_postInit.sqf b/addons/disarming/XEH_postInit.sqf
index 6944f8b146..5b123af297 100644
--- a/addons/disarming/XEH_postInit.sqf
+++ b/addons/disarming/XEH_postInit.sqf
@@ -1,4 +1,4 @@
 #include "script_component.hpp"
 
-[QGVAR(dropItems), FUNC(eventTargetStart)] call CBA_fnc_addEventHandler;
-[QGVAR(debugCallback), FUNC(eventCallerFinish)] call CBA_fnc_addEventHandler;
+[QGVAR(dropItems), LINKFUNC(eventTargetStart)] call CBA_fnc_addEventHandler;
+[QGVAR(debugCallback), LINKFUNC(eventCallerFinish)] call CBA_fnc_addEventHandler;
diff --git a/addons/dogtags/XEH_postInit.sqf b/addons/dogtags/XEH_postInit.sqf
index f683f6f253..d9c35dc172 100644
--- a/addons/dogtags/XEH_postInit.sqf
+++ b/addons/dogtags/XEH_postInit.sqf
@@ -1,9 +1,9 @@
 #include "script_component.hpp"
 
-[QGVAR(showDogtag), DFUNC(showDogtag)] call CBA_fnc_addEventHandler;
-[QGVAR(sendDogtagData), DFUNC(sendDogtagData)] call CBA_fnc_addEventHandler;
-[QGVAR(getDogtagItem), DFUNC(getDogtagItem)] call CBA_fnc_addEventHandler;
-[QGVAR(addDogtagItem), DFUNC(addDogtagItem)] call CBA_fnc_addEventHandler;
+[QGVAR(showDogtag), LINKFUNC(showDogtag)] call CBA_fnc_addEventHandler;
+[QGVAR(sendDogtagData), LINKFUNC(sendDogtagData)] call CBA_fnc_addEventHandler;
+[QGVAR(getDogtagItem), LINKFUNC(getDogtagItem)] call CBA_fnc_addEventHandler;
+[QGVAR(addDogtagItem), LINKFUNC(addDogtagItem)] call CBA_fnc_addEventHandler;
 
 // Add actions and event handlers only if ace_medical is loaded
 // - Adding actions via config would create a dependency
diff --git a/addons/dragging/functions/fnc_carryObject.sqf b/addons/dragging/functions/fnc_carryObject.sqf
index bf49282b9e..4d5ac8b61b 100644
--- a/addons/dragging/functions/fnc_carryObject.sqf
+++ b/addons/dragging/functions/fnc_carryObject.sqf
@@ -53,7 +53,7 @@ _unit setVariable [QGVAR(releaseActionID), [
 ] call EFUNC(common,addActionEventHandler)];
 
 // Add anim changed EH
-[_unit, "AnimChanged", FUNC(handleAnimChanged), [_unit]] call CBA_fnc_addBISEventHandler;
+[_unit, "AnimChanged", LINKFUNC(handleAnimChanged), [_unit]] call CBA_fnc_addBISEventHandler;
 
 // Prevent UAVs from firing
 private _UAVCrew = _target call EFUNC(common,getVehicleUAVCrew);
@@ -67,4 +67,4 @@ if (_UAVCrew isNotEqualTo []) then {
 };
 
 // Check everything
-[FUNC(carryObjectPFH), 0.5, [_unit, _target, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(carryObjectPFH), 0.5, [_unit, _target, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/dragging/functions/fnc_dragObject.sqf b/addons/dragging/functions/fnc_dragObject.sqf
index a0cbfd2528..5116f440b3 100644
--- a/addons/dragging/functions/fnc_dragObject.sqf
+++ b/addons/dragging/functions/fnc_dragObject.sqf
@@ -66,7 +66,7 @@ if (!GVAR(dragAndFire)) then {
 };
 
 // Add anim changed EH
-[_unit, "AnimChanged", FUNC(handleAnimChanged), [_unit]] call CBA_fnc_addBISEventHandler;
+[_unit, "AnimChanged", LINKFUNC(handleAnimChanged), [_unit]] call CBA_fnc_addBISEventHandler;
 
 // Prevent UAVs from firing
 private _UAVCrew = _target call EFUNC(common,getVehicleUAVCrew);
@@ -80,7 +80,7 @@ if (_UAVCrew isNotEqualTo []) then {
 };
 
 // Check everything
-[FUNC(dragObjectPFH), 0.5, [_unit, _target, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(dragObjectPFH), 0.5, [_unit, _target, CBA_missionTime]] call CBA_fnc_addPerFrameHandler;
 
 // Fixes not being able to move when in combat pace
 [_unit, "forceWalk", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
diff --git a/addons/dragging/functions/fnc_startCarryLocal.sqf b/addons/dragging/functions/fnc_startCarryLocal.sqf
index f4fec17c74..6ba2c68934 100644
--- a/addons/dragging/functions/fnc_startCarryLocal.sqf
+++ b/addons/dragging/functions/fnc_startCarryLocal.sqf
@@ -84,7 +84,7 @@ _unit setVariable [QGVAR(isCarrying), true, true];
 // Required for aborting animation
 _unit setVariable [QGVAR(carriedObject), _target, true];
 
-[FUNC(startCarryPFH), 0.2, [_unit, _target, _timer]] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(startCarryPFH), 0.2, [_unit, _target, _timer]] call CBA_fnc_addPerFrameHandler;
 
 // Disable collisions by setting the PhysX mass to almost zero
 private _mass = getMass _target;
diff --git a/addons/dragging/functions/fnc_startDragLocal.sqf b/addons/dragging/functions/fnc_startDragLocal.sqf
index d11b606819..22c7cecd24 100644
--- a/addons/dragging/functions/fnc_startDragLocal.sqf
+++ b/addons/dragging/functions/fnc_startDragLocal.sqf
@@ -96,7 +96,7 @@ if (_target isKindOf "CAManBase") then {
 // Prevents dragging and carrying at the same time
 _unit setVariable [QGVAR(isDragging), true, true];
 
-[FUNC(startDragPFH), 0.2, [_unit, _target, CBA_missionTime + 5]] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(startDragPFH), 0.2, [_unit, _target, CBA_missionTime + 5]] call CBA_fnc_addPerFrameHandler;
 
 // Disable collisions by setting the physx mass to almost zero
 private _mass = getMass _target;
diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf
index 6c32bb0563..81ab1b5406 100644
--- a/addons/explosives/XEH_postInit.sqf
+++ b/addons/explosives/XEH_postInit.sqf
@@ -27,7 +27,7 @@
         };
     };
 }] call CBA_fnc_addEventHandler;
-[QGVAR(startDefuse), FUNC(startDefuse)] call CBA_fnc_addEventHandler;
+[QGVAR(startDefuse), LINKFUNC(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_dialPhone.sqf b/addons/explosives/functions/fnc_dialPhone.sqf
index 860f7ddfde..f0609e2b0d 100644
--- a/addons/explosives/functions/fnc_dialPhone.sqf
+++ b/addons/explosives/functions/fnc_dialPhone.sqf
@@ -30,7 +30,7 @@ for "_i" from 1 to _ran do {
 };
 if (_unit == ace_player) then {
     ctrlSetText [1400,"Calling"];
-    [FUNC(dialingPhone), 0.25, [_unit,4,_arr,_code]] call CALLSTACK(CBA_fnc_addPerFrameHandler);
+    [LINKFUNC(dialingPhone), 0.25, [_unit,4,_arr,_code]] call CALLSTACK(CBA_fnc_addPerFrameHandler);
 } else {
     private _explosive = [_code] call FUNC(getSpeedDialExplosive);
     if ((count _explosive) > 0) then {
diff --git a/addons/fastroping/XEH_postInit.sqf b/addons/fastroping/XEH_postInit.sqf
index 27d3ca4008..650b277dbf 100644
--- a/addons/fastroping/XEH_postInit.sqf
+++ b/addons/fastroping/XEH_postInit.sqf
@@ -1,11 +1,9 @@
 #include "script_component.hpp"
 
-[QGVAR(deployRopes), {
-    _this call FUNC(deployRopes);
-}] call CBA_fnc_addEventHandler;
+[QGVAR(deployRopes), LINKFUNC(deployRopes)] call CBA_fnc_addEventHandler;
 
 [QGVAR(startFastRope), {
-    [FUNC(fastRopeServerPFH), 0, _this] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(fastRopeServerPFH), 0, _this] call CBA_fnc_addPerFrameHandler;
 }] call CBA_fnc_addEventHandler;
 
 // Keybinds
diff --git a/addons/fastroping/functions/fnc_fastRope.sqf b/addons/fastroping/functions/fnc_fastRope.sqf
index 80be870553..430c8d86ca 100644
--- a/addons/fastroping/functions/fnc_fastRope.sqf
+++ b/addons/fastroping/functions/fnc_fastRope.sqf
@@ -36,4 +36,4 @@ _vehicle setVariable [QGVAR(deployedRopes), _deployedRopes, true];
 //Start server PFH asap
 [QGVAR(startFastRope), [_unit, _vehicle, _usableRope, _usableRopeIndex, false]] call CBA_fnc_serverEvent;
 moveOut _unit;
-[FUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, diag_tickTime]] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(fastRopeLocalPFH), 0, [_unit, _vehicle, _usableRope, _usableRopeIndex, diag_tickTime]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/fcs/functions/fnc_firedEH.sqf b/addons/fcs/functions/fnc_firedEH.sqf
index 52edd6417f..e99416593a 100644
--- a/addons/fcs/functions/fnc_firedEH.sqf
+++ b/addons/fcs/functions/fnc_firedEH.sqf
@@ -72,5 +72,5 @@ if (getNumber (configFile >> "CfgAmmo" >> _ammo >> QGVAR(Airburst)) == 1) then {
     if (_zeroing < 50) exitWith {};
     if (_zeroing > 1500) exitWith {};
 
-    [FUNC(handleAirBurstAmmunitionPFH), 0, [_vehicle, _projectile, _zeroing]] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(handleAirBurstAmmunitionPFH), 0, [_vehicle, _projectile, _zeroing]] call CBA_fnc_addPerFrameHandler;
 };
diff --git a/addons/field_rations/XEH_postInit.sqf b/addons/field_rations/XEH_postInit.sqf
index 1ee235ca4f..9f64379094 100644
--- a/addons/field_rations/XEH_postInit.sqf
+++ b/addons/field_rations/XEH_postInit.sqf
@@ -96,7 +96,7 @@ if !(hasInterface) exitWith {};
     ] call CBA_fnc_addItemContextMenuOption;
 
     // Add water source helpers when interaction menu is opened
-    ["ace_interactMenuOpened", {call FUNC(addWaterSourceInteractions)}] call CBA_fnc_addEventHandler;
+    ["ace_interactMenuOpened", LINKFUNC(addWaterSourceInteractions)] call CBA_fnc_addEventHandler;
 
     // Add status modifiers
     if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
@@ -134,7 +134,7 @@ if !(hasInterface) exitWith {};
     ["CAManBase", "respawn", LINKFUNC(handleRespawn)] call CBA_fnc_addClassEventHandler;
 
     // Start update loop
-    [FUNC(update), CBA_missionTime + MP_SYNC_INTERVAL, 1] call CBA_fnc_waitAndExecute;
+    [LINKFUNC(update), CBA_missionTime + MP_SYNC_INTERVAL, 1] call CBA_fnc_waitAndExecute;
 
     #ifdef DEBUG_MODE_FULL
         ["ACE_player thirst", {ACE_player getVariable [QXGVAR(thirst), 0]}, [true, 0, 100]] call EFUNC(common,watchVariable);
diff --git a/addons/field_rations/functions/fnc_update.sqf b/addons/field_rations/functions/fnc_update.sqf
index 82b87bcfb6..f66573824b 100644
--- a/addons/field_rations/functions/fnc_update.sqf
+++ b/addons/field_rations/functions/fnc_update.sqf
@@ -25,7 +25,7 @@ private _player = ACE_player;
 
 // Exit if player is not alive or a virtual unit
 if (!alive _player || {_player isKindOf "VirtualMan_F"}) exitWith {
-    [FUNC(update), _nextMpSync, 1] call CBA_fnc_waitAndExecute;
+    [LINKFUNC(update), _nextMpSync, 1] call CBA_fnc_waitAndExecute;
     QGVAR(hud) cutFadeOut 0.5;
 };
 
@@ -73,4 +73,4 @@ if (!EGVAR(common,OldIsCamera) && {_thirst > XGVAR(hudShowLevel) || {_hunger > X
     QGVAR(hud) cutFadeOut 0.5;
 };
 
-[FUNC(update), _nextMpSync, 1] call CBA_fnc_waitAndExecute;
+[LINKFUNC(update), _nextMpSync, 1] call CBA_fnc_waitAndExecute;
diff --git a/addons/finger/XEH_postInit.sqf b/addons/finger/XEH_postInit.sqf
index 641c94ff92..6a44a5ae79 100644
--- a/addons/finger/XEH_postInit.sqf
+++ b/addons/finger/XEH_postInit.sqf
@@ -11,7 +11,7 @@ if (!hasInterface) exitWith {};
     GVAR(fingersHash) = createHashMap;
     GVAR(pfeh_id) = -1;
 
-    [QGVAR(fingered), {_this call FUNC(incomingFinger)}] call CBA_fnc_addEventHandler;
+    [QGVAR(fingered), LINKFUNC(incomingFinger)] call CBA_fnc_addEventHandler;
 }] call CBA_fnc_addEventHandler;
 
 //Add Keybind:
diff --git a/addons/fire/XEH_postInit.sqf b/addons/fire/XEH_postInit.sqf
index ec40646ca9..571c0033d9 100644
--- a/addons/fire/XEH_postInit.sqf
+++ b/addons/fire/XEH_postInit.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 
-[QGVAR(burn), FUNC(burn)] call CBA_fnc_addEventHandler;
+[QGVAR(burn), LINKFUNC(burn)] call CBA_fnc_addEventHandler;
 [QGVAR(playScream), {
     params ["_scream", "_source"];
     // only play sound if enabled in settings and enabled for the unit
@@ -31,7 +31,7 @@
             [GVAR(fireSources), _key] call CBA_fnc_hashRem;
         }] call CBA_fnc_addEventHandler;
 
-        [{ _this call FUNC(fireManagerPFH) }, FIRE_MANAGER_PFH_DELAY, []] call CBA_fnc_addPerFrameHandler;
+        [LINKFUNC(fireManagerPFH), FIRE_MANAGER_PFH_DELAY, []] call CBA_fnc_addPerFrameHandler;
         GVAR(fireSources) = [[], nil] call CBA_fnc_hashCreate;
     };
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/fire/functions/fnc_burn.sqf b/addons/fire/functions/fnc_burn.sqf
index a98aea9bc8..1d829dfc45 100644
--- a/addons/fire/functions/fnc_burn.sqf
+++ b/addons/fire/functions/fnc_burn.sqf
@@ -244,7 +244,7 @@ if (_isBurning) exitWith {};
 
         private _burnIndicatorPFH = _unit getVariable [QGVAR(burnUIPFH), -1];
         if (_unit isEqualTo ace_player && { _isThisUnitAlive } && { _burnIndicatorPFH < 0 }) then {
-            _burnIndicatorPFH = [FUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
+            _burnIndicatorPFH = [LINKFUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
             _unit setVariable [QGVAR(burnUIPFH), _burnIndicatorPFH];
         };
     };
@@ -296,7 +296,7 @@ if (_isBurning) exitWith {};
 
     if (local _unit) then {
         if (_unit isEqualTo ace_player) then {
-            private _burnIndicatorPFH = [FUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
+            private _burnIndicatorPFH = [LINKFUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
             _unit setVariable [QGVAR(burnUIPFH), _burnIndicatorPFH];
         };
 
diff --git a/addons/frag/XEH_postInit.sqf b/addons/frag/XEH_postInit.sqf
index ecebd793ce..096b4dde97 100644
--- a/addons/frag/XEH_postInit.sqf
+++ b/addons/frag/XEH_postInit.sqf
@@ -2,7 +2,7 @@
 
 if (isServer) then {
     GVAR(lastFragTime) = -1;
-    [QGVAR(frag_eh), {_this call FUNC(frago);}] call CBA_fnc_addEventHandler;
+    [QGVAR(frag_eh), LINKFUNC(frago)] call CBA_fnc_addEventHandler;
 };
 
 ["CBA_settingsInitialized", {
diff --git a/addons/frag/functions/fnc_doReflections.sqf b/addons/frag/functions/fnc_doReflections.sqf
index 023a283e81..70c7471181 100644
--- a/addons/frag/functions/fnc_doReflections.sqf
+++ b/addons/frag/functions/fnc_doReflections.sqf
@@ -22,5 +22,5 @@ if (_depth <= 2) then {
     private _indirectHitRange = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHitRange");
     private _indirectHit = getNumber(configFile >> "CfgAmmo" >> _ammo >> "indirectHit");
     private _testParams = [_pos, [_indirectHitRange, _indirectHit], [], [], -4, _depth, 0];
-    [DFUNC(findReflections), 0, _testParams] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(findReflections), 0, _testParams] call CBA_fnc_addPerFrameHandler;
 };
diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf
index 7700d4cc81..e5a6bf5d1c 100644
--- a/addons/goggles/XEH_postInit.sqf
+++ b/addons/goggles/XEH_postInit.sqf
@@ -88,10 +88,10 @@ if (!hasInterface) exitWith {};
     if (GVAR(effects) in [2, 3]) then {
 
         // Register fire event handler
-        ["ace_firedPlayer", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
+        ["ace_firedPlayer", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
 
         //Add Explosion XEH
-        ["CAManBase", "explosion", FUNC(handleExplosion)] call CBA_fnc_addClassEventHandler;
+        ["CAManBase", "explosion", LINKFUNC(handleExplosion)] call CBA_fnc_addClassEventHandler;
 
         GVAR(PostProcessEyes) = ppEffectCreate ["ColorCorrections", 1992];
         GVAR(PostProcessEyes) ppEffectAdjust [1, 1, 0, [0, 0, 0, 0], [0, 0, 0, 1], [1, 1, 1, 0]];
diff --git a/addons/grenades/XEH_postInit.sqf b/addons/grenades/XEH_postInit.sqf
index 7f67e181cc..c23640bca5 100644
--- a/addons/grenades/XEH_postInit.sqf
+++ b/addons/grenades/XEH_postInit.sqf
@@ -2,12 +2,12 @@
 
 #include "script_component.hpp"
 
-["ace_flashbangExploded", {_this call FUNC(flashbangExplosionEH)}] call CBA_fnc_addEventHandler;
+["ace_flashbangExploded", LINKFUNC(flashbangExplosionEH)] call CBA_fnc_addEventHandler;
 
 // Register fired event handlers
-["ace_firedPlayer", DFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
-["ace_firedPlayerNonLocal", DFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
-["ace_firedNonPlayer", DFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
+["ace_firedPlayer", LINKFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
+["ace_firedPlayerNonLocal", LINKFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
+["ace_firedNonPlayer", LINKFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
 
 if (!hasInterface) exitWith {};
 
diff --git a/addons/headless/XEH_postInit.sqf b/addons/headless/XEH_postInit.sqf
index 103d5c1834..63c7fd5038 100644
--- a/addons/headless/XEH_postInit.sqf
+++ b/addons/headless/XEH_postInit.sqf
@@ -6,7 +6,7 @@
         if (isServer) then {
             // Request rebalance on any unit spawn (only if distribution enabled)
             if (XGVAR(enabled)) then {
-                ["AllVehicles", "initPost", FUNC(handleSpawn), nil, nil, true] call CBA_fnc_addClassEventHandler;
+                ["AllVehicles", "initPost", LINKFUNC(handleSpawn), nil, nil, true] call CBA_fnc_addClassEventHandler;
             };
             // Add disconnect EH
             addMissionEventHandler ["HandleDisconnect", {call FUNC(handleDisconnect)}];
diff --git a/addons/headless/XEH_preInit.sqf b/addons/headless/XEH_preInit.sqf
index bd64702f5c..d3b2c8ff5c 100644
--- a/addons/headless/XEH_preInit.sqf
+++ b/addons/headless/XEH_preInit.sqf
@@ -13,7 +13,7 @@ if (isServer) then {
     GVAR(inRebalance) = false;
     GVAR(endMissionCheckDelayed) = false;
     GVAR(blacklistType) = [BLACKLIST_UAV];
-    [QXGVAR(headlessClientJoined), FUNC(handleConnectHC)] call CBA_fnc_addEventHandler;
+    [QXGVAR(headlessClientJoined), LINKFUNC(handleConnectHC)] call CBA_fnc_addEventHandler;
 };
 
 ADDON = true;
diff --git a/addons/intelitems/XEH_preInit.sqf b/addons/intelitems/XEH_preInit.sqf
index 76f13135d9..ff09f6ea0e 100644
--- a/addons/intelitems/XEH_preInit.sqf
+++ b/addons/intelitems/XEH_preInit.sqf
@@ -18,8 +18,8 @@ if (isServer) then {
     GVAR(intelData) = [true] call CBA_fnc_createNamespace;
     publicVariable QGVAR(intelData);
 
-    [QGVAR(handleMagIndex), FUNC(handleMagIndex)] call CBA_fnc_addEventHandler;
-    [QGVAR(setObjectData), FUNC(setObjectData)] call CBA_fnc_addEventHandler;
+    [QGVAR(handleMagIndex), LINKFUNC(handleMagIndex)] call CBA_fnc_addEventHandler;
+    [QGVAR(setObjectData), LINKFUNC(setObjectData)] call CBA_fnc_addEventHandler;
 };
 
 if (hasInterface) then {
diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf
index a76bf90e1c..5c9a2ecae0 100644
--- a/addons/interact_menu/XEH_clientInit.sqf
+++ b/addons/interact_menu/XEH_clientInit.sqf
@@ -47,7 +47,7 @@ GVAR(ParsedTextCached) = [];
 }] call CBA_fnc_addEventHandler;
 
 //Add Actions to Houses:
-["ace_interactMenuOpened", {_this call FUNC(userActions_addHouseActions)}] call CBA_fnc_addEventHandler;
+["ace_interactMenuOpened", LINKFUNC(userActions_addHouseActions)] call CBA_fnc_addEventHandler;
 
 ["ACE3 Common", QGVAR(InteractKey), (localize LSTRING(InteractKey)),
 {
diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf
index b60f1bb745..bf3278f0a3 100644
--- a/addons/interact_menu/XEH_preInit.sqf
+++ b/addons/interact_menu/XEH_preInit.sqf
@@ -10,7 +10,7 @@ PREP_RECOMPILE_END;
 
 if (!hasInterface) exitWith { ADDON = true; };
 
-["All", "init", {_this call FUNC(compileMenu)}] call CBA_fnc_addClassEventHandler;
+["All", "init", LINKFUNC(compileMenu)] call CBA_fnc_addClassEventHandler;
 
 GVAR(ActNamespace) = [] call CBA_fnc_createNamespace;
 GVAR(ActSelfNamespace) = [] call CBA_fnc_createNamespace;
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index a5f7170588..0b32daaaf0 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -78,7 +78,7 @@ ACE_Modifier = 0;
 }] call CBA_fnc_addEventHandler;
 
 if (isServer) then {
-    [QGVAR(replaceTerrainObject), FUNC(replaceTerrainObject)] call CBA_fnc_addEventHandler;
+    [QGVAR(replaceTerrainObject), LINKFUNC(replaceTerrainObject)] call CBA_fnc_addEventHandler;
 };
 
 if (!hasInterface) exitWith {};
diff --git a/addons/irlight/XEH_postInit.sqf b/addons/irlight/XEH_postInit.sqf
index 47763b8414..d95186f07b 100644
--- a/addons/irlight/XEH_postInit.sqf
+++ b/addons/irlight/XEH_postInit.sqf
@@ -2,7 +2,7 @@
 
 [] call FUNC(initItemContextMenu);
 
-addUserActionEventHandler ["headlights", "Deactivate", FUNC(onLightToggled)];
+addUserActionEventHandler ["headlights", "Deactivate", LINKFUNC(onLightToggled)];
 
 ["ACE3 Equipment", QGVAR(hold), LLSTRING(MomentarySwitch), {
     ACE_player action ["GunLightOn", ACE_player];
diff --git a/addons/laser/functions/fnc_addLaserTarget.sqf b/addons/laser/functions/fnc_addLaserTarget.sqf
index 08ea6f65b0..3fc02b2189 100644
--- a/addons/laser/functions/fnc_addLaserTarget.sqf
+++ b/addons/laser/functions/fnc_addLaserTarget.sqf
@@ -55,5 +55,5 @@ TRACE_1("",GVAR(trackedLaserTargets));
 
 if (GVAR(pfehID) == -1) then {
     TRACE_1("starting pfeh",count GVAR(trackedLaserTargets));
-    GVAR(pfehID) = [DFUNC(laserTargetPFH), 0, []] call CBA_fnc_addPerFrameHandler;
+    GVAR(pfehID) = [LINKFUNC(laserTargetPFH), 0, []] call CBA_fnc_addPerFrameHandler;
 };
diff --git a/addons/logistics_wirecutter/XEH_postInit.sqf b/addons/logistics_wirecutter/XEH_postInit.sqf
index 29dc506396..fc0a38bf26 100644
--- a/addons/logistics_wirecutter/XEH_postInit.sqf
+++ b/addons/logistics_wirecutter/XEH_postInit.sqf
@@ -1,11 +1,11 @@
 #include "script_component.hpp"
 
 if (hasInterface) then {
-    ["ace_interactMenuOpened", {_this call FUNC(interactEH)}] call CBA_fnc_addEventHandler;
+    ["ace_interactMenuOpened", LINKFUNC(interactEH)] call CBA_fnc_addEventHandler;
 };
 
 if (isServer) then {
-    [QGVAR(destroyFence), {_this call FUNC(destroyFence)}] call CBA_fnc_addEventHandler;
+    [QGVAR(destroyFence), LINKFUNC(destroyFence)] call CBA_fnc_addEventHandler;
 };
 
 GVAR(possibleWirecutters) = call (uiNamespace getVariable [QGVAR(possibleWirecutters), {[]}]);
diff --git a/addons/map/initSettings.inc.sqf b/addons/map/initSettings.inc.sqf
index fa248bf736..8de301eaa1 100644
--- a/addons/map/initSettings.inc.sqf
+++ b/addons/map/initSettings.inc.sqf
@@ -71,7 +71,7 @@
 
         if (GVAR(BFT_Enabled) && {isNil QGVAR(BFT_markers)}) then {
             GVAR(BFT_markers) = [];
-            [FUNC(blueForceTrackingUpdate), GVAR(BFT_Interval), []] call CBA_fnc_addPerFrameHandler;
+            [LINKFUNC(blueForceTrackingUpdate), GVAR(BFT_Interval), []] call CBA_fnc_addPerFrameHandler;
         };
     },
     false
diff --git a/addons/markers/XEH_postInit.sqf b/addons/markers/XEH_postInit.sqf
index 43a1acbf29..1ae489dd82 100644
--- a/addons/markers/XEH_postInit.sqf
+++ b/addons/markers/XEH_postInit.sqf
@@ -2,10 +2,10 @@
 #include "script_component.hpp"
 
 // recieve remote marker data
-[QGVAR(setMarkerNetwork), {_this call DFUNC(setMarkerNetwork)}] call CBA_fnc_addEventHandler;
+[QGVAR(setMarkerNetwork), LINKFUNC(setMarkerNetwork)] call CBA_fnc_addEventHandler;
 
 // recieve marker data for JIP
-[QGVAR(setMarkerJIP), {_this call DFUNC(setMarkerJIP)}] call CBA_fnc_addEventHandler;
+[QGVAR(setMarkerJIP), LINKFUNC(setMarkerJIP)] call CBA_fnc_addEventHandler;
 
 // request marker data for JIP
 if (isMultiplayer && {!isServer} && {hasInterface}) then {
diff --git a/addons/markers/functions/fnc_onMouseButtonDown.sqf b/addons/markers/functions/fnc_onMouseButtonDown.sqf
index ce4d637400..f0130c7c9d 100644
--- a/addons/markers/functions/fnc_onMouseButtonDown.sqf
+++ b/addons/markers/functions/fnc_onMouseButtonDown.sqf
@@ -37,5 +37,5 @@ if (_type == "marker" && {_marker find "_USER_DEFINED" != -1 && {_marker call FU
 
     GVAR(moving) = true;
     _marker setMarkerAlphaLocal 0.5;
-    [FUNC(movePFH), 0, [_marker, _ctrlMap, _originalPos, _originalAlpha]] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(movePFH), 0, [_marker, _ctrlMap, _originalPos, _originalAlpha]] call CBA_fnc_addPerFrameHandler;
 };
diff --git a/addons/medical_blood/XEH_postInit.sqf b/addons/medical_blood/XEH_postInit.sqf
index 9ef55adf0e..daf4595584 100644
--- a/addons/medical_blood/XEH_postInit.sqf
+++ b/addons/medical_blood/XEH_postInit.sqf
@@ -3,7 +3,7 @@
 GVAR(useAceMedical) = ["ace_medical"] call EFUNC(common,isModLoaded);
 
 // To support public API regardless of component settings
-[QGVAR(spurt), FUNC(spurt)] call CBA_fnc_addEventHandler;
+[QGVAR(spurt), LINKFUNC(spurt)] call CBA_fnc_addEventHandler;
 
 if (isServer) then {
     GVAR(bloodDrops) = [];
@@ -21,7 +21,7 @@ if (isServer) then {
 
         // Start the cleanup loop
         if (_index == 0) then {
-            [FUNC(cleanupLoop), [], GVAR(bloodLifetime)] call CBA_fnc_waitAndExecute;
+            [LINKFUNC(cleanupLoop), [], GVAR(bloodLifetime)] call CBA_fnc_waitAndExecute;
         };
     }] call CBA_fnc_addEventHandler;
 };
diff --git a/addons/medical_blood/functions/fnc_init.sqf b/addons/medical_blood/functions/fnc_init.sqf
index 86c0c668c1..6392a6e451 100644
--- a/addons/medical_blood/functions/fnc_init.sqf
+++ b/addons/medical_blood/functions/fnc_init.sqf
@@ -60,6 +60,6 @@ private _listCode = if (_mode == BLOOD_ONLY_PLAYERS) then {
 GVAR(stateMachine) = [_listCode, true] call CBA_statemachine_fnc_create;
 [GVAR(stateMachine), LINKFUNC(onBleeding), {}, {}, "Bleeding"] call CBA_statemachine_fnc_addState;
 
-GVAR(woundReceivedEH) = [QEGVAR(medical,woundReceived), FUNC(handleWoundReceived)] call CBA_fnc_addEventHandler;
+GVAR(woundReceivedEH) = [QEGVAR(medical,woundReceived), LINKFUNC(handleWoundReceived)] call CBA_fnc_addEventHandler;
 
 TRACE_3("Set up state machine and wounds event",_mode,GVAR(stateMachine),GVAR(woundReceivedEH));
diff --git a/addons/medical_feedback/XEH_postInit.sqf b/addons/medical_feedback/XEH_postInit.sqf
index fbbf57cb65..f01394e919 100644
--- a/addons/medical_feedback/XEH_postInit.sqf
+++ b/addons/medical_feedback/XEH_postInit.sqf
@@ -30,7 +30,7 @@ GVAR(bloodTickCounter) = 0;
 
 [false] call FUNC(initEffects);
 [true] call FUNC(handleEffects);
-[FUNC(handleEffects), 1, false] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(handleEffects), 1, false] call CBA_fnc_addPerFrameHandler;
 
 ["ace_unconscious", {
     params ["_unit", "_unconscious"];
diff --git a/addons/medical_gui/functions/fnc_onMenuOpen.sqf b/addons/medical_gui/functions/fnc_onMenuOpen.sqf
index e77d92bddd..12b27b60d9 100644
--- a/addons/medical_gui/functions/fnc_onMenuOpen.sqf
+++ b/addons/medical_gui/functions/fnc_onMenuOpen.sqf
@@ -41,7 +41,7 @@ if (GVAR(menuPFH) != -1) exitWith {
     TRACE_1("Menu PFH already running",GVAR(menuPFH));
 };
 
-GVAR(menuPFH) = [FUNC(menuPFH), 0, []] call CBA_fnc_addPerFrameHandler;
+GVAR(menuPFH) = [LINKFUNC(menuPFH), 0, []] call CBA_fnc_addPerFrameHandler;
 
 // Hide categories if they don't have any actions (airway)
 private _list = [
diff --git a/addons/microdagr/XEH_clientInit.sqf b/addons/microdagr/XEH_clientInit.sqf
index 8a5db92e0b..c17914ad4b 100644
--- a/addons/microdagr/XEH_clientInit.sqf
+++ b/addons/microdagr/XEH_clientInit.sqf
@@ -35,7 +35,7 @@ private _closeCode = {
 }, ""] call CBA_fnc_addKeybind;
 
 //Add Eventhandler:
-[QEGVAR(vector,rangefinderData), {_this call FUNC(recieveRangefinderData)}] call CBA_fnc_addEventHandler;
+[QEGVAR(vector,rangefinderData), LINKFUNC(recieveRangefinderData)] call CBA_fnc_addEventHandler;
 
 //Global Variables to default:
 GVAR(gpsPositionASL) = [0,0,0];
diff --git a/addons/minedetector/XEH_postInit.sqf b/addons/minedetector/XEH_postInit.sqf
index 0b8a521155..77f2f6761c 100644
--- a/addons/minedetector/XEH_postInit.sqf
+++ b/addons/minedetector/XEH_postInit.sqf
@@ -12,8 +12,8 @@ private _detectableClasses = call (uiNamespace getVariable [QGVAR(detectableClas
 } forEach _detectableClasses;
 TRACE_1("built cache",count allVariables GVAR(detectableClasses));
 
-[QGVAR(enableDetector), FUNC(enableDetector)] call CBA_fnc_addEventHandler;
-[QGVAR(disableDetector), FUNC(disableDetector)] call CBA_fnc_addEventHandler;
+[QGVAR(enableDetector), LINKFUNC(enableDetector)] call CBA_fnc_addEventHandler;
+[QGVAR(disableDetector), LINKFUNC(disableDetector)] call CBA_fnc_addEventHandler;
 
 // Shows detector and mine posistions in 3d when debug is on
 #ifdef DEBUG_MODE_FULL
diff --git a/addons/minedetector/functions/fnc_enableDetector.sqf b/addons/minedetector/functions/fnc_enableDetector.sqf
index b673176086..55b58dcf3a 100644
--- a/addons/minedetector/functions/fnc_enableDetector.sqf
+++ b/addons/minedetector/functions/fnc_enableDetector.sqf
@@ -31,4 +31,4 @@ if (_unit == ACE_player) then {
 [QGVAR(detectorEnabled), [_unit, _detectorType]] call CBA_fnc_localEvent;
 
 private _config = [_detectorType] call FUNC(getDetectorConfig);
-[FUNC(detectorLoop), 0.05, [_unit, _detectorType, _config, CBA_missionTime - 0.25]] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(detectorLoop), 0.05, [_unit, _detectorType, _config, CBA_missionTime - 0.25]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/missileguidance/XEH_postInit.sqf b/addons/missileguidance/XEH_postInit.sqf
index cc09b1f0ac..eb0fb60abf 100644
--- a/addons/missileguidance/XEH_postInit.sqf
+++ b/addons/missileguidance/XEH_postInit.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 
-[QGVAR(handoff), {_this call FUNC(handleHandoff)}] call CBA_fnc_addEventHandler;
+[QGVAR(handoff), LINKFUNC(handleHandoff)] call CBA_fnc_addEventHandler;
 
 ["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode),
 {
diff --git a/addons/missileguidance/functions/fnc_handleHandoff.sqf b/addons/missileguidance/functions/fnc_handleHandoff.sqf
index 9c6e299d01..785071da01 100644
--- a/addons/missileguidance/functions/fnc_handleHandoff.sqf
+++ b/addons/missileguidance/functions/fnc_handleHandoff.sqf
@@ -19,4 +19,4 @@ params ["_target", "_args"];
 
 if (isNil "_target" || {isNull _target} || {!local _target} ) exitWith { false };
 
-[FUNC(guidancePFH), 0, _args] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(guidancePFH), 0, _args] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf
index 1f3519f8c9..18eaf2a7c7 100644
--- a/addons/missileguidance/functions/fnc_onFired.sqf
+++ b/addons/missileguidance/functions/fnc_onFired.sqf
@@ -145,7 +145,7 @@ if (_onFiredFunc != "") then {
 //      _stateParams params ["_lastRunTime", "_seekerStateParams", "_attackProfileStateParams", "_lastKnownPosState"];
 //      _seekerParams params ["_seekerAngle", "_seekerAccuracy", "_seekerMaxRange", "_seekerMinRange"];
 
-[FUNC(guidancePFH), 0, _args ] call CBA_fnc_addPerFrameHandler;
+[LINKFUNC(guidancePFH), 0, _args ] call CBA_fnc_addPerFrameHandler;
 
 
 /* Clears locking settings
diff --git a/addons/mk6mortar/XEH_postInit.sqf b/addons/mk6mortar/XEH_postInit.sqf
index aa5f2774df..280e16cf79 100644
--- a/addons/mk6mortar/XEH_postInit.sqf
+++ b/addons/mk6mortar/XEH_postInit.sqf
@@ -2,16 +2,16 @@
 
 if (hasInterface) then {
     #include "initKeybinds.inc.sqf"
-    ["ace_infoDisplayChanged", FUNC(turretDisplayLoaded)] call CBA_fnc_addEventHandler;
+    ["ace_infoDisplayChanged", LINKFUNC(turretDisplayLoaded)] call CBA_fnc_addEventHandler;
 };
 
 ["CBA_settingsInitialized", {
     TRACE_4("CBA_settingsInitialized",GVAR(airResistanceEnabled),GVAR(allowComputerRangefinder),GVAR(allowCompass),GVAR(useAmmoHandling));
 
-    ["vehicle", FUNC(handlePlayerVehicleChanged), true] call CBA_fnc_addPlayerEventHandler;
+    ["vehicle", LINKFUNC(handlePlayerVehicleChanged), true] call CBA_fnc_addPlayerEventHandler;
 
     if (!GVAR(airResistanceEnabled)) exitWith {};
     if (EGVAR(artillerytables,advancedCorrections)) exitWith { TRACE_1("defer firedEH to artillerytables",_this); };
-    ["Mortar_01_base_F", "fired", {call FUNC(handleFired)}] call CBA_fnc_addClassEventHandler;
 
+    ["Mortar_01_base_F", "fired", LINKFUNC(handleFired)] call CBA_fnc_addClassEventHandler;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/movement/XEH_postInit.sqf b/addons/movement/XEH_postInit.sqf
index f64b92603b..4d7cc5ba12 100644
--- a/addons/movement/XEH_postInit.sqf
+++ b/addons/movement/XEH_postInit.sqf
@@ -3,8 +3,8 @@
 
 if (!hasInterface) exitWith {};
 
-["unit", FUNC(handleVirtualMass)] call CBA_fnc_addPlayerEventHandler;
-["loadout", FUNC(handleVirtualMass)] call CBA_fnc_addPlayerEventHandler;
+["unit", LINKFUNC(handleVirtualMass)] call CBA_fnc_addPlayerEventHandler;
+["loadout", LINKFUNC(handleVirtualMass)] call CBA_fnc_addPlayerEventHandler;
 
 ["ACE3 Movement", QGVAR(climb), localize LSTRING(Climb), {
     // Conditions: canInteract
diff --git a/addons/optics/XEH_postInit.sqf b/addons/optics/XEH_postInit.sqf
index abb97e5b5d..1641ee2174 100644
--- a/addons/optics/XEH_postInit.sqf
+++ b/addons/optics/XEH_postInit.sqf
@@ -28,4 +28,4 @@ GVAR(camera) = objNull;
 }] call CBA_fnc_addPlayerEventHandler;
 
 // Register fire event handler
-["ace_firedPlayer", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
+["ace_firedPlayer", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf
index 8f02d734e5..a49030b1ad 100644
--- a/addons/overheating/XEH_postInit.sqf
+++ b/addons/overheating/XEH_postInit.sqf
@@ -35,8 +35,8 @@ if (hasInterface) then {
         GVAR(storedSpareBarrels) = createHashMap;
 
         // Install event handlers for spare barrels
-        [QGVAR(sendSpareBarrelTemperatureHint), FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
-        [QGVAR(loadCoolestSpareBarrel), FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler;
+        [QGVAR(sendSpareBarrelTemperatureHint), LINKFUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
+        [QGVAR(loadCoolestSpareBarrel), LINKFUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler;
 
         // Schedule cool down calculation of stored spare barrels
         [] call FUNC(updateSpareBarrelsTemperaturesThread);
@@ -50,14 +50,14 @@ if (hasInterface) then {
 
     //Add Take EH if required
     if (GVAR(unJamOnReload) || {GVAR(cookoffCoef) > 0}) then {
-        ["CAManBase", "Take", {_this call FUNC(handleTakeEH);}] call CBA_fnc_addClassEventHandler;
+        ["CAManBase", "Take", LINKFUNC(handleTakeEH)] call CBA_fnc_addClassEventHandler;
     };
 
     // Register fire event handler
-    ["ace_firedPlayer", DFUNC(firedEH)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayer", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
     // Only add eh to non local players if dispersion is enabled
     if (GVAR(overheatingDispersion) || {GVAR(showParticleEffectsForEveryone)}) then {
-        ["ace_firedPlayerNonLocal", DFUNC(firedEH)] call CBA_fnc_addEventHandler;
+        ["ace_firedPlayerNonLocal", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
     };
 
     // Schedule cool down calculation of player weapons at (infrequent) regular intervals
@@ -86,10 +86,10 @@ if (hasInterface) then {
     }] call CBA_fnc_addClassEventHandler;
 
     // Install event handler to display temp when a barrel was swapped
-    [QGVAR(showWeaponTemperature), DFUNC(displayTemperature)] call CBA_fnc_addEventHandler;
+    [QGVAR(showWeaponTemperature), LINKFUNC(displayTemperature)] call CBA_fnc_addEventHandler;
 
     // Install event handler to initiate an assisted barrel swap
-    [QGVAR(initiateSwapBarrelAssisted), DFUNC(swapBarrel)] call CBA_fnc_addEventHandler;
+    [QGVAR(initiateSwapBarrelAssisted), LINKFUNC(swapBarrel)] call CBA_fnc_addEventHandler;
 
     // Add an action to allow hot weapons to be cooled off in AceX Field Rations water sources
     if (["acex_field_rations"] call EFUNC(common,isModLoaded)) then {
diff --git a/addons/parachute/XEH_postInit.sqf b/addons/parachute/XEH_postInit.sqf
index 1217fa3cab..f10748b0cf 100644
--- a/addons/parachute/XEH_postInit.sqf
+++ b/addons/parachute/XEH_postInit.sqf
@@ -34,9 +34,9 @@ if (!hasInterface) exitWith {};
 }, {false}, [24, [false, false, false]], false] call CBA_fnc_addKeybind;
 
 // Handle reserve chute based on current backpack (fires when parachute opens too)
-["loadout", FUNC(handleReserve), true] call CBA_fnc_addPlayerEventHandler;
+["loadout", LINKFUNC(handleReserve), true] call CBA_fnc_addPlayerEventHandler;
 
 // Don't show vanilla speed and height when in expert mode
-["ace_infoDisplayChanged", {_this call FUNC(handleInfoDisplayChanged)}] call CBA_fnc_addEventHandler;
+["ace_infoDisplayChanged", LINKFUNC(handleInfoDisplayChanged)] call CBA_fnc_addEventHandler;
 
-["vehicle", {_this call FUNC(handleFailureChance)}] call CBA_fnc_addPlayerEventHandler;
+["vehicle", LINKFUNC(handleFailureChance)] call CBA_fnc_addPlayerEventHandler;
diff --git a/addons/recoil/XEH_postInit.sqf b/addons/recoil/XEH_postInit.sqf
index 29e5464612..639b22d6f9 100644
--- a/addons/recoil/XEH_postInit.sqf
+++ b/addons/recoil/XEH_postInit.sqf
@@ -1,4 +1,4 @@
 #include "script_component.hpp"
 
 // Register fire event handler
-["ace_firedPlayer", DFUNC(camShake)] call CBA_fnc_addEventHandler;
+["ace_firedPlayer", LINKFUNC(camShake)] call CBA_fnc_addEventHandler;
diff --git a/addons/repair/XEH_postInit.sqf b/addons/repair/XEH_postInit.sqf
index e6bff06936..2e9a9178ff 100644
--- a/addons/repair/XEH_postInit.sqf
+++ b/addons/repair/XEH_postInit.sqf
@@ -4,8 +4,8 @@
 
     if (!GVAR(enabled)) exitWith {};
 
-    [QGVAR(setVehicleDamage), {_this call FUNC(setDamage)}] call CBA_fnc_addEventHandler;
-    [QGVAR(setVehicleHitPointDamage), {_this call FUNC(setHitPointDamage)}] call CBA_fnc_addEventHandler;
+    [QGVAR(setVehicleDamage), LINKFUNC(setDamage)] call CBA_fnc_addEventHandler;
+    [QGVAR(setVehicleHitPointDamage), LINKFUNC(setHitPointDamage)] call CBA_fnc_addEventHandler;
     [QGVAR(setWheelHitPointDamage), {
         params ["_object", "_hitPoint", "_damage"];
         private _damageDisabled = !isDamageAllowed _object;
diff --git a/addons/respawn/XEH_postInit.sqf b/addons/respawn/XEH_postInit.sqf
index 6c1b1e9961..502f5f729f 100644
--- a/addons/respawn/XEH_postInit.sqf
+++ b/addons/respawn/XEH_postInit.sqf
@@ -1,7 +1,7 @@
 // by commy2
 #include "script_component.hpp"
 
-["ace_rallypointMoved", FUNC(updateRallypoint)] call CBA_fnc_addEventHandler;
-["unit", FUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler; // hide enemy rallypoint markers
+["ace_rallypointMoved", LINKFUNC(updateRallypoint)] call CBA_fnc_addEventHandler;
+["unit", LINKFUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler; // hide enemy rallypoint markers
 
-[QGVAR(showFriendlyFireMessageEvent), FUNC(showFriendlyFireMessage)] call CBA_fnc_addEventHandler;
+[QGVAR(showFriendlyFireMessageEvent), LINKFUNC(showFriendlyFireMessage)] call CBA_fnc_addEventHandler;
diff --git a/addons/sandbag/XEH_postInit.sqf b/addons/sandbag/XEH_postInit.sqf
index a03f6076a1..24122aed8e 100644
--- a/addons/sandbag/XEH_postInit.sqf
+++ b/addons/sandbag/XEH_postInit.sqf
@@ -15,11 +15,11 @@ GVAR(deployDirection) = 0;
 ["ace_interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call CBA_fnc_addEventHandler;
 
 // Cancel deploy on player change. This does work when returning to lobby, but not when hard disconnecting.
-["unit", {_this call FUNC(handlePlayerChanged)}] call CBA_fnc_addPlayerEventHandler;
-["loadout", {_this call FUNC(handlePlayerInventoryChanged)}] call CBA_fnc_addPlayerEventHandler;
+["unit", LINKFUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
+["loadout", LINKFUNC(handlePlayerInventoryChanged)] call CBA_fnc_addPlayerEventHandler;
 ["vehicle", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addPlayerEventHandler;
 
 // handle waking up dragged unit and falling unconscious while dragging
-["ace_unconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler;
+["ace_unconscious", LINKFUNC(handleUnconscious)] call CBA_fnc_addEventHandler;
 
 //@todo Captivity?
diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf
index 8c221a4651..9c96281246 100644
--- a/addons/scopes/XEH_postInit.sqf
+++ b/addons/scopes/XEH_postInit.sqf
@@ -24,7 +24,7 @@ GVAR(scopeAdjust) = [[[0,0],0,[0,0],0], [[0,0],0,[0,0],0], [[0,0],0,[0,0],0]];
     };
 
     // Check inventory when it changes
-    ["loadout", FUNC(inventoryCheck), true] call CBA_fnc_addPlayerEventHandler;
+    ["loadout", LINKFUNC(inventoryCheck), true] call CBA_fnc_addPlayerEventHandler;
 
     // Instantly hide knobs when scoping in
     ["cameraView", {
@@ -140,7 +140,7 @@ GVAR(scopeAdjust) = [[[0,0],0,[0,0],0], [[0,0],0,[0,0],0], [[0,0],0,[0,0],0]];
 
 
     // Register fire event handler
-    ["ace_firedPlayer", DFUNC(firedEH)] call CBA_fnc_addEventHandler;
-    ["ace_firedPlayerNonLocal", DFUNC(firedEH)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayer", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayerNonLocal", LINKFUNC(firedEH)] call CBA_fnc_addEventHandler;
 
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/sitting/XEH_clientInit.sqf b/addons/sitting/XEH_clientInit.sqf
index f0b0b7c2f0..5495ef0e97 100644
--- a/addons/sitting/XEH_clientInit.sqf
+++ b/addons/sitting/XEH_clientInit.sqf
@@ -10,7 +10,7 @@ if (!hasInterface) exitWith {};
     if (!XGVAR(enable)) exitWith {};
 
     // Initialize classes as they spawn
-    ["ThingX", "init", FUNC(addSitActions), nil, nil, true] call CBA_fnc_addClassEventHandler;
+    ["ThingX", "init", LINKFUNC(addSitActions), nil, nil, true] call CBA_fnc_addClassEventHandler;
 
     // Initialize statically defined benches (also appear as world objects, no class EH thrown)
     {
@@ -21,6 +21,6 @@ if (!hasInterface) exitWith {};
     ["isNotSitting", {isNil {(_this select 0) getVariable QGVAR(sittingStatus)}}] call EFUNC(common,addCanInteractWithCondition);
 
     // Handle interruptions
-    ["ace_unconscious", {_this call DFUNC(handleInterrupt)}] call CBA_fnc_addEventHandler;
-    ["ace_captives_SetHandcuffed", {_this call DFUNC(handleInterrupt)}] call CBA_fnc_addEventHandler;
+    ["ace_unconscious", LINKFUNC(handleInterrupt)] call CBA_fnc_addEventHandler;
+    ["ace_captives_SetHandcuffed", LINKFUNC(handleInterrupt)] call CBA_fnc_addEventHandler;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/tacticalladder/XEH_postInit.sqf b/addons/tacticalladder/XEH_postInit.sqf
index 1a6f356fb0..c4b25a77ab 100644
--- a/addons/tacticalladder/XEH_postInit.sqf
+++ b/addons/tacticalladder/XEH_postInit.sqf
@@ -17,10 +17,10 @@ GVAR(currentAngle) = 0;
 ["ace_interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call CBA_fnc_addEventHandler;
 
 // Cancel adjusting on player change.
-["unit", FUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
+["unit", LINKFUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
 ["vehicle", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addPlayerEventHandler;
 
 // handle falling unconscious
-["ace_unconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler;
+["ace_unconscious", LINKFUNC(handleUnconscious)] call CBA_fnc_addEventHandler;
 
 // @todo captivity?
diff --git a/addons/tagging/XEH_postInit.sqf b/addons/tagging/XEH_postInit.sqf
index 7fefa5757e..dd46b7fb98 100644
--- a/addons/tagging/XEH_postInit.sqf
+++ b/addons/tagging/XEH_postInit.sqf
@@ -14,7 +14,7 @@ if (hasInterface) then {
     call FUNC(compileConfigTags);
 
     // Scripted tag adding EH
-    [QGVAR(applyCustomTag), FUNC(applyCustomTag)] call CBA_fnc_addEventHandler;
+    [QGVAR(applyCustomTag), LINKFUNC(applyCustomTag)] call CBA_fnc_addEventHandler;
 
     // Keybind
     ["ACE3 Equipment", QGVAR(quickTag), localize LSTRING(QuickTag), {
@@ -32,4 +32,4 @@ if (!isServer) exitWith {};
 GVAR(testingThread) = false;
 GVAR(tagsToTest) = [];
 
-[QGVAR(createTag), DFUNC(createTag)] call CBA_fnc_addEventHandler;
+[QGVAR(createTag), LINKFUNC(createTag)] call CBA_fnc_addEventHandler;
diff --git a/addons/trenches/XEH_postInit.sqf b/addons/trenches/XEH_postInit.sqf
index ea8ff7e24f..59a6fb8a08 100644
--- a/addons/trenches/XEH_postInit.sqf
+++ b/addons/trenches/XEH_postInit.sqf
@@ -27,11 +27,11 @@ GVAR(digDirection) = 0;
 ["ace_interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call CBA_fnc_addEventHandler;
 
 // Cancel dig on player change. This does work when returning to lobby, but not when hard disconnecting.
-["unit", FUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
-["loadout", FUNC(handlePlayerInventoryChanged)] call CBA_fnc_addPlayerEventHandler;
+["unit", LINKFUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
+["loadout", LINKFUNC(handlePlayerInventoryChanged)] call CBA_fnc_addPlayerEventHandler;
 ["vehicle", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addPlayerEventHandler;
 
 // handle waking up dragged unit and falling unconscious while dragging
-["ace_unconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler;
+["ace_unconscious", LINKFUNC(handleUnconscious)] call CBA_fnc_addEventHandler;
 
 //@todo Captivity?
diff --git a/addons/tripod/XEH_postInit.sqf b/addons/tripod/XEH_postInit.sqf
index 9fbfaa6c8d..febd71390b 100644
--- a/addons/tripod/XEH_postInit.sqf
+++ b/addons/tripod/XEH_postInit.sqf
@@ -10,10 +10,10 @@ GVAR(height) = 0.5;
 ["ace_interactMenuOpened", {[ACE_player] call FUNC(handleInteractMenuOpened)}] call CBA_fnc_addEventHandler;
 
 // Cancel adjusting on player change.
-["unit", FUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
+["unit", LINKFUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
 ["vehicle", {[ACE_player, objNull] call FUNC(handlePlayerChanged)}] call CBA_fnc_addPlayerEventHandler;
 
 // handle falling unconscious
-["ace_unconscious", {_this call FUNC(handleUnconscious)}] call CBA_fnc_addEventHandler;
+["ace_unconscious", LINKFUNC(handleUnconscious)] call CBA_fnc_addEventHandler;
 
 // @todo captivity?
diff --git a/addons/ui/XEH_clientInit.sqf b/addons/ui/XEH_clientInit.sqf
index 9a03f0042a..1ef328b176 100644
--- a/addons/ui/XEH_clientInit.sqf
+++ b/addons/ui/XEH_clientInit.sqf
@@ -48,4 +48,4 @@ GVAR(elementsSet) = call CBA_fnc_createNamespace;
     }] call CBA_fnc_addEventHandler;
 }] call CBA_fnc_addEventHandler;
 
-["unit", FUNC(handlePlayerChanged), true] call CBA_fnc_addPlayerEventHandler;
+["unit", LINKFUNC(handlePlayerChanged), true] call CBA_fnc_addPlayerEventHandler;
diff --git a/addons/vector/functions/fnc_onKeyDown.sqf b/addons/vector/functions/fnc_onKeyDown.sqf
index 24a22a5782..082f22e483 100644
--- a/addons/vector/functions/fnc_onKeyDown.sqf
+++ b/addons/vector/functions/fnc_onKeyDown.sqf
@@ -38,7 +38,7 @@ private _fnc_setPFH = {
     };
 
     GVAR(currentMode) = _this;
-    GVAR(holdKeyHandler) = [FUNC(onKeyHold), 0, _this] call CBA_fnc_addPerFrameHandler;
+    GVAR(holdKeyHandler) = [LINKFUNC(onKeyHold), 0, _this] call CBA_fnc_addPerFrameHandler;
 };
 
 switch (_this select 0) do {
diff --git a/addons/vector/functions/fnc_onKeyUp.sqf b/addons/vector/functions/fnc_onKeyUp.sqf
index 11310eb5cf..b660331e65 100644
--- a/addons/vector/functions/fnc_onKeyUp.sqf
+++ b/addons/vector/functions/fnc_onKeyUp.sqf
@@ -22,7 +22,7 @@ private _fnc_setPFH = {
     };
 
     GVAR(currentMode) = _this;//
-    GVAR(holdKeyHandler) = [FUNC(onKeyHold), 0, _this] call CBA_fnc_addPerFrameHandler;
+    GVAR(holdKeyHandler) = [LINKFUNC(onKeyHold), 0, _this] call CBA_fnc_addPerFrameHandler;
 };
 
 switch (_this select 0) do {
diff --git a/addons/vehiclelock/XEH_postInit.sqf b/addons/vehiclelock/XEH_postInit.sqf
index 40afaf32af..d16b47aef5 100644
--- a/addons/vehiclelock/XEH_postInit.sqf
+++ b/addons/vehiclelock/XEH_postInit.sqf
@@ -1,14 +1,14 @@
 #include "script_component.hpp"
 
 //Add Event Handlers
-[QGVAR(setupCustomKey), {_this call FUNC(serverSetupCustomKeyEH)}] call CBA_fnc_addEventHandler;
-[QGVAR(setVehicleLock), {_this call FUNC(setVehicleLockEH)}] call CBA_fnc_addEventHandler;
+[QGVAR(setupCustomKey), LINKFUNC(serverSetupCustomKeyEH)] call CBA_fnc_addEventHandler;
+[QGVAR(setVehicleLock), LINKFUNC(setVehicleLockEH)] call CBA_fnc_addEventHandler;
 
 ["CBA_settingsInitialized", {
     TRACE_2("SettingsInitialized eh",GVAR(LockVehicleInventory),GVAR(VehicleStartingLockState));
 
     if (hasInterface && {GVAR(LockVehicleInventory)}) then {
-        ["CAManBase", "InventoryOpened", {_this call FUNC(onOpenInventory)}] call CBA_fnc_addClassEventHandler;
+        ["CAManBase", "InventoryOpened", LINKFUNC(onOpenInventory)] call CBA_fnc_addClassEventHandler;
     };
     if (isServer && {GVAR(VehicleStartingLockState) != -1}) then {
         [{
diff --git a/addons/viewdistance/functions/fnc_changeViewDistance.sqf b/addons/viewdistance/functions/fnc_changeViewDistance.sqf
index 84ba31d285..b7fb192db2 100644
--- a/addons/viewdistance/functions/fnc_changeViewDistance.sqf
+++ b/addons/viewdistance/functions/fnc_changeViewDistance.sqf
@@ -41,7 +41,7 @@ if (_objectViewDistanceCoeff isEqualType 0) then {
 } else {
     if (isNil QGVAR(fovBasedPFHminimalViewDistance)) then {
         GVAR(fovBasedPFHminimalViewDistance) = getObjectViewDistance select 0; // Minimal view distance holder and PFH isRunning variable
-        [FUNC(setFovBasedOvdPFH), 0, []] call CBA_fnc_addPerFrameHandler;
+        [LINKFUNC(setFovBasedOvdPFH), 0, []] call CBA_fnc_addPerFrameHandler;
     };
 };
 
diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf
index 4d2c6464b2..77a2fc673b 100644
--- a/addons/weaponselect/XEH_postInit.sqf
+++ b/addons/weaponselect/XEH_postInit.sqf
@@ -210,4 +210,4 @@ if (!hasInterface) exitWith {};
 [0, [false, false, false]]] call CBA_fnc_addKeybind;
 
 // Register fire event handler
-["ace_firedPlayer", DFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
+["ace_firedPlayer", LINKFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
diff --git a/addons/weather/XEH_postServerInit.sqf b/addons/weather/XEH_postServerInit.sqf
index da694bb5f1..2c20f672fe 100644
--- a/addons/weather/XEH_postServerInit.sqf
+++ b/addons/weather/XEH_postServerInit.sqf
@@ -9,8 +9,8 @@
 
     if (GVAR(windSimulation)) then {
         call FUNC(initWind);
-        [FUNC(updateWind), 1] call CBA_fnc_addPerFrameHandler;
+        [LINKFUNC(updateWind), 1] call CBA_fnc_addPerFrameHandler;
     };
-    [FUNC(updateWeather), GVAR(updateInterval)] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(updateWeather), GVAR(updateInterval)] call CBA_fnc_addPerFrameHandler;
 
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/winddeflection/XEH_postInit.sqf b/addons/winddeflection/XEH_postInit.sqf
index fbdfdfc868..a414058349 100644
--- a/addons/winddeflection/XEH_postInit.sqf
+++ b/addons/winddeflection/XEH_postInit.sqf
@@ -9,12 +9,12 @@ GVAR(trackedBullets) = [];
     if (!GVAR(enabled)) exitWith {};
 
     // Register fire event handler
-    ["ace_firedPlayer", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
-    ["ace_firedPlayerNonLocal", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayer", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
+    ["ace_firedPlayerNonLocal", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
 
     if (GVAR(vehicleEnabled)) then {
-        ["ace_firedPlayerVehicle", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
-        ["ace_firedPlayerVehicleNonLocal", DFUNC(handleFired)] call CBA_fnc_addEventHandler;
+        ["ace_firedPlayerVehicle", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
+        ["ace_firedPlayerVehicleNonLocal", LINKFUNC(handleFired)] call CBA_fnc_addEventHandler;
     };
 
     [] call FUNC(updateTrajectoryPFH);
diff --git a/addons/zeus/XEH_preInit.sqf b/addons/zeus/XEH_preInit.sqf
index 12bd359866..46e95431a1 100644
--- a/addons/zeus/XEH_preInit.sqf
+++ b/addons/zeus/XEH_preInit.sqf
@@ -7,12 +7,12 @@ PREP_RECOMPILE_START;
 PREP_RECOMPILE_END;
 
 if (isServer) then {
-    [QGVAR(zeusUnitAssigned), FUNC(handleZeusUnitAssigned)] call CBA_fnc_addEventHandler;
+    [QGVAR(zeusUnitAssigned), LINKFUNC(handleZeusUnitAssigned)] call CBA_fnc_addEventHandler;
 
     // Only add an InitPost EH if setting is enabled (and apply retroactively)
     ["CBA_settingsInitialized", {
         if (GVAR(autoAddObjects)) then {
-            ["AllVehicles", "InitPost", FUNC(addObjectToCurator), true, [], true] call CBA_fnc_addClassEventHandler;
+            ["AllVehicles", "InitPost", LINKFUNC(addObjectToCurator), true, [], true] call CBA_fnc_addClassEventHandler;
         };
     }] call CBA_fnc_addEventHandler;
 };