diff --git a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
index 9debec1dc8..1f7e2ecde7 100644
--- a/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
+++ b/addons/advanced_ballistics/functions/fnc_displayProtractor.sqf
@@ -36,7 +36,7 @@ GVAR(Protractor) = true;
     if !(GVAR(Protractor) && !(weaponLowered ACE_player) && currentWeapon ACE_player == primaryWeapon ACE_player) exitWith {
         GVAR(Protractor) = false;
         1 cutText ["", "PLAIN"];
-        [_idPFH] call cba_fnc_removePerFrameHandler;
+        [_idPFH] call CBA_fnc_removePerFrameHandler;
     };
 
     1 cutRsc ["RscProtractor", "PLAIN", 1, false];
diff --git a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
index 53ac6aa874..02468d0349 100644
--- a/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
+++ b/addons/advanced_ballistics/functions/fnc_initializeTerrainExtension.sqf
@@ -40,7 +40,7 @@ GVAR(currentGrid) = 0;
         #ifdef DEBUG_MODE_FULL
             systemChat format["AdvancedBallistics: Finished terrain initialization in %1 seconds", ceil(ACE_time - _initStartTime)];
         #endif
-        [_idPFH] call cba_fnc_removePerFrameHandler;
+        [_idPFH] call CBA_fnc_removePerFrameHandler;
     };
 
     for "_i" from 1 to 50 do {
diff --git a/addons/atragmx/functions/fnc_create_dialog.sqf b/addons/atragmx/functions/fnc_create_dialog.sqf
index aad591581a..07b93eb2da 100644
--- a/addons/atragmx/functions/fnc_create_dialog.sqf
+++ b/addons/atragmx/functions/fnc_create_dialog.sqf
@@ -54,7 +54,7 @@ GVAR(active) = true;
 
 GVAR(DialogPFH) = [{
     if (!GVAR(active)) exitWith {
-        [_this select 1] call cba_fnc_removePerFrameHandler;
+        [_this select 1] call CBA_fnc_removePerFrameHandler;
     };
     __ctrlBackground ctrlSetText format [QUOTE(PATHTOF(UI\ATRAG_%1.paa)), ["N", "D"] select (call EFUNC(common,ambientBrightness))];
 }, 60, []] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/atragmx/functions/fnc_on_close_dialog.sqf b/addons/atragmx/functions/fnc_on_close_dialog.sqf
index 46cbbfc146..1f254c646a 100644
--- a/addons/atragmx/functions/fnc_on_close_dialog.sqf
+++ b/addons/atragmx/functions/fnc_on_close_dialog.sqf
@@ -2,4 +2,4 @@
 
 uiNamespace setVariable ['ATragMX_Display', nil];
 GVAR(active) = false;
-[GVAR(DialogPFH)] call cba_fnc_removePerFrameHandler;
\ No newline at end of file
+[GVAR(DialogPFH)] call CBA_fnc_removePerFrameHandler;
\ No newline at end of file
diff --git a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
index 9bc5b7e34f..0f42f9637c 100644
--- a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
+++ b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
@@ -37,7 +37,7 @@ if !(ctrlVisible 9000) then {
             false call FUNC(show_target_speed_assist_timer);
             true call FUNC(show_target_speed_assist);
             
-            [_this select 1] call cba_fnc_removePerFrameHandler;
+            [_this select 1] call CBA_fnc_removePerFrameHandler;
         };
         
         ctrlSetText [9001, Str(Round((ACE_time - _startTime) * 10) / 10)];
diff --git a/addons/captives/functions/fnc_doEscortCaptive.sqf b/addons/captives/functions/fnc_doEscortCaptive.sqf
index 08b64195f3..484151853b 100644
--- a/addons/captives/functions/fnc_doEscortCaptive.sqf
+++ b/addons/captives/functions/fnc_doEscortCaptive.sqf
@@ -45,7 +45,7 @@ if (_state) then {
         };
 
         if (!(_unit getVariable [QGVAR(isEscorting), false])) then {
-            [(_this select 1)] call cba_fnc_removePerFrameHandler;
+            [(_this select 1)] call CBA_fnc_removePerFrameHandler;
             [objNull, _target, false] call EFUNC(common,claim);
             detach _target;
             _unit removeAction _actionID;
diff --git a/addons/dagr/initKeybinds.sqf b/addons/dagr/initKeybinds.sqf
index 4575401feb..66bd08190e 100644
--- a/addons/dagr/initKeybinds.sqf
+++ b/addons/dagr/initKeybinds.sqf
@@ -14,7 +14,7 @@
     true
 },
 {false},
-[0, [false, true, false]], false] call cba_fnc_addKeybind;  // (empty default key)
+[0, [false, true, false]], false] call CBA_fnc_addKeybind;  // (empty default key)
 
 ["ACE3 Equipment", QGVAR(ToggleKey), "Toggle DAGR",
 {
@@ -27,7 +27,7 @@
     true
 },
 {false},
-[0, [false, false, false]], false] call cba_fnc_addKeybind;  // (empty default key)
+[0, [false, false, false]], false] call CBA_fnc_addKeybind;  // (empty default key)
 
 //Add deviceKey entry:
 private ["_conditonCode", "_toggleCode", "_closeCode"];
diff --git a/addons/disposable/functions/fnc_replaceATWeapon.sqf b/addons/disposable/functions/fnc_replaceATWeapon.sqf
index ec56f42ff4..f0cee0a048 100644
--- a/addons/disposable/functions/fnc_replaceATWeapon.sqf
+++ b/addons/disposable/functions/fnc_replaceATWeapon.sqf
@@ -52,7 +52,7 @@ if !([_unit] call EFUNC(common,isPlayer)) then {
         //don't do anything until projectile is null (exploded/max range)
         if (isNull _projectile) then {
             //Remove PFEH:
-            [_idPFH] call cba_fnc_removePerFrameHandler;
+            [_idPFH] call CBA_fnc_removePerFrameHandler;
 
             //If (tube is dropped) OR (is dead) OR (is player) just exit
             if (((secondaryWeapon _unit) != _tube) || {!alive _unit} || {([_unit] call EFUNC(common,isPlayer))}) exitWith {};
diff --git a/addons/explosives/functions/fnc_dialingPhone.sqf b/addons/explosives/functions/fnc_dialingPhone.sqf
index cb9d7f5450..bc57ddd4b2 100644
--- a/addons/explosives/functions/fnc_dialingPhone.sqf
+++ b/addons/explosives/functions/fnc_dialingPhone.sqf
@@ -30,7 +30,7 @@ private "_explosive";
 _explosive = [_code] call FUNC(getSpeedDialExplosive);
 
 if (_i >= (count _arr + 2)) then {
-    [_pfID] call CALLSTACK(cba_fnc_removePerFrameHandler);
+    [_pfID] call CALLSTACK(CBA_fnc_removePerFrameHandler);
     if ((count _explosive) > 0) then {
         [_unit, -1, [_explosive select 0, _explosive select 2]] call FUNC(detonateExplosive);
     };
diff --git a/addons/fcs/initKeybinds.sqf b/addons/fcs/initKeybinds.sqf
index 3b22cb2262..a302776741 100644
--- a/addons/fcs/initKeybinds.sqf
+++ b/addons/fcs/initKeybinds.sqf
@@ -28,7 +28,7 @@
     [vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call FUNC(keyUp);
     false
 },
-[15, [false, false, false]], false] call cba_fnc_addKeybind;  //Tab Key
+[15, [false, false, false]], false] call CBA_fnc_addKeybind;  //Tab Key
 
 ["ACE3 Vehicles", QGVAR(adjustRangeUp), localize LSTRING(AdjustRangeUp),
 {
@@ -42,7 +42,7 @@
     true
 },
 {false},
-[201, [false, false, false]], false] call cba_fnc_addKeybind;  //PageUp Key
+[201, [false, false, false]], false] call CBA_fnc_addKeybind;  //PageUp Key
 
 ["ACE3 Vehicles", QGVAR(adjustRangDown), localize LSTRING(AdjustRangeDown),
 {
@@ -56,4 +56,4 @@
     true
 },
 {false},
-[209, [false, false, false]], false] call cba_fnc_addKeybind; //PageDown Key
+[209, [false, false, false]], false] call CBA_fnc_addKeybind; //PageDown Key
diff --git a/addons/finger/XEH_postInit.sqf b/addons/finger/XEH_postInit.sqf
index 5d2fa5a261..394c0cfd3b 100644
--- a/addons/finger/XEH_postInit.sqf
+++ b/addons/finger/XEH_postInit.sqf
@@ -19,5 +19,5 @@ GVAR(pfeh_id) = -1;
         _this call FUNC(keyPress);
     },
     {false},
-    [41, [true, false, false]], true] call cba_fnc_addKeybind; // Shift + Tilda (hold)
+    [41, [true, false, false]], true] call CBA_fnc_addKeybind; // Shift + Tilda (hold)
 }] call EFUNC(common,addEventHandler);
diff --git a/addons/frag/functions/fnc_doExplosions.sqf b/addons/frag/functions/fnc_doExplosions.sqf
index 749c4bd2ec..f6daee1c06 100644
--- a/addons/frag/functions/fnc_doExplosions.sqf
+++ b/addons/frag/functions/fnc_doExplosions.sqf
@@ -1,7 +1,7 @@
-//fnc_doExplosions.sqf
-#include "script_component.hpp"
-
-private ["_params", "_explosions", "_index", "_i", "_exp", "_refExp", "_bpos", "_hit", "_distance", "_indirectHitRange", "_depth"];
+//fnc_doExplosions.sqf
+#include "script_component.hpp"
+
+private ["_params", "_explosions", "_index", "_i", "_exp", "_refExp", "_bpos", "_hit", "_distance", "_indirectHitRange", "_depth"];
 _params = _this select 0;
 _explosions = _params select 0;
 _index = _params select 1;
@@ -20,7 +20,7 @@ for "_i" from _index to ((_index+2) min (count _explosions)) do {
 };
 _index = _index + 2;
 if(_index >= (count _explosions)) then {
-    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+    [(_this select 1)] call CBA_fnc_removePerFrameHandler;
 } else {
     _params set[1, _index];
 };
diff --git a/addons/frag/functions/fnc_doReflections.sqf b/addons/frag/functions/fnc_doReflections.sqf
index b0e24f0972..7702e34fd5 100644
--- a/addons/frag/functions/fnc_doReflections.sqf
+++ b/addons/frag/functions/fnc_doReflections.sqf
@@ -1,7 +1,7 @@
-//fnc_doReflections.sqf
-#include "script_component.hpp"
-
-private ["_pos", "_ammo", "_depth", "_hit", "_range", "_hitFactor", "_indirectHitRange", "_indirectHit", "_testParams"];
+//fnc_doReflections.sqf
+#include "script_component.hpp"
+
+private ["_pos", "_ammo", "_depth", "_hit", "_range", "_hitFactor", "_indirectHitRange", "_indirectHit", "_testParams"];
 
 _pos = _this select 0;
 _ammo = _this select 1;
diff --git a/addons/frag/functions/fnc_findReflections.sqf b/addons/frag/functions/fnc_findReflections.sqf
index 193e1e7154..7f8fd2a13c 100644
--- a/addons/frag/functions/fnc_findReflections.sqf
+++ b/addons/frag/functions/fnc_findReflections.sqf
@@ -1,6 +1,6 @@
-//fnc_findReflections.sqf
-#include "script_component.hpp"
-
+//fnc_findReflections.sqf
+#include "script_component.hpp"
+
 private ["_split", "_radi", "_params", "_pos", "_explosiveInfo", "_los", "_nlos", "_zIndex", "_depth", "_indirectHitRange", "_indirectHit", "_distanceCount", "_lastPos", "_test", "_vec", "_testPos", "_buckets", "_excludes", "_bucketIndex", "_bucketPos", "_bucketList", "_c", "_index", "_blist", "_avgX", "_avgY", "_avgZ", "_bpos", "_distance", "_hitFactor", "_hit", "_range", "_refExp", "_rand", "_i", "_x", "_res", "_forEachIndex", "_explosions", "_can", "_dirvec", "_zAng"];
 
 _params = _this select 0;
@@ -21,15 +21,15 @@ _indirectHit = _explosiveInfo select 1;
 _distanceCount = (floor _indirectHitRange*4) min 100;
 
 if(_zIndex < 5) then {
-    _lastPos = _pos;
-    _zAng = _zIndex*20+2;
-    if(_zAng > 80) then {
-        _radi = 1;
-        _zAng = 90;
+    _lastPos = _pos;
+    _zAng = _zIndex*20+2;
+    if(_zAng > 80) then {
+        _radi = 1;
+        _zAng = 90;
     };
     for "_i" from 0 to _radi do {
         _test = true;
-        _vec = [1, ((_i*_split)+_rand) mod 360, _zAng] call cba_fnc_polar2vect;
+        _vec = [1, ((_i*_split)+_rand) mod 360, _zAng] call CBA_fnc_polar2vect;
         for "_x" from 1 to _distanceCount do {
             _testPos = _pos vectorAdd (_vec vectorMultiply _x);
             // drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""];
@@ -43,7 +43,7 @@ if(_zIndex < 5) then {
                 // drop ["\a3\data_f\Cl_basic","","Billboard",1,15,ASLtoATL _testPos,[0,0,0],1,1.275,1.0,0.0,[1],[[1,0,0,1]],[0],0.0,2.0,"","",""];
                 // TEST_PAIRS pushBack [_pos, _lastPos, [1,0,0,1]];
 
-            };
+            };
             // if(terrainIntersectASL [_pos, _testPos]) exitWith {};
             _lastPos = _testPos;
         };
@@ -106,7 +106,7 @@ if(_zIndex < 5) then {
         _range = _range - (_range%2);
 
         if(_hit >= 10 && _range > 0) then {
-            // TEST_ICONS pushBack [_bpos, format["h: %1, r: %2, hf: %3 d: %4 ihr: %5", _hit, _range, _hitFactor, _distance, _indirectHitRange*4]];
+            // TEST_ICONS pushBack [_bpos, format["h: %1, r: %2, hf: %3 d: %4 ihr: %5", _hit, _range, _hitFactor, _distance, _indirectHitRange*4]];
             // TEST_PAIRS pushBack [_pos, _bpos, [1,0,0,1]];
             _refExp = format["ace_explosion_reflection_%1_%2", _range, _hit];
             // _refExp createVehicle (ASLtoATL _bpos);
@@ -122,5 +122,5 @@ if(_zIndex < 5) then {
     // _dirvec = _dirvec vectorMultiply 100;
     // _can setVelocity _dirvec;
     [DFUNC(doExplosions), 0, [_explosions, 0]] call CBA_fnc_addPerFrameHandler;
-    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+    [(_this select 1)] call CBA_fnc_removePerFrameHandler;
 };
diff --git a/addons/frag/functions/fnc_stopTracing.sqf b/addons/frag/functions/fnc_stopTracing.sqf
index 13c8f31f33..f8ddf42084 100644
--- a/addons/frag/functions/fnc_stopTracing.sqf
+++ b/addons/frag/functions/fnc_stopTracing.sqf
@@ -1,5 +1,5 @@
 #include "script_component.hpp"
 if(GVAR(tracesStarted)) then {
     GVAR(tracesStarted) = false;
-    [GVAR(traceID)] call cba_fnc_removePerFrameHandler;
+    [GVAR(traceID)] call CBA_fnc_removePerFrameHandler;
 };
diff --git a/addons/frag/functions/fnc_trackTrace.sqf b/addons/frag/functions/fnc_trackTrace.sqf
index b87892ab15..24910db163 100644
--- a/addons/frag/functions/fnc_trackTrace.sqf
+++ b/addons/frag/functions/fnc_trackTrace.sqf
@@ -10,5 +10,5 @@ if (alive _tracerObj && (count GVAR(traces)) > 0) then {
     _positions = _data select 4;
     _positions set [(count _positions), [(getPos _tracerObj), vectorMagnitude (velocity _tracerObj)]];
 } else {
-    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+    [(_this select 1)] call CBA_fnc_removePerFrameHandler;
 };
diff --git a/addons/huntir/functions/fnc_cam.sqf b/addons/huntir/functions/fnc_cam.sqf
index 9426de13fd..2eb7611a6a 100644
--- a/addons/huntir/functions/fnc_cam.sqf
+++ b/addons/huntir/functions/fnc_cam.sqf
@@ -93,7 +93,7 @@ GVAR(no_cams) sort true;
     GVAR(pos) = getPosVisual GVAR(huntIR);
 
     if ((!dialog) || (count GVAR(no_cams) == 0) || ((GVAR(pos) select 2) <= 20)) exitWith {
-        [_this select 1] call cba_fnc_removePerFrameHandler;
+        [_this select 1] call CBA_fnc_removePerFrameHandler;
 
         GVAR(stop) = true;
 
diff --git a/addons/huntir/functions/fnc_huntir.sqf b/addons/huntir/functions/fnc_huntir.sqf
index b1c269533d..e06ada87ea 100644
--- a/addons/huntir/functions/fnc_huntir.sqf
+++ b/addons/huntir/functions/fnc_huntir.sqf
@@ -48,7 +48,7 @@ createDialog "ace_huntir_cam_dialog_off";
             _nearestHuntIRs = ACE_player nearEntities ["ACE_HuntIR", HUNTIR_MAX_TRANSMISSION_RANGE];
 
             if ((!dialog) || GVAR(done)) exitWith {
-                [_this select 1] call cba_fnc_removePerFrameHandler;
+                [_this select 1] call CBA_fnc_removePerFrameHandler;
 
                 if (dialog && GVAR(state) == "connected") then {
                     [_nearestHuntIRs select 0] call FUNC(cam);
diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf
index 59fb01a353..1dd1401a7d 100644
--- a/addons/interact_menu/XEH_clientInit.sqf
+++ b/addons/interact_menu/XEH_clientInit.sqf
@@ -41,14 +41,14 @@ GVAR(ParsedTextCached) = [];
     // Statement
     [0] call FUNC(keyDown)
 },{[0,false] call FUNC(keyUp)},
-[219, [false, false, false]], false] call cba_fnc_addKeybind;  //Left Windows Key
+[219, [false, false, false]], false] call CBA_fnc_addKeybind;  //Left Windows Key
 
 ["ACE3 Common", QGVAR(SelfInteractKey), (localize LSTRING(SelfInteractKey)),
 {
     // Statement
     [1] call FUNC(keyDown)
 },{[1,false] call FUNC(keyUp)},
-[219, [false, true, false]], false] call cba_fnc_addKeybind; //Left Windows Key + Ctrl/Strg
+[219, [false, true, false]], false] call CBA_fnc_addKeybind; //Left Windows Key + Ctrl/Strg
 
 
 // Listens for the falling unconscious event, just in case the menu needs to be closed
diff --git a/addons/javelin/functions/fnc_onOpticDraw.sqf b/addons/javelin/functions/fnc_onOpticDraw.sqf
index cf02d5359e..8be68be5b5 100644
--- a/addons/javelin/functions/fnc_onOpticDraw.sqf
+++ b/addons/javelin/functions/fnc_onOpticDraw.sqf
@@ -55,7 +55,7 @@ if (((count _weaponConfig) < 1) || {(getNumber (_weaponConfig select 0)) != 1})
         _fireDisabledEH = [_fireDisabledEH] call FUNC(enableFire);
     };
 
-    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+    [(_this select 1)] call CBA_fnc_removePerFrameHandler;
     GVAR(pfehID) = -1;
 };
 
diff --git a/addons/javelin/initKeybinds.sqf b/addons/javelin/initKeybinds.sqf
index 15215466e8..10b5e2813d 100644
--- a/addons/javelin/initKeybinds.sqf
+++ b/addons/javelin/initKeybinds.sqf
@@ -19,7 +19,7 @@
     [ACE_player] call FUNC(lockKeyUp);
     false
 },
-[15, [false, false, false]], false] call cba_fnc_addKeybind;  //Tab Key
+[15, [false, false, false]], false] call CBA_fnc_addKeybind;  //Tab Key
 
 ["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode),
 { false },
@@ -27,4 +27,4 @@
     [ACE_player] call FUNC(cycleFireMode);
     false
 },
-[15, [false, true, false]], false] call cba_fnc_addKeybind;  //Ctrl+Tab Key
\ No newline at end of file
+[15, [false, true, false]], false] call CBA_fnc_addKeybind;  //Ctrl+Tab Key
\ No newline at end of file
diff --git a/addons/laser/functions/fnc_laserTargetPFH.sqf b/addons/laser/functions/fnc_laserTargetPFH.sqf
index 4c4f242482..6d993b07de 100644
--- a/addons/laser/functions/fnc_laserTargetPFH.sqf
+++ b/addons/laser/functions/fnc_laserTargetPFH.sqf
@@ -10,7 +10,7 @@ _shooter = _args select 1;
 _uuid = _args select 2;
 
 if(isNull _laserTarget || !alive _shooter) exitWith {
-    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+    [(_this select 1)] call CBA_fnc_removePerFrameHandler;
     REM(GVAR(VanillaLasers), _laserTarget);
     
     // Remove laseron
diff --git a/addons/missileguidance/functions/fnc_guidancePFH.sqf b/addons/missileguidance/functions/fnc_guidancePFH.sqf
index 78f48250dd..122d690bae 100644
--- a/addons/missileguidance/functions/fnc_guidancePFH.sqf
+++ b/addons/missileguidance/functions/fnc_guidancePFH.sqf
@@ -13,7 +13,7 @@ _args = _this select 0;
 EXPLODE_7_PVT((_args select 0),_shooter,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile);
 
 if(!alive _projectile || isNull _projectile || isNull _shooter) exitWith {
-    [(_this select 1)] call cba_fnc_removePerFrameHandler;
+    [(_this select 1)] call CBA_fnc_removePerFrameHandler;
 };
 
 _launchParams = _args select 1;
diff --git a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
index 26f605e347..8e1de2cb3d 100644
--- a/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
+++ b/addons/missionmodules/functions/fnc_moduleAmbianceSound.sqf
@@ -71,7 +71,7 @@ if (_activated && local _logic) then {
         _args params ["_logic", "_ambianceSounds", "_minimalDistance", "_maximalDistance", "_minDelayBetweensounds", "_maxDelayBetweenSounds", "_volume", "_followPlayers", "_lastTimePlayed"];
 
         if (!alive _logic) exitWith {
-            [_pfhHandle] call cba_fnc_removePerFrameHandler;
+            [_pfhHandle] call CBA_fnc_removePerFrameHandler;
         };
 
         if (ACE_time - _lastTimePlayed >= ((_minDelayBetweensounds + random(_maxDelayBetweenSounds)) min _maxDelayBetweenSounds)) then {
diff --git a/addons/mk6mortar/functions/fnc_handleFired.sqf b/addons/mk6mortar/functions/fnc_handleFired.sqf
index 6c2875d75e..8c40e65409 100644
--- a/addons/mk6mortar/functions/fnc_handleFired.sqf
+++ b/addons/mk6mortar/functions/fnc_handleFired.sqf
@@ -60,7 +60,7 @@ if (_newMuzzleVelocityCoefficent != 1) then {
     EXPLODE_4_PVT(_args,_shell,_airFriction,_time,_relativeDensity);
 
     if (isNull _shell || {!alive _shell}) exitwith {
-        [_pfID] call cba_fnc_removePerFrameHandler;
+        [_pfID] call CBA_fnc_removePerFrameHandler;
     };
 
     _deltaT = ACE_time - _time;
diff --git a/addons/movement/XEH_postInit.sqf b/addons/movement/XEH_postInit.sqf
index ebe97e879d..108dc56792 100644
--- a/addons/movement/XEH_postInit.sqf
+++ b/addons/movement/XEH_postInit.sqf
@@ -32,4 +32,4 @@ if (!hasInterface) exitWith {};
     true
 },
 {false},
-[47, [false, true, false]], false] call cba_fnc_addKeybind; //DIK_V + CTRL//STRG
+[47, [false, true, false]], false] call CBA_fnc_addKeybind; //DIK_V + CTRL//STRG
diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf
index b828d70005..894521d74a 100644
--- a/addons/nametags/XEH_postInit.sqf
+++ b/addons/nametags/XEH_postInit.sqf
@@ -20,7 +20,7 @@ GVAR(showNamesTime) = -10;
     false
 },
 {false},
-[29, [false, false, false]], false] call cba_fnc_addKeybind; //LeftControl Key
+[29, [false, false, false]], false] call CBA_fnc_addKeybind; //LeftControl Key
 
 // Monitor the assigned teams, and propegate them appropriately for the player
 // This allows for assigned team colors to match across the entire group
diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf
index 2839f6e5f9..4e14403ea8 100644
--- a/addons/nightvision/XEH_postInitClient.sqf
+++ b/addons/nightvision/XEH_postInitClient.sqf
@@ -49,7 +49,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
     true
 },
 {false},
-[201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT
+[201, [false, false, true]], false] call CBA_fnc_addKeybind; //PageUp + ALT
 
 ["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize LSTRING(DecreaseNVGBrightness),
 {
@@ -63,4 +63,4 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0;
     true
 },
 {false},
-[209, [false, false, true]], false] call cba_fnc_addKeybind; //PageDown + ALT
+[209, [false, false, true]], false] call CBA_fnc_addKeybind; //PageDown + ALT
diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf
index 1b64d7f0b0..c1212af0e8 100644
--- a/addons/overheating/XEH_postInit.sqf
+++ b/addons/overheating/XEH_postInit.sqf
@@ -18,4 +18,4 @@ if (!hasInterface) exitWith {};
     true
 },
 {false},
-[19, [true, false, false]], false] call cba_fnc_addKeybind; //R Key
+[19, [true, false, false]], false] call CBA_fnc_addKeybind; //R Key
diff --git a/addons/overheating/functions/fnc_jamWeapon.sqf b/addons/overheating/functions/fnc_jamWeapon.sqf
index fd3081f7eb..000cd44021 100644
--- a/addons/overheating/functions/fnc_jamWeapon.sqf
+++ b/addons/overheating/functions/fnc_jamWeapon.sqf
@@ -34,7 +34,7 @@ _fnc_stopCurrentBurst = {
   if (diag_frameno == _startFrame) exitWith {};
 
   // Remove the PFH on the second execution
-  [_pfhId] call cba_fnc_removePerFrameHandler;
+  [_pfhId] call CBA_fnc_removePerFrameHandler;
 
   _unit setAmmo [_weapon, _ammo];
 };
diff --git a/addons/parachute/XEH_postInit.sqf b/addons/parachute/XEH_postInit.sqf
index 46dd21b99c..598661a3da 100644
--- a/addons/parachute/XEH_postInit.sqf
+++ b/addons/parachute/XEH_postInit.sqf
@@ -30,7 +30,7 @@ if (!hasInterface) exitWith {};
     true
 },
 {false},
-[24, [false, false, false]], false] call cba_fnc_addKeybind;
+[24, [false, false, false]], false] call CBA_fnc_addKeybind;
 
 GVAR(PFH) = false;
 ["playerVehicleChanged",{
diff --git a/addons/parachute/functions/fnc_doLanding.sqf b/addons/parachute/functions/fnc_doLanding.sqf
index 7a90a1f12c..cc32724e9d 100644
--- a/addons/parachute/functions/fnc_doLanding.sqf
+++ b/addons/parachute/functions/fnc_doLanding.sqf
@@ -22,6 +22,6 @@ _unit setVariable [QGVAR(chuteIsCut), false, true];
 [{
     if (ACE_time >= ((_this select 0) select 0) + 1) then {
         ((_this select 0) select 1) playActionNow "Crouch";
-        [(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);
+        [(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);
     };
 }, 1, [ACE_time,_unit]] call CALLSTACK(CBA_fnc_addPerFrameHandler);
diff --git a/addons/parachute/functions/fnc_onEachFrame.sqf b/addons/parachute/functions/fnc_onEachFrame.sqf
index dbfab16452..94d5a99748 100644
--- a/addons/parachute/functions/fnc_onEachFrame.sqf
+++ b/addons/parachute/functions/fnc_onEachFrame.sqf
@@ -16,16 +16,16 @@
 #include "script_component.hpp"
 private "_player";
 _player = ACE_player;
-if (!GVAR(PFH)) exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);};
-if (isNull _player) exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);GVAR(PFH) = false;};
-if !((vehicle _player) isKindOf "ParachuteBase") exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);GVAR(PFH) = false;};
-if (isTouchingGround _player) exitWith {[(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);GVAR(PFH) = false;};
+if (!GVAR(PFH)) exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);};
+if (isNull _player) exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);GVAR(PFH) = false;};
+if !((vehicle _player) isKindOf "ParachuteBase") exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);GVAR(PFH) = false;};
+if (isTouchingGround _player) exitWith {[(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);GVAR(PFH) = false;};
 
 private ["_pos"];
 _pos = getPosASL (vehicle _player);
 
 if ((lineIntersects [_pos, _pos vectorAdd [0,0,-0.5], vehicle _player, _player]) || {((ASLtoATL _pos) select 2) < 0.75}) then {
-    [(_this select 1)] call CALLSTACK(cba_fnc_removePerFrameHandler);
+    [(_this select 1)] call CALLSTACK(CBA_fnc_removePerFrameHandler);
     GVAR(PFH) = false;
 // I believe this will not work for Zeus units.
     deleteVehicle (vehicle _player);
diff --git a/addons/parachute/functions/fnc_showAltimeter.sqf b/addons/parachute/functions/fnc_showAltimeter.sqf
index 6f4159e85d..466abfb77e 100644
--- a/addons/parachute/functions/fnc_showAltimeter.sqf
+++ b/addons/parachute/functions/fnc_showAltimeter.sqf
@@ -23,10 +23,10 @@ if (isNull (uiNamespace getVariable ["ACE_Altimeter", displayNull])) exitWith {}
 GVAR(AltimeterActive) = true;
 
 [{
-    if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler)};
+    if (!GVAR(AltimeterActive)) exitWith {[_this select 1] call CALLSTACK(CBA_fnc_removePerFrameEventHandler)};
     disableSerialization;
     (_this select 0) params ["_display", "_unit", "_oldHeight", "_prevTime"];
-    if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(cba_fnc_removePerFrameEventHandler); call FUNC(hideAltimeter)};
+    if !("ACE_Altimeter" in assignedItems _unit) exitWith {[_this select 1] call CALLSTACK(CBA_fnc_removePerFrameEventHandler); call FUNC(hideAltimeter)};
 
     private ["_height", "_hour", "_minute", "_descentRate","_HeightText", "_DecendRate", "_TimeText", "_curTime", "_timeDiff"];
 
diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf
index e1dc9e8d51..bd26583668 100644
--- a/addons/reload/XEH_postInit.sqf
+++ b/addons/reload/XEH_postInit.sqf
@@ -16,7 +16,7 @@ if (!hasInterface) exitWith {};
     true
 },
 {false},
-[19, [false, true, false]], false] call cba_fnc_addKeybind;
+[19, [false, true, false]], false] call CBA_fnc_addKeybind;
 
 ["setAmmoSync", {
     //To propagate the setAmmo change, do it on all clients
diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf
index bd81a0935b..41e7d53e17 100644
--- a/addons/scopes/XEH_postInit.sqf
+++ b/addons/scopes/XEH_postInit.sqf
@@ -25,7 +25,7 @@ if (!hasInterface) exitWith {};
 
 
         if !(isNil QGVAR(fadePFH)) then {
-            [GVAR(fadePFH)] call cba_fnc_removePerFrameHandler;
+            [GVAR(fadePFH)] call CBA_fnc_removePerFrameHandler;
             GVAR(fadePFH) = nil;
         };
     };
@@ -44,7 +44,7 @@ if (!hasInterface) exitWith {};
     [ACE_player, ELEVATION_UP, MINOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[201, [false, false, false]], true] call cba_fnc_addKeybind;
+[201, [false, false, false]], true] call CBA_fnc_addKeybind;
 
 ["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize LSTRING(AdjustDownMinor),
 {
@@ -57,7 +57,7 @@ if (!hasInterface) exitWith {};
     [ACE_player, ELEVATION_DOWN, MINOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[209, [false, false, false]], true] call cba_fnc_addKeybind;
+[209, [false, false, false]], true] call CBA_fnc_addKeybind;
 
 ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize LSTRING(AdjustLeftMinor),
 {
@@ -70,7 +70,7 @@ if (!hasInterface) exitWith {};
     [ACE_player, WINDAGE_LEFT, MINOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[209, [false, true, false]], true] call cba_fnc_addKeybind;
+[209, [false, true, false]], true] call CBA_fnc_addKeybind;
 
 ["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize LSTRING(AdjustRightMinor),
 {
@@ -83,7 +83,7 @@ if (!hasInterface) exitWith {};
     [ACE_player, WINDAGE_RIGHT, MINOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[201, [false, true, false]], true] call cba_fnc_addKeybind;
+[201, [false, true, false]], true] call CBA_fnc_addKeybind;
 
 ["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize LSTRING(AdjustUpMajor),
 {
@@ -96,7 +96,7 @@ if (!hasInterface) exitWith {};
     [ACE_player, ELEVATION_UP, MAJOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[201, [true, false, false]], true] call cba_fnc_addKeybind;
+[201, [true, false, false]], true] call CBA_fnc_addKeybind;
 
 ["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize LSTRING(AdjustDownMajor),
 {
@@ -109,7 +109,7 @@ if (!hasInterface) exitWith {};
     [ACE_player, ELEVATION_DOWN, MAJOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[209, [true, false, false]], true] call cba_fnc_addKeybind;
+[209, [true, false, false]], true] call CBA_fnc_addKeybind;
 
 ["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize LSTRING(AdjustLeftMajor),
 {
@@ -122,7 +122,7 @@ if (!hasInterface) exitWith {};
     [ACE_player, WINDAGE_LEFT, MAJOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[209, [true, true, false]], true] call cba_fnc_addKeybind;
+[209, [true, true, false]], true] call CBA_fnc_addKeybind;
 
 ["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize LSTRING(AdjustRightMajor),
 {
@@ -135,4 +135,4 @@ if (!hasInterface) exitWith {};
     [ACE_player, WINDAGE_RIGHT, MAJOR_INCREMENT] call FUNC(adjustScope);
 },
 {false},
-[201, [true, true, false]], true] call cba_fnc_addKeybind;
+[201, [true, true, false]], true] call CBA_fnc_addKeybind;
diff --git a/addons/scopes/functions/fnc_showZeroing.sqf b/addons/scopes/functions/fnc_showZeroing.sqf
index dd302ff333..43595bde87 100644
--- a/addons/scopes/functions/fnc_showZeroing.sqf
+++ b/addons/scopes/functions/fnc_showZeroing.sqf
@@ -58,6 +58,6 @@ GVAR(fadePFH) = [{
         _layer cutFadeOut 2;
 
         GVAR(fadePFH) = nil;
-        [_pfhId] call cba_fnc_removePerFrameHandler;
+        [_pfhId] call CBA_fnc_removePerFrameHandler;
     };
 }, 0.1, []] call CBA_fnc_addPerFrameHandler
diff --git a/addons/switchunits/functions/fnc_switchBack.sqf b/addons/switchunits/functions/fnc_switchBack.sqf
index c3cb99588a..5aab2c9aee 100644
--- a/addons/switchunits/functions/fnc_switchBack.sqf
+++ b/addons/switchunits/functions/fnc_switchBack.sqf
@@ -32,6 +32,6 @@ params ["_originalPlayerUnit"];
         _layer = "BIS_fnc_respawnCounter" call bis_fnc_rscLayer;
         _layer cuttext ["","plain"];
 
-        [_pfhId] call cba_fnc_removePerFrameHandler;
+        [_pfhId] call CBA_fnc_removePerFrameHandler;
     };
 }, 0.2, _this] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf
index 793e72bb71..49c3e97e42 100644
--- a/addons/switchunits/functions/fnc_switchUnit.sqf
+++ b/addons/switchunits/functions/fnc_switchUnit.sqf
@@ -76,6 +76,6 @@ if (_leave) exitWith {
 
         [localize LSTRING(SwitchedUnit)] call EFUNC(common,displayTextStructured);
 
-        [_pfhId] call cba_fnc_removePerFrameHandler;
+        [_pfhId] call CBA_fnc_removePerFrameHandler;
     };
 }, 0.2, [_unit, player]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf
index a8ec2fb75f..4be21d1ed1 100644
--- a/addons/vehicles/XEH_postInit.sqf
+++ b/addons/vehicles/XEH_postInit.sqf
@@ -18,4 +18,4 @@ if (!hasInterface) exitWith {};
     true
 },
 {false},
-[211, [false, false, false]], false] call cba_fnc_addKeybind; //DELETE Key
+[211, [false, false, false]], false] call CBA_fnc_addKeybind; //DELETE Key
diff --git a/addons/weather/functions/fnc_displayWindInfo.sqf b/addons/weather/functions/fnc_displayWindInfo.sqf
index 44a5b0696c..98d9026c1c 100644
--- a/addons/weather/functions/fnc_displayWindInfo.sqf
+++ b/addons/weather/functions/fnc_displayWindInfo.sqf
@@ -33,7 +33,7 @@ GVAR(WindInfo) = true;
     if !(GVAR(WindInfo) && !(underwater ACE_player) && vehicle ACE_player == ACE_player) exitWith {
         GVAR(WindInfo) = false;
         0 cutText ["", "PLAIN"];
-        [_this select 1] call cba_fnc_removePerFrameHandler;
+        [_this select 1] call CBA_fnc_removePerFrameHandler;
     };
 
     _windIndex = 12;