diff --git a/addons/cargo/XEH_postInit.sqf b/addons/cargo/XEH_postInit.sqf
index eeee387018..58a009c9f5 100644
--- a/addons/cargo/XEH_postInit.sqf
+++ b/addons/cargo/XEH_postInit.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 
-["ace_addCargoByClass", {_this call FUNC(addCargoItem)}] call CBA_fnc_addEventHandler;
+["ace_addCargo", {_this call FUNC(addCargoItem)}] call CBA_fnc_addEventHandler;
 
 ["ace_loadCargo", {
     params ["_item", "_vehicle"];
diff --git a/addons/cargo/config.cpp b/addons/cargo/config.cpp
index 589dc020df..c368cab8d5 100644
--- a/addons/cargo/config.cpp
+++ b/addons/cargo/config.cpp
@@ -23,8 +23,8 @@ class ACE_newEvents {
     LoadCargo = "ace_loadCargo";
     cargoUnloaded = "ace_cargoUnloaded";
     cargoLoaded = "ace_cargoLoaded";
-    AddCargoByClass = "ace_addCargoByClass";
+    AddCargoByClass = "ace_addCargo";
     ServerUnloadCargo = QGVAR(serverUnload);
     UnloadCargo = "ace_unloadCargo";
-    cargoAddedByClass = "ace_cargoAddedByClass";
+    cargoAddedByClass = "ace_cargoAdded";
 };
diff --git a/addons/cargo/functions/fnc_addCargoItem.sqf b/addons/cargo/functions/fnc_addCargoItem.sqf
index bc179b8912..6e1b311098 100644
--- a/addons/cargo/functions/fnc_addCargoItem.sqf
+++ b/addons/cargo/functions/fnc_addCargoItem.sqf
@@ -26,4 +26,4 @@ for "_i" from 1 to _amount do {
 };
 
 // Invoke listenable event
-["ace_cargoAddedByClass", [_itemClass, _vehicle, _amount]] call CBA_fnc_globalEvent;
+["ace_cargoAdded", [_itemClass, _vehicle, _amount]] call CBA_fnc_globalEvent;
diff --git a/addons/cargo/functions/fnc_initVehicle.sqf b/addons/cargo/functions/fnc_initVehicle.sqf
index 64ed4c4273..2dfc8b796b 100644
--- a/addons/cargo/functions/fnc_initVehicle.sqf
+++ b/addons/cargo/functions/fnc_initVehicle.sqf
@@ -29,7 +29,7 @@ if (isServer) then {
             _cargoClassname = getText (_x >> "type");
             _cargoCount = getNumber (_x >> "amount");
             TRACE_3("adding ACE_Cargo", (configName _x), _cargoClassname, _cargoCount);
-            ["ace_addCargoByClass", [_cargoClassname, _vehicle, _cargoCount]] call CBA_fnc_localEvent;
+            ["ace_addCargo", [_cargoClassname, _vehicle, _cargoCount]] call CBA_fnc_localEvent;
         };
     } count ("true" configClasses (configFile >> "CfgVehicles" >> _type >> "ACE_Cargo" >> "Cargo"));
 };
diff --git a/addons/explosives/XEH_postInit.sqf b/addons/explosives/XEH_postInit.sqf
index 365e772023..1ddd52cc53 100644
--- a/addons/explosives/XEH_postInit.sqf
+++ b/addons/explosives/XEH_postInit.sqf
@@ -29,16 +29,16 @@ if (isServer) then {
         [_unit] call FUNC(onIncapacitated);
     }] call CBA_fnc_addEventHandler;
 
-    [QGVAR(clientRequestOrientations), {
+    [QGVAR(sendOrientations), {
         params ["_logic"];
-        TRACE_1("clientRequestsOrientations received:",_logic);
+        TRACE_1("sendOrientations received:",_logic);
         // Filter the array before sending it
         GVAR(explosivesOrientations) = GVAR(explosivesOrientations) select {
             _x params ["_explosive"];
             (!isNull _explosive && {alive _explosive})
         };
-        TRACE_1("serverSendsOrientations sent:",GVAR(explosivesOrientations));
-        [QGVAR(serverSendOrientations), [GVAR(explosivesOrientations)], _logic] call CBA_fnc_targetEvent;
+        TRACE_1("orientationsSent sent:",GVAR(explosivesOrientations));
+        [QGVAR(orientationsSent), [GVAR(explosivesOrientations)], _logic] call CBA_fnc_targetEvent;
     }] call CBA_fnc_addEventHandler;
 };
 
@@ -52,9 +52,9 @@ GVAR(CurrentSpeedDial) = 0;
 // In case we are a JIP client, ask the server for orientation of any previously
 // placed mine.
 if (didJIP) then {
-    [QGVAR(serverSendOrientations), {
+    [QGVAR(orientationsSent), {
         params ["_explosivesOrientations"];
-        TRACE_1("serverSendsOrientations received:",_explosivesOrientations);
+        TRACE_1("orientationsSent received:",_explosivesOrientations);
         {
             _x params ["_explosive","_direction","_pitch"];
             TRACE_3("orientation set:",_explosive,_direction,_pitch);
@@ -66,8 +66,8 @@ if (didJIP) then {
 
     //  Create a logic to get the client ID
     GVAR(localLogic) = ([sideLogic] call CBA_fnc_getSharedGroup) createUnit ["Logic", [0,0,0], [], 0, "NONE"];
-    TRACE_1("clientRequestsOrientations sent:",GVAR(localLogic));
-    [QGVAR(clientRequestOrientations), [GVAR(localLogic)]] call CBA_fnc_serverEvent;
+    TRACE_1("sendOrientations sent:",GVAR(localLogic));
+    [QGVAR(sendOrientations), [GVAR(localLogic)]] call CBA_fnc_serverEvent;
 };
 
 ["ace_interactMenuOpened", {
diff --git a/addons/explosives/config.cpp b/addons/explosives/config.cpp
index ad4abec910..8b660197e9 100644
--- a/addons/explosives/config.cpp
+++ b/addons/explosives/config.cpp
@@ -46,6 +46,6 @@ class CfgMineTriggers {
 };
 
 class ACE_newEvents {
-    clientRequestsOrientations = QGVAR(clientRequestOrientations);
-    serverSendsOrientations = QGVAR(serverSendOrientations);
+    clientRequestsOrientations = QGVAR(sendOrientations);
+    serverSendsOrientations = QGVAR(orientationsSent);
 };
diff --git a/addons/fcs/functions/fnc_canUseFCS.sqf b/addons/fcs/functions/fnc_canUseFCS.sqf
index 3899584788..de4af99d7a 100644
--- a/addons/fcs/functions/fnc_canUseFCS.sqf
+++ b/addons/fcs/functions/fnc_canUseFCS.sqf
@@ -18,3 +18,4 @@
 getNumber ([configFile >> "CfgVehicles" >> typeOf vehicle ACE_player, [ACE_player] call EFUNC(common,getTurretIndex)] call EFUNC(common,getTurretConfigPath) >> QGVAR(Enabled)) == 1
 && {cameraView == "GUNNER"}
 && {!([ACE_player] call CBA_fnc_canUseWeapon)} //Not Turned Out
+&& {cameraOn != (getConnectedUAV ACE_player)} //Not Controlling a UAV
diff --git a/addons/goggles/functions/fnc_applyDirtEffect.sqf b/addons/goggles/functions/fnc_applyDirtEffect.sqf
index 4b5ee13a0f..46f079dc38 100644
--- a/addons/goggles/functions/fnc_applyDirtEffect.sqf
+++ b/addons/goggles/functions/fnc_applyDirtEffect.sqf
@@ -32,6 +32,10 @@ if ([_unit] call FUNC(isGogglesVisible)) then {
     if (_dirtImage != "") then {
         GVAR(GogglesEffectsLayer) cutRsc ["RscACE_GogglesEffects", "PLAIN", 0.1, false];
         (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10660) ctrlSetText _dirtImage;
+
+        private _effectBrightness = linearConversion [0,1,([] call EFUNC(common,ambientBrightness)),0.25,1];
+        (GETUVAR(GVAR(DisplayEffects),displayNull) displayCtrl 10660) ctrlSetTextColor [_effectBrightness, _effectBrightness, _effectBrightness, 1];
+        TRACE_1("dirt",_effectBrightness);
     };
 };
 
diff --git a/addons/goggles/functions/fnc_applyDustEffect.sqf b/addons/goggles/functions/fnc_applyDustEffect.sqf
index 9921bfdfd9..6277d34c21 100644
--- a/addons/goggles/functions/fnc_applyDustEffect.sqf
+++ b/addons/goggles/functions/fnc_applyDustEffect.sqf
@@ -26,6 +26,10 @@ if ([_unit] call FUNC(isGogglesVisible)) exitWith {
 
     ((GETUVAR(GVAR(DisplayEffects),displayNull)) displayCtrl 10662) ctrlSetText format [getText (configFile >> "CfgGlasses" >> goggles _unit >> "ACE_DustPath"), GETDUSTT(DAMOUNT) + 1];
 
+    private _effectBrightness = linearConversion [0,1,([] call EFUNC(common,ambientBrightness)),0.25,1];
+    ((GETUVAR(GVAR(DisplayEffects),displayNull)) displayCtrl 10662) ctrlSetTextColor [_effectBrightness, _effectBrightness, _effectBrightness, 1];
+    TRACE_1("dust",_effectBrightness);
+
     SETDUST(DAMOUNT,CLAMP(GETDUSTT(DAMOUNT) + 1,0,1));
     SETDUST(DBULLETS,0);
 };
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index 0bb6e2386a..9aa9cfb157 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -18,12 +18,12 @@ ACE_Modifier = 0;
     _unit doMove _position;
 }] call CBA_fnc_addEventHandler;
 
-[QGVAR(lampTurnOn), {
+[QGVAR(setLampOn), {
     params ["_lamp", "_hitPointsDamage", "_disabledLampDMG"];
     {if((_x select 1) == _disabledLampDMG) then {_lamp setHit [_x select 0, 0];};nil} count _hitPointsDamage;
 }] call CBA_fnc_addEventHandler;
 
-[QGVAR(lampTurnOff), {
+[QGVAR(setLampOff), {
     params ["_lamp", "_hitPointsDamage", "_disabledLampDMG"];
     {_lamp setHit [_x select 0, (_x select 1) max _disabledLampDMG];nil} count _hitPointsDamage;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp
index 837a0e4b98..c6aff730cf 100644
--- a/addons/interaction/config.cpp
+++ b/addons/interaction/config.cpp
@@ -25,6 +25,6 @@ class ACE_newEvents {
     pardon = QGVAR(pardon);
     tapShoulder = QGVAR(tapShoulder);
     sendAway = QGVAR(sendAway);
-    lampTurnOff = QGVAR(lampTurnOff);
-    lampTurnOn = QGVAR(lampTurnOn);
+    lampTurnOff = QGVAR(setLampOff);
+    lampTurnOn = QGVAR(setLampOn);
 };
diff --git a/addons/interaction/functions/fnc_switchLamp.sqf b/addons/interaction/functions/fnc_switchLamp.sqf
index 5ffe4068c5..f1d9509de8 100644
--- a/addons/interaction/functions/fnc_switchLamp.sqf
+++ b/addons/interaction/functions/fnc_switchLamp.sqf
@@ -29,7 +29,7 @@ private _hitPointsDamage = [];
 } count _reflectors;
 
 //if lamp is on turn it off
-private _eventName = [QGVAR(lampTurnOn), QGVAR(lampTurnOff)] select _isOn;
+private _eventName = [QGVAR(setLampOn), QGVAR(setLampOff)] select _isOn;
 [_eventName, [_lamp, _hitPointsDamage, DISABLED_LAMP_DMG], [_lamp]] call CBA_fnc_targetEvent;
 
 _lamp setVariable ["ACE_lampOn", !_isOn, true];
diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp
index a79a452b7d..fd57d715b8 100644
--- a/addons/medical/config.cpp
+++ b/addons/medical/config.cpp
@@ -29,12 +29,12 @@ class CfgPatches {
 
 class ACE_newEvents {
     medical_onUnconscious = "ace_unconscious";
-    medical_treatmentSuccess = "ace_treatmentSuccess";
+    medical_treatmentSuccess = "ace_treatmentSucceded";
     medical_onSetDead = "ace_killed";
-    Medical_onEnteredCardiacArrest = "ace_enteredCardiacArrest";
-    Medical_onItemAddedToTriageCard = "ace_itemAddedToTriageCard";
+    Medical_onEnteredCardiacArrest = "ace_cardiacArrestEntered";
+    Medical_onItemAddedToTriageCard = "ace_triageCardItemAdded";
     medical_onLogEntryAdded = "ace_medicalLogEntryAdded";
-    Medical_onHeartRateAdjustmentAdded = "ace_addedHeartRateAdjustment";
+    Medical_onHeartRateAdjustmentAdded = "ace_heartRateAdjustmentAdded";
     placedInBodyBag = "ace_placedInBodyBag";
     actionPlaceInBodyBag = QGVAR(actionPlaceInBodyBag);
     treatmentTourniquetLocal = QGVAR(treatmentTourniquetLocal);
diff --git a/addons/medical/functions/fnc_addHeartRateAdjustment.sqf b/addons/medical/functions/fnc_addHeartRateAdjustment.sqf
index 64acf71bb7..a23ea45023 100644
--- a/addons/medical/functions/fnc_addHeartRateAdjustment.sqf
+++ b/addons/medical/functions/fnc_addHeartRateAdjustment.sqf
@@ -22,4 +22,4 @@ private _adjustment = _unit getVariable [QGVAR(heartRateAdjustments), []];
 _adjustment pushBack [_value, _time, _callBack];
 _unit setVariable [QGVAR(heartRateAdjustments), _adjustment];
 
-["ace_addedHeartRateAdjustment", [_unit, _value, _time]] call CBA_fnc_localEvent;
+["ace_heartRateAdjustmentAdded", [_unit, _value, _time]] call CBA_fnc_localEvent;
diff --git a/addons/medical/functions/fnc_addToTriageCard.sqf b/addons/medical/functions/fnc_addToTriageCard.sqf
index cfd58f09b4..0e11f38f77 100644
--- a/addons/medical/functions/fnc_addToTriageCard.sqf
+++ b/addons/medical/functions/fnc_addToTriageCard.sqf
@@ -39,4 +39,4 @@ if (!_inList) then {
     _log pushBack [_newItem, 1, CBA_missionTime];
 };
 _unit setVariable [QGVAR(triageCard), _log, true];
-["ace_itemAddedToTriageCard", [_unit, _newItem, _amount]] call CBA_fnc_localEvent;
+["ace_triageCardItemAdded", [_unit, _newItem, _amount]] call CBA_fnc_localEvent;
diff --git a/addons/medical/functions/fnc_setCardiacArrest.sqf b/addons/medical/functions/fnc_setCardiacArrest.sqf
index 925ff4cc03..f41dda8591 100644
--- a/addons/medical/functions/fnc_setCardiacArrest.sqf
+++ b/addons/medical/functions/fnc_setCardiacArrest.sqf
@@ -21,7 +21,7 @@ if (_unit getVariable [QGVAR(inCardiacArrest),false]) exitWith {};
 _unit setVariable [QGVAR(inCardiacArrest), true,true];
 _unit setVariable [QGVAR(heartRate), 0];
 
-["ace_enteredCardiacArrest", [_unit]] call CBA_fnc_localEvent;
+["ace_cardiacArrestEntered", [_unit]] call CBA_fnc_localEvent;
 
 [_unit, true] call FUNC(setUnconscious);
 _timeInCardiacArrest = 120 + round(random(600));
diff --git a/addons/medical/functions/fnc_treatment_success.sqf b/addons/medical/functions/fnc_treatment_success.sqf
index 0e4609f9c9..4ba3972f5c 100644
--- a/addons/medical/functions/fnc_treatment_success.sqf
+++ b/addons/medical/functions/fnc_treatment_success.sqf
@@ -94,4 +94,4 @@ if (!(_target getVariable [QGVAR(addedToUnitLoop),false])) then {
     [_target] call FUNC(addVitalLoop);
 };
 
-["ace_treatmentSuccess", [_caller, _target, _selectionName, _className]] call CBA_fnc_localEvent;
+["ace_treatmentSucceded", [_caller, _target, _selectionName, _className]] call CBA_fnc_localEvent;
diff --git a/addons/medical_menu/XEH_postInit.sqf b/addons/medical_menu/XEH_postInit.sqf
index e7b7ec40cb..b028a16e75 100644
--- a/addons/medical_menu/XEH_postInit.sqf
+++ b/addons/medical_menu/XEH_postInit.sqf
@@ -6,7 +6,7 @@ GVAR(MenuPFHID) = -1;
 GVAR(lastOpenedOn) = -1;
 GVAR(pendingReopen) = false;
 
-["ace_treatmentSuccess", {
+["ace_treatmentSucceded", {
     if (GVAR(openAfterTreatment) && {GVAR(pendingReopen)}) then {
         GVAR(pendingReopen) = false;
         [{
diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf
index f5a162e075..bc3dfad795 100644
--- a/addons/overheating/XEH_postInit.sqf
+++ b/addons/overheating/XEH_postInit.sqf
@@ -35,8 +35,8 @@ if (hasInterface) then {
         GVAR(storedSpareBarrels) = [] call CBA_fnc_hashCreate;
 
         // Install event handlers for spare barrels
-        [QGVAR(spareBarrelsSendTemperatureHint), FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
-        [QGVAR(spareBarrelsLoadCoolest), FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler;
+        [QGVAR(sendSpareBarrelTemperatureHint), FUNC(sendSpareBarrelsTemperaturesHint)] call CBA_fnc_addEventHandler;
+        [QGVAR(loadCoolestSpareBarrel), FUNC(loadCoolestSpareBarrel)] call CBA_fnc_addEventHandler;
 
         // Schedule cool down calculation of stored spare barrels
         [] call FUNC(updateSpareBarrelsTemperaturesThread);
@@ -60,7 +60,7 @@ if (hasInterface) then {
 
     // Schedule cool down calculation of player weapons at (infrequent) regular intervals
     [] call FUNC(updateTemperatureThread);
-    
+
     // Install event handler to display temp when a barrel was swapped
     [QGVAR(showWeaponTemperature), DFUNC(displayTemperature)] call CBA_fnc_addEventHandler;
     // Install event handler to initiate an assisted barrel swap
diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp
index 86e1804b61..1d8e2d3755 100644
--- a/addons/overheating/config.cpp
+++ b/addons/overheating/config.cpp
@@ -55,7 +55,7 @@ class CfgGesturesMale {
 class ACE_newEvents {
     initiateSwapBarrelAssisted = QGVAR(initiateSwapBarrelAssisted);
     showWeaponTemperature = QGVAR(showWeaponTemperature);
-    spareBarrelsLoadCoolest = QGVAR(spareBarrelsLoadCoolest);
-    spareBarrelsSendTemperatureHint = QGVAR(spareBarrelsSendTemperatureHint);
+    loadCoolestSpareBarrel = QGVAR(loadCoolestSpareBarrel);
+    sendSpareBarrelTemperatureHint = QGVAR(sendSpareBarrelTemperatureHint);
     weaponJammed = "ace_weaponJammed";
 };
diff --git a/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf b/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf
index be2e1ae1a5..8a634409ee 100644
--- a/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf
+++ b/addons/overheating/functions/fnc_checkSpareBarrelsTemperatures.sqf
@@ -29,7 +29,7 @@ if (!([_player, objNull, ["isNotInside", "isNotSitting"]] call EFUNC(common,canI
         params ["_args", "_elapsedTime", "_totalTime", "_errorCode"];
         _args params ["_player"];
         // Time has enlapsed, ask the server to send the hint
-        [QGVAR(spareBarrelsSendTemperatureHint), [_player, _player]] call CBA_fnc_serverEvent;
+        [QGVAR(sendSpareBarrelTemperatureHint), [_player, _player]] call CBA_fnc_serverEvent;
     },
     {},
     (localize LSTRING(CheckingSpareBarrelsTemperatures)),
diff --git a/addons/overheating/functions/fnc_swapBarrelCallback.sqf b/addons/overheating/functions/fnc_swapBarrelCallback.sqf
index 65651fee24..b2d559d1e2 100644
--- a/addons/overheating/functions/fnc_swapBarrelCallback.sqf
+++ b/addons/overheating/functions/fnc_swapBarrelCallback.sqf
@@ -37,7 +37,7 @@ private _barrelMass = 0.50 * (getNumber (configFile >> "CfgWeapons" >> _weapon >
 // store the removed barrel with the former weapon temperature. The server
 // also updates the current weapon temperature to match that of the new
 // loaded barrel.
-[QGVAR(spareBarrelsLoadCoolest), [_assistant, _gunner, _weapon, _temp, _barrelMass]] call CBA_fnc_serverEvent;
+[QGVAR(loadCoolestSpareBarrel), [_assistant, _gunner, _weapon, _temp, _barrelMass]] call CBA_fnc_serverEvent;
 
 // Store the update time
 _gunner setVariable [format [QGVAR(%1_time), _weapon], CBA_missionTime];
diff --git a/addons/parachute/functions/fnc_storeParachute.sqf b/addons/parachute/functions/fnc_storeParachute.sqf
index 55e887f3e6..8980a8ff82 100644
--- a/addons/parachute/functions/fnc_storeParachute.sqf
+++ b/addons/parachute/functions/fnc_storeParachute.sqf
@@ -7,7 +7,6 @@
    *
    * Return Value:
    * 0: Unit
-   * 1: getAllGear-Array
    *
    * Example:
    * None
@@ -16,8 +15,8 @@
    */
 #include "script_component.hpp"
 
-params ["_unit", "_gear"];
-private _backpack = _gear select 6;
+params ["_unit"];
+private _backpack = backpack _unit;
 
 if ((vehicle _unit) isKindOf "ParachuteBase" && {backpack _unit == ""} && {!(_unit getVariable [QGVAR(chuteIsCut),false])} && {_unit getVariable [QGVAR(hasReserve),false]}) then {
     _unit addBackpackGlobal (_unit getVariable[QGVAR(backpackClass),"ACE_NonSteerableParachute"]);
diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf
index 193fdaf79b..b4579a96ee 100644
--- a/addons/reload/XEH_postInit.sqf
+++ b/addons/reload/XEH_postInit.sqf
@@ -27,7 +27,7 @@ if (!hasInterface) exitWith {};
 }] call CBA_fnc_addEventHandler;
 
 // Listen for attempts to link ammo
-[QGVAR(linkedAmmo), {
+[QGVAR(ammoLinked), {
     params ["_receiver", "_giver", "_magazine"];
 
     private _magazineType = currentMagazine _receiver;
@@ -35,7 +35,7 @@ if (!hasInterface) exitWith {};
 
     // Return the magazine if it's the wrong type
     if (_magazineType != (_magazine select 0)) exitWith {
-        [QGVAR(returnedAmmo), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent;
+        [QGVAR(ammoReturned), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent;
     };
 
     private _ammoCount = _receiver ammo currentWeapon _receiver;
@@ -43,7 +43,7 @@ if (!hasInterface) exitWith {};
 
     // Return the magazine if the belt is full or empty
     if ((_ammoCount == 0)  || _ammoMissing == 0) exitWith {
-        [QGVAR(returnedAmmo), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent;
+        [QGVAR(ammoReturned), [_giver,_receiver,_magazine], [_giver]] call CBA_fnc_targetEvent;
     };
 
     // Add the ammo
@@ -51,14 +51,14 @@ if (!hasInterface) exitWith {};
     [QGVAR(syncAmmo), [_receiver, currentWeapon _receiver, _ammoCount + _ammoAdded]] call CBA_fnc_globalEvent;
 
     if ((_magazine select 1) - _ammoAdded > 0) then {
-        [QGVAR(returnedAmmo), [_giver, _receiver, [_magazineType, (_magazine select 1) - _ammoAdded]], [_giver]] call CBA_fnc_targetEvent;
+        [QGVAR(ammoReturned), [_giver, _receiver, [_magazineType, (_magazine select 1) - _ammoAdded]], [_giver]] call CBA_fnc_targetEvent;
     };
 }] call CBA_fnc_addEventHandler;
 
 // Listen for returned magazines
-[QGVAR(returnedAmmo), {
+[QGVAR(ammoReturned), {
     params ["_receiver", "", "_magazine"];
-    TRACE_2("returnedAmmo EH",_receiver,_magazine);
+    TRACE_2("ammoReturned EH",_receiver,_magazine);
 
     _receiver addMagazine _magazine;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/reload/config.cpp b/addons/reload/config.cpp
index e5ffdd033c..9c66dd4828 100644
--- a/addons/reload/config.cpp
+++ b/addons/reload/config.cpp
@@ -23,6 +23,6 @@ class CfgPatches {
 
 class ACE_newEvents {
     setAmmoSync = QGVAR(syncAmmo);
-    returnedAmmo = QGVAR(returnedAmmo);
-    linkedAmmo = QGVAR(linkedAmmo);
+    returnedAmmo = QGVAR(ammoReturned);
+    linkedAmmo = QGVAR(ammoLinked);
 };
diff --git a/addons/reload/functions/fnc_startLinkingBelt.sqf b/addons/reload/functions/fnc_startLinkingBelt.sqf
index dc63e15fb0..1590abbfab 100644
--- a/addons/reload/functions/fnc_startLinkingBelt.sqf
+++ b/addons/reload/functions/fnc_startLinkingBelt.sqf
@@ -46,7 +46,7 @@ private _onFinish = {
     (_this select 0) params ["_player", "_target", "_magazine"];
 
     // Raise event on remote unit
-    [QGVAR(linkedAmmo), [_target, _player, _magazine], [_target]] call CBA_fnc_targetEvent;
+    [QGVAR(ammoLinked), [_target, _player, _magazine], [_target]] call CBA_fnc_targetEvent;
 };
 
 private _onFailure = {