diff --git a/addons/atragmx/XEH_postInit.sqf b/addons/atragmx/XEH_postInit.sqf
index dc4230ebaa..5cbdea57b8 100644
--- a/addons/atragmx/XEH_postInit.sqf
+++ b/addons/atragmx/XEH_postInit.sqf
@@ -49,4 +49,4 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) ==
 [] call FUNC(init);
 [] call FUNC(restore_user_data);
 
-["ace_rangerfinderData", {_this call FUNC(sord)}] call CBA_fnc_addEventHandler;
+["ace_rangefinderData", {_this call FUNC(sord)}] call CBA_fnc_addEventHandler;
diff --git a/addons/atragmx/config.cpp b/addons/atragmx/config.cpp
index 925c1a4dfc..d46b0f1583 100644
--- a/addons/atragmx/config.cpp
+++ b/addons/atragmx/config.cpp
@@ -16,5 +16,5 @@ class CfgPatches {
 #include "CfgWeapons.hpp"
 #include "RscTitles.hpp"
 class ACE_newEvents {
-    RangerfinderData = "ace_rangerfinderData";
-};
\ No newline at end of file
+    RangerfinderData = "ace_rangefinderData";
+};
diff --git a/addons/backpacks/config.cpp b/addons/backpacks/config.cpp
index 212ea47b5f..520d83a240 100644
--- a/addons/backpacks/config.cpp
+++ b/addons/backpacks/config.cpp
@@ -16,5 +16,4 @@ class CfgPatches {
 
 class ACE_newEvents {
     backpackOpened = "ace_backpackOpened";
-    backpackOpened = "ace_backpackOpened";
-};
\ No newline at end of file
+};
diff --git a/addons/captives/config.cpp b/addons/captives/config.cpp
index 8b3aec38f2..e526f11019 100644
--- a/addons/captives/config.cpp
+++ b/addons/captives/config.cpp
@@ -27,11 +27,4 @@ class ACE_newEvents {
     MoveInCaptive = "ace_moveInCaptive";
     playerChanged = "ace_playerChanged";
     CaptiveStatusChanged = "ace_captiveStatusChanged";
-    CaptiveStatusChanged = "ace_captiveStatusChanged";
-    SetSurrendered = "ace_setSurrendered";
-    SetHandcuffed = "ace_setHandcuffed";
-    MoveOutCaptive = "ace_moveOutCaptive";
-    SetHandcuffed = "ace_setHandcuffed";
-    MoveInCaptive = "ace_moveInCaptive";
-    SetHandcuffed = "ace_setHandcuffed";
-};
\ No newline at end of file
+};
diff --git a/addons/cargo/config.cpp b/addons/cargo/config.cpp
index 1c20a0d762..73efef25ba 100644
--- a/addons/cargo/config.cpp
+++ b/addons/cargo/config.cpp
@@ -22,15 +22,9 @@ class ACE_newEvents {
     cargoUnloaded = "ace_cargoUnloaded";
     displayTextStructured = "ace_displayTextStructured";
     cargoLoaded = "ace_cargoLoaded";
-    displayTextStructured = "ace_displayTextStructured";
     AddCargoByClass = "ace_addCargoByClass";
     ServerUnloadCargo = "ace_serverUnloadCargo";
-    displayTextStructured = "ace_displayTextStructured";
-    displayTextStructured = "ace_displayTextStructured";
     UnloadCargo = "ace_unloadCargo";
-    displayTextStructured = "ace_displayTextStructured";
-    LoadCargo = "ace_loadCargo";
     hideObjectGlobal = "ace_hideObjectGlobal";
-    AddCargoByClass = "ace_addCargoByClass";
     cargoAddedByClass = "ace_cargoAddedByClass";
-};
\ No newline at end of file
+};
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index bc109cb636..26f25d9ea4 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -178,14 +178,14 @@ if (isServer) then {
 if (!isServer) then {
     ["PlayerJip", {
         ACE_LOGINFO("JIP event synchronization initialized");
-        ["ace_sEH_all", [player]] call CBA_fnc_serverEvent;
+        ["ace_SEH_all", [player]] call CBA_fnc_serverEvent;
     }] call CBA_fnc_addEventHandler;
 } else {
-    ["ace_sEH_all", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
+    ["ace_SEH_all", FUNC(_handleRequestAllSyncedEvents)] call CBA_fnc_addEventHandler;
 };
 
-["ace_sEH", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
-["ace_sEH_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
+["ace_SEH", FUNC(_handleSyncedEvent)] call CBA_fnc_addEventHandler;
+["ace_SEH_s", FUNC(_handleRequestSyncedEvent)] call CBA_fnc_addEventHandler;
 
 if (isServer) then {
     [FUNC(syncedEventPFH), 0.5, []] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/common/config.cpp b/addons/common/config.cpp
index 3a9a962d9c..bf911907ad 100644
--- a/addons/common/config.cpp
+++ b/addons/common/config.cpp
@@ -30,10 +30,9 @@ class ACE_newEvents {
     playerChanged = "ace_playerChanged";
     SettingsInitialized = "ace_settingsInitialized";
     InitSettingsFromModules = "ace_initSettingsFromModules";
-    SEH_s = "ace_sEH_s";
-    SEH = "ace_sEH";
-    SEH_all = "ace_sEH_all";
-    SEH_all = "ace_sEH_all";
+    SEH_s = "ace_SEH_s";
+    SEH = "ace_SEH";
+    SEH_all = "ace_SEH_all";
     enableSimulationGlobal = "ace_enableSimulationGlobal";
     hideObjectGlobal = "ace_hideObjectGlobal";
     setVanillaHitPointDamage = "ace_setVanillaHitPointDamage";
@@ -53,24 +52,8 @@ class ACE_newEvents {
     fixFloating = "ace_fixFloating";
     fixCollision = "ace_fixCollision";
     setStatusEffect = "ace_setStatusEffect";
-    SEH_s = "ace_sEH_s";
-    SEH_s = "ace_sEH_s";
-    setSpeaker = "ace_setSpeaker";
-    displayTextStructured = "ace_displayTextStructured";
-    unloadPersonEvent = "ace_unloadPersonEvent";
-    hideObjectGlobal = "ace_hideObjectGlobal";
-    SEH = "ace_sEH";
     SettingChanged = "ace_settingChanged";
-    SettingChanged = "ace_settingChanged";
-    SEH_s = "ace_sEH_s";
-    setSpeaker = "ace_setSpeaker";
-    setSpeaker = "ace_setSpeaker";
-    setSpeaker = "ace_setSpeaker";
-    loadPersonEvent = "ace_loadPersonEvent";
-    hideObjectGlobal = "ace_hideObjectGlobal";
     HeadbugFixUsed = "ace_headbugFixUsed";
-    HeadbugFixUsed = "ace_headbugFixUsed";
-    blockDamage = "ace_blockDamage";
     blockDamage = "ace_blockDamage";
     firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
     firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
@@ -78,18 +61,8 @@ class ACE_newEvents {
     firedNonPlayer = "ace_firedNonPlayer";
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";
     firedPlayer = "ace_firedPlayer";
-    switchMove = "ace_switchMove";
-    playMoveNow = "ace_playMoveNow";
-    playMoveNow = "ace_playMoveNow";
-    playMoveNow = "ace_playMoveNow";
-    playMoveNow = "ace_playMoveNow";
-    playMove = "ace_playMove";
-    playMove = "ace_playMove";
     unlockVehicle = "ace_unlockVehicle";
     lockVehicle = "ace_lockVehicle";
-    playerInventoryChanged = "ace_playerInventoryChanged";
-    SettingChanged = "ace_settingChanged";
-    playMoveNow = QGVAR(playMoveNow);
 };
 
 #include "CfgEventHandlers.hpp"
diff --git a/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf b/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf
index 1d4ac98f3c..5c95d7c030 100644
--- a/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf
+++ b/addons/common/functions/fnc__handleRequestAllSyncedEvents.sqf
@@ -18,7 +18,7 @@ params ["_client"];
     private _eventEntry = HASH_GET(GVAR(syncedEvents),_x);
     _eventEntry params ["", "_eventLog"];
 
-    ["ace_sEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
+    ["ace_SEH_s", [_x, _eventLog], _client] call CBA_fnc_targetEvent;
     false
 } count (GVAR(syncedEvents) select 0);
 
diff --git a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf
index 4dd2e6359e..ed55997baa 100644
--- a/addons/common/functions/fnc__handleRequestSyncedEvent.sqf
+++ b/addons/common/functions/fnc__handleRequestSyncedEvent.sqf
@@ -30,7 +30,7 @@ if (isServer) then {
     private _eventEntry = HASH_GET(GVAR(syncedEvents),_eventName);
     _eventEntry params ["", "_eventLog"];
 
-    ["ace_sEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
+    ["ace_SEH_s", [_eventName, _eventLog], _client] call CBA_fnc_targetEvent;
 } else {
     params ["_eventName", "_eventLog"];
 
diff --git a/addons/common/functions/fnc_requestSyncedEvent.sqf b/addons/common/functions/fnc_requestSyncedEvent.sqf
index da01201395..5527030764 100644
--- a/addons/common/functions/fnc_requestSyncedEvent.sqf
+++ b/addons/common/functions/fnc_requestSyncedEvent.sqf
@@ -17,4 +17,4 @@ params ["_eventName"];
 // Only JIP machines on initialization send this off, requesting sync on events with the serverCommand
 if (isServer) exitWith {false};
 
-["ace_sEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;
+["ace_SEH_s", [_eventName, ACE_player]] call CBA_fnc_serverEvent;
diff --git a/addons/common/functions/fnc_syncedEvent.sqf b/addons/common/functions/fnc_syncedEvent.sqf
index 996ff0f4c8..08734463be 100644
--- a/addons/common/functions/fnc_syncedEvent.sqf
+++ b/addons/common/functions/fnc_syncedEvent.sqf
@@ -23,4 +23,4 @@ if (!HASH_HASKEY(GVAR(syncedEvents),_name)) exitWith {
 
 private _eventData = [_name, _args, _ttl];
 
-["ace_sEH", _eventData] call CBA_fnc_globalEvent;
+["ace_SEH", _eventData] call CBA_fnc_globalEvent;
diff --git a/addons/dagr/XEH_postInit.sqf b/addons/dagr/XEH_postInit.sqf
index 84e45a8f85..512ec68eef 100644
--- a/addons/dagr/XEH_postInit.sqf
+++ b/addons/dagr/XEH_postInit.sqf
@@ -30,4 +30,4 @@ GVAR(vectorConnected) = false;
 GVAR(noVectorData) = true;
 GVAR(vectorGrid) = "00000000";
 
-["ace_rangerfinderData", FUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;
+["ace_rangefinderData", FUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;
diff --git a/addons/dagr/config.cpp b/addons/dagr/config.cpp
index fc63e4a0ec..e619f88717 100644
--- a/addons/dagr/config.cpp
+++ b/addons/dagr/config.cpp
@@ -18,5 +18,5 @@ class CfgPatches {
 #include "RscTitles.hpp"
 
 class ACE_newEvents {
-    RangerfinderData = "ace_rangerfinderData";
+    RangerfinderData = "ace_rangefinderData";
 };
\ No newline at end of file
diff --git a/addons/disarming/config.cpp b/addons/disarming/config.cpp
index d8358a2bd3..b7868726ed 100644
--- a/addons/disarming/config.cpp
+++ b/addons/disarming/config.cpp
@@ -21,6 +21,4 @@ class CfgPatches {
 class ACE_newEvents {
     DisarmDebugCallback = "ace_disarmDebugCallback";
     DisarmDropItems = "ace_disarmDropItems";
-    DisarmDropItems = "ace_disarmDropItems";
-    DisarmDebugCallback = "ace_disarmDebugCallback";
-};
\ No newline at end of file
+};
diff --git a/addons/dragging/config.cpp b/addons/dragging/config.cpp
index 59bec425d8..ef9d57bcd1 100644
--- a/addons/dragging/config.cpp
+++ b/addons/dragging/config.cpp
@@ -25,11 +25,4 @@ class ACE_newEvents {
     fixFloating = "ace_fixFloating";
     fixPosition = "ace_fixPosition";
     fixCollision = "ace_fixCollision";
-    fixCollision = "ace_fixCollision";
-    fixFloating = "ace_fixFloating";
-    fixPosition = "ace_fixPosition";
-    fixCollision = "ace_fixCollision";
-    fixCollision = "ace_fixCollision";
-    setDir = "ace_setDir";
-    setDir = "ace_setDir";
-};
\ No newline at end of file
+};
diff --git a/addons/gforces/config.cpp b/addons/gforces/config.cpp
index d0d7965ffa..79a2a850ed 100644
--- a/addons/gforces/config.cpp
+++ b/addons/gforces/config.cpp
@@ -13,9 +13,7 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-
 #include "CfgWeapons.hpp"
-
 #include "CfgVehicles.hpp"
 
 class ACE_newEvents {
diff --git a/addons/goggles/config.cpp b/addons/goggles/config.cpp
index 7f7d932cb1..409f114b98 100644
--- a/addons/goggles/config.cpp
+++ b/addons/goggles/config.cpp
@@ -276,5 +276,4 @@ class ACE_newEvents {
     cameraViewChanged = "ace_cameraViewChanged";
     GlassesChanged = "ace_glassesChanged";
     GlassesCracked = "ace_glassesCracked";
-    GlassesCracked = "ace_glassesCracked";
-};
\ No newline at end of file
+};
diff --git a/addons/grenades/config.cpp b/addons/grenades/config.cpp
index 27c729f06d..01c3b51bdb 100644
--- a/addons/grenades/config.cpp
+++ b/addons/grenades/config.cpp
@@ -25,5 +25,4 @@ class ACE_newEvents {
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";
     firedPlayer = "ace_firedPlayer";
     flashbangExplosion = "ace_flashbangExplosion";
-    flashbangExplosion = "ace_flashbangExplosion";
-};
\ No newline at end of file
+};
diff --git a/addons/hearing/config.cpp b/addons/hearing/config.cpp
index 1654f083d7..255f0e6cb5 100644
--- a/addons/hearing/config.cpp
+++ b/addons/hearing/config.cpp
@@ -29,4 +29,4 @@ class ACE_newEvents {
     playerInventoryChanged = "ace_playerInventoryChanged";
     playerTurretChanged = "ace_playerTurretChanged";
     playerVehicleChanged = "ace_playerVehicleChanged";
-};
\ No newline at end of file
+};
diff --git a/addons/interact_menu/config.cpp b/addons/interact_menu/config.cpp
index 663eaccea8..898829dd5e 100644
--- a/addons/interact_menu/config.cpp
+++ b/addons/interact_menu/config.cpp
@@ -29,9 +29,5 @@ class ACE_newEvents {
     playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
     clearConditionCaches = "ace_clearConditionCaches";
-    clearConditionCaches = "ace_clearConditionCaches";
     interactMenuClosed = "ace_interactMenuClosed";
-    clearConditionCaches = "ace_clearConditionCaches";
-    clearConditionCaches = "ace_clearConditionCaches";
-    interactMenuOpened = "ace_interactMenuOpened";
-};
\ No newline at end of file
+};
diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp
index b914d94bee..9359c10df1 100644
--- a/addons/interaction/config.cpp
+++ b/addons/interaction/config.cpp
@@ -25,9 +25,6 @@ class ACE_newEvents {
     sendAway = "ace_sendAway";
     setVelocity = "ace_setVelocity";
     displayTextStructured = "ace_displayTextStructured";
-    pardon = "ace_pardon";
-    displayTextStructured = "ace_displayTextStructured";
-    CBA_teamColorChanged = "ace_cBA_teamColorChanged";
-    getDown = "ace_getDown";
+    CBA_teamColorChanged = "ace_CBA_teamColorChanged";
     selectLeader = "ace_selectLeader";
-};
\ No newline at end of file
+};
diff --git a/addons/interaction/functions/fnc_joinTeam.sqf b/addons/interaction/functions/fnc_joinTeam.sqf
index 46b0f79d5f..bd3db0e294 100644
--- a/addons/interaction/functions/fnc_joinTeam.sqf
+++ b/addons/interaction/functions/fnc_joinTeam.sqf
@@ -18,7 +18,7 @@
 
 params ["_unit", "_team"];
 
-["ace_cBA_teamColorChanged", [_unit, _team]] call CBA_fnc_globalEvent;
+["ace_CBA_teamColorChanged", [_unit, _team]] call CBA_fnc_globalEvent;
 
 // display message
 if (_unit == ACE_player) then {
diff --git a/addons/laser/config.cpp b/addons/laser/config.cpp
index 3a334f3b9d..746471a493 100644
--- a/addons/laser/config.cpp
+++ b/addons/laser/config.cpp
@@ -17,6 +17,4 @@ class CfgPatches {
 class ACE_newEvents {
     laser_laserOff = "ace_laser_laserOff";
     laser_laserOn = "ace_laser_laserOn";
-    laser_laserOn = "ace_laser_laserOn";
-    laser_laserOff = "ace_laser_laserOff";
-};
\ No newline at end of file
+};
diff --git a/addons/maptools/config.cpp b/addons/maptools/config.cpp
index 2d9d92345a..01a68e9d3c 100644
--- a/addons/maptools/config.cpp
+++ b/addons/maptools/config.cpp
@@ -72,8 +72,4 @@ class ACE_newEvents {
     drawing_requestMarkers = "ace_drawing_requestMarkers";
     drawing_addLineMarker = "ace_drawing_addLineMarker";
     drawing_removeLineMarker = "ace_drawing_removeLineMarker";
-    drawing_addLineMarker = "ace_drawing_addLineMarker";
-    drawing_removeLineMarker = "ace_drawing_removeLineMarker";
-    drawing_requestMarkers = "ace_drawing_requestMarkers";
-    drawing_sendbackMarkers = "ace_drawing_sendbackMarkers";
-};
\ No newline at end of file
+};
diff --git a/addons/medical/config.cpp b/addons/medical/config.cpp
index 832be32cb6..e78c5bea03 100644
--- a/addons/medical/config.cpp
+++ b/addons/medical/config.cpp
@@ -50,63 +50,14 @@ class ACE_newEvents {
     medical_woundUpdateRequest = "ace_medical_woundUpdateRequest";
     medical_propagateWound = "ace_medical_propagateWound";
     useItem = "ace_useItem";
-    useItem = "ace_useItem";
-    useItem = "ace_useItem";
-    useItem = "ace_useItem";
-    useItem = "ace_useItem";
-    useItem = "ace_useItem";
-    medical_onUnconscious = "ace_medical_onUnconscious";
-    medical_onUnconscious = "ace_medical_onUnconscious";
     medical_treatmentSuccess = "ace_medical_treatmentSuccess";
-    treatmentTourniquetLocal = "ace_treatmentTourniquetLocal";
-    treatmentTourniquetLocal = "ace_treatmentTourniquetLocal";
     displayTextStructured = "ace_displayTextStructured";
-    displayTextStructured = "ace_displayTextStructured";
-    treatmentIVLocal = "ace_treatmentIVLocal";
-    treatmentIVLocal = "ace_treatmentIVLocal";
-    treatmentBasic_morphineLocal = "ace_treatmentBasic_morphineLocal";
-    treatmentBasic_morphineLocal = "ace_treatmentBasic_morphineLocal";
-    treatmentBasic_bloodbagLocal = "ace_treatmentBasic_bloodbagLocal";
-    treatmentBasic_bloodbagLocal = "ace_treatmentBasic_bloodbagLocal";
-    treatmentBasic_bandageLocal = "ace_treatmentBasic_bandageLocal";
-    treatmentBasic_bandageLocal = "ace_treatmentBasic_bandageLocal";
-    treatmentAdvanced_medicationLocal = "ace_treatmentAdvanced_medicationLocal";
-    treatmentAdvanced_fullHealLocal = "ace_treatmentAdvanced_fullHealLocal";
-    treatmentAdvanced_fullHealLocal = "ace_treatmentAdvanced_fullHealLocal";
-    treatmentAdvanced_CPRLocal = "ace_treatmentAdvanced_CPRLocal";
-    treatmentAdvanced_CPRLocal = "ace_treatmentAdvanced_CPRLocal";
-    medical_propagateWound = "ace_medical_propagateWound";
-    treatmentAdvanced_bandageLocal = "ace_treatmentAdvanced_bandageLocal";
-    treatmentAdvanced_bandageLocal = "ace_treatmentAdvanced_bandageLocal";
-    displayTextStructured = "ace_displayTextStructured";
-    medical_onUnconscious = "ace_medical_onUnconscious";
-    setUnconscious = "ace_setUnconscious";
-    setHitPointDamage = "ace_setHitPointDamage";
     medical_onSetDead = "ace_medical_onSetDead";
-    setDead = "ace_setDead";
     Medical_onEnteredCardiacArrest = "ace_medical_onEnteredCardiacArrest";
     hideObjectGlobal = "ace_hideObjectGlobal";
-    medical_woundUpdateRequest = "ace_medical_woundUpdateRequest";
-    medical_propagateWound = "ace_medical_propagateWound";
-    displayTextStructured = "ace_displayTextStructured";
     addVitalLoop = "ace_addVitalLoop";
     Medical_onItemAddedToTriageCard = "ace_medical_onItemAddedToTriageCard";
-    addToTriageCard = "ace_addToTriageCard";
     medical_onLogEntryAdded = "ace_medical_onLogEntryAdded";
-    addToMedicalLog = "ace_addToMedicalLog";
     Medical_onHeartRateAdjustmentAdded = "ace_medical_onHeartRateAdjustmentAdded";
     unloadPersonEvent = "ace_unloadPersonEvent";
-    treatmentAdvanced_medicationLocal = "ace_treatmentAdvanced_medicationLocal";
-    displayTextStructured = "ace_displayTextStructured";
-    placedInBodyBag = "ace_placedInBodyBag";
-    actionPlaceInBodyBag = "ace_actionPlaceInBodyBag";
-    displayTextStructured = "ace_displayTextStructured";
-    displayTextStructured = "ace_displayTextStructured";
-    displayTextStructured = "ace_displayTextStructured";
-    displayTextStructured = "ace_displayTextStructured";
-    actionCheckPulseLocal = "ace_actionCheckPulseLocal";
-    actionCheckPulseLocal = "ace_actionCheckPulseLocal";
-    displayTextStructured = "ace_displayTextStructured";
-    actionCheckBloodPressureLocal = "ace_actionCheckBloodPressureLocal";
-    actionCheckBloodPressureLocal = "ace_actionCheckBloodPressureLocal";
-};
\ No newline at end of file
+};
diff --git a/addons/medical_menu/config.cpp b/addons/medical_menu/config.cpp
index 960ff0bf71..0183c0207f 100644
--- a/addons/medical_menu/config.cpp
+++ b/addons/medical_menu/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_medical"};
         author[] = {$STR_ACE_Common_ACETeam, "Glowbal"};
-        authorUrl = "http://ace3mod.com"; 
+        authorUrl = "http://ace3mod.com";
         VERSION_CONFIG;
     };
 };
@@ -21,4 +21,4 @@ class ACE_newEvents {
     medical_treatmentSuccess = "ace_medical_treatmentSuccess";
     Medical_onMenuOpen = "ace_medical_onMenuOpen";
     displayTextStructured = "ace_displayTextStructured";
-};
\ No newline at end of file
+};
diff --git a/addons/microdagr/XEH_clientInit.sqf b/addons/microdagr/XEH_clientInit.sqf
index 6f52de1776..62d49a1fd3 100644
--- a/addons/microdagr/XEH_clientInit.sqf
+++ b/addons/microdagr/XEH_clientInit.sqf
@@ -20,7 +20,7 @@ _closeCode = {
 
 
 //Add Eventhandler:
-["ace_rangerfinderData", {_this call FUNC(recieveRangefinderData)}] call CBA_fnc_addEventHandler;
+["ace_rangefinderData", {_this call FUNC(recieveRangefinderData)}] call CBA_fnc_addEventHandler;
 
 //Global Variables to default:
 GVAR(gpsPositionASL) = [0,0,0];
diff --git a/addons/microdagr/config.cpp b/addons/microdagr/config.cpp
index ecb4ac2e97..4cbc4b4cbf 100644
--- a/addons/microdagr/config.cpp
+++ b/addons/microdagr/config.cpp
@@ -19,5 +19,5 @@ class CfgPatches {
 #include "ACE_Settings.hpp"
 
 class ACE_newEvents {
-    RangerfinderData = "ace_rangerfinderData";
+    RangerfinderData = "ace_rangefinderData";
 };
\ No newline at end of file
diff --git a/addons/mk6mortar/config.cpp b/addons/mk6mortar/config.cpp
index d108c81ff3..31fba6f7ba 100644
--- a/addons/mk6mortar/config.cpp
+++ b/addons/mk6mortar/config.cpp
@@ -37,5 +37,4 @@ class ACE_newEvents {
     infoDisplayChanged = "ace_infoDisplayChanged";
     playerVehicleChanged = "ace_playerVehicleChanged";
     initMortar = "ace_initMortar";
-    initMortar = "ace_initMortar";
-};
\ No newline at end of file
+};
diff --git a/addons/optics/config.cpp b/addons/optics/config.cpp
index 382f97e555..64affd601f 100644
--- a/addons/optics/config.cpp
+++ b/addons/optics/config.cpp
@@ -37,4 +37,4 @@ class CfgPatches {
 class ACE_newEvents {
     infoDisplayChanged = "ace_infoDisplayChanged";
     firedPlayer = "ace_firedPlayer";
-};
\ No newline at end of file
+};
diff --git a/addons/overheating/config.cpp b/addons/overheating/config.cpp
index dcf9c64ea3..89158a67e1 100644
--- a/addons/overheating/config.cpp
+++ b/addons/overheating/config.cpp
@@ -58,9 +58,6 @@ class ACE_newEvents {
     firedPlayer = "ace_firedPlayer";
     spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
     spareBarrelsSendTemperatureHint = "ace_spareBarrelsSendTemperatureHint";
-    spareBarrelsLoadCoolest = "ace_spareBarrelsLoadCoolest";
-    initiateSwapBarrelAssisted = "ace_initiateSwapBarrelAssisted";
     displayTextStructured = "ace_displayTextStructured";
-    showWeaponTemperature = "ace_showWeaponTemperature";
     weaponJammed = "ace_weaponJammed";
-};
\ No newline at end of file
+};
diff --git a/addons/overpressure/config.cpp b/addons/overpressure/config.cpp
index 443bee528d..5e37dd9ecb 100644
--- a/addons/overpressure/config.cpp
+++ b/addons/overpressure/config.cpp
@@ -19,6 +19,4 @@ class ACE_newEvents {
     firedPlayerVehicle = "ace_firedPlayerVehicle";
     firedPlayer = "ace_firedPlayer";
     overpressure = "ace_overpressure";
-    overpressure = "ace_overpressure";
-    overpressure = "ace_overpressure";
-};
\ No newline at end of file
+};
diff --git a/addons/rearm/config.cpp b/addons/rearm/config.cpp
index 305167b860..006e3e8bcc 100644
--- a/addons/rearm/config.cpp
+++ b/addons/rearm/config.cpp
@@ -22,4 +22,4 @@ class CfgPatches {
 class ACE_newEvents {
     playerVehicleChanged = "ace_playerVehicleChanged";
     medical_onUnconscious = "ace_medical_onUnconscious";
-};
\ No newline at end of file
+};
diff --git a/addons/refuel/config.cpp b/addons/refuel/config.cpp
index a030633d0a..b903970a3b 100644
--- a/addons/refuel/config.cpp
+++ b/addons/refuel/config.cpp
@@ -21,5 +21,4 @@ class ACE_newEvents {
     setFuel = "ace_setFuel";
     setVectorDirAndUp = "ace_setVectorDirAndUp";
     displayTextStructured = "ace_displayTextStructured";
-    displayTextStructured = "ace_displayTextStructured";
-};
\ No newline at end of file
+};
diff --git a/addons/reload/config.cpp b/addons/reload/config.cpp
index cd22dfc98c..e82dab39c8 100644
--- a/addons/reload/config.cpp
+++ b/addons/reload/config.cpp
@@ -25,8 +25,5 @@ class CfgPatches {
 class ACE_newEvents {
     setAmmoSync = "ace_setAmmoSync";
     returnedAmmo = "ace_returnedAmmo";
-    setAmmoSync = "ace_setAmmoSync";
-    returnedAmmo = "ace_returnedAmmo";
-    returnedAmmo = "ace_returnedAmmo";
     linkedAmmo = "ace_linkedAmmo";
-};
\ No newline at end of file
+};
diff --git a/addons/reloadlaunchers/config.cpp b/addons/reloadlaunchers/config.cpp
index df2a8e5e35..915316ac39 100644
--- a/addons/reloadlaunchers/config.cpp
+++ b/addons/reloadlaunchers/config.cpp
@@ -19,5 +19,4 @@ class CfgPatches {
 
 class ACE_newEvents {
     reloadLauncher = "ace_reloadLauncher";
-    reloadLauncher = "ace_reloadLauncher";
-};
\ No newline at end of file
+};
diff --git a/addons/repair/config.cpp b/addons/repair/config.cpp
index e4f3807e38..84d8a6fa83 100644
--- a/addons/repair/config.cpp
+++ b/addons/repair/config.cpp
@@ -24,18 +24,8 @@ class ACE_newEvents {
     setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
     setVehicleDamage = "ace_setVehicleDamage";
     fixPosition = "ace_fixPosition";
-    fixCollision = "ace_fixCollision";
-    displayTextStructured = "ace_displayTextStructured";
     displayTextStructured = "ace_displayTextStructured";
     engineOn = "ace_engineOn";
-    setWheelHitPointDamage = "ace_setWheelHitPointDamage";
-    setWheelHitPointDamage = "ace_setWheelHitPointDamage";
-    setWheelHitPointDamage = "ace_setWheelHitPointDamage";
-    setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
-    setVehicleHitPointDamage = "ace_setVehicleHitPointDamage";
-    setWheelHitPointDamage = "ace_setWheelHitPointDamage";
-    fixCollision = "ace_fixCollision";
-    setWheelHitPointDamage = "ace_setWheelHitPointDamage";
     fixCollision = "ace_fixCollision";
     AddCargoByClass = "ace_addCargoByClass";
-};
\ No newline at end of file
+};
diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp
index e723e6a6f5..e70532fee0 100644
--- a/addons/respawn/config.cpp
+++ b/addons/respawn/config.cpp
@@ -23,6 +23,4 @@ class ACE_newEvents {
     playerChanged = "ace_playerChanged";
     rallypointMoved = "ace_rallypointMoved";
     killedByFriendly = "ace_killedByFriendly";
-    rallypointMoved = "ace_rallypointMoved";
-    rallypointMoved = "ace_rallypointMoved";
-};
\ No newline at end of file
+};
diff --git a/addons/sandbag/config.cpp b/addons/sandbag/config.cpp
index 1f3c7e1652..80938d6ff4 100644
--- a/addons/sandbag/config.cpp
+++ b/addons/sandbag/config.cpp
@@ -21,4 +21,4 @@ class ACE_newEvents {
     playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
     enableSimulationGlobal = "ace_enableSimulationGlobal";
-};
\ No newline at end of file
+};
diff --git a/addons/scopes/config.cpp b/addons/scopes/config.cpp
index 63eab66219..038739d558 100644
--- a/addons/scopes/config.cpp
+++ b/addons/scopes/config.cpp
@@ -27,4 +27,4 @@ class ACE_newEvents {
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";
     firedPlayer = "ace_firedPlayer";
     playerInventoryChanged = "ace_playerInventoryChanged";
-};
\ No newline at end of file
+};
diff --git a/addons/tacticalladder/config.cpp b/addons/tacticalladder/config.cpp
index 9ef3e2e42b..81b210c80c 100644
--- a/addons/tacticalladder/config.cpp
+++ b/addons/tacticalladder/config.cpp
@@ -20,4 +20,4 @@ class ACE_newEvents {
     playerVehicleChanged = "ace_playerVehicleChanged";
     playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
-};
\ No newline at end of file
+};
diff --git a/addons/tagging/config.cpp b/addons/tagging/config.cpp
index 38d974a8ec..96ecadbf03 100644
--- a/addons/tagging/config.cpp
+++ b/addons/tagging/config.cpp
@@ -17,7 +17,6 @@ class CfgPatches {
 #include "CfgWeapons.hpp"
 
 class ACE_newEvents {
-    createTag = "ace_createTag";
     createTag = "ace_createTag";
     tagCreated = "ace_tagCreated";
-};
\ No newline at end of file
+};
diff --git a/addons/trenches/config.cpp b/addons/trenches/config.cpp
index ad484212f0..3d5c3a5a17 100644
--- a/addons/trenches/config.cpp
+++ b/addons/trenches/config.cpp
@@ -23,4 +23,4 @@ class ACE_newEvents {
     playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
     enableSimulationGlobal = "ace_enableSimulationGlobal";
-};
\ No newline at end of file
+};
diff --git a/addons/tripod/config.cpp b/addons/tripod/config.cpp
index f4a5163980..f57dbb7b9e 100644
--- a/addons/tripod/config.cpp
+++ b/addons/tripod/config.cpp
@@ -19,4 +19,4 @@ class ACE_newEvents {
     playerVehicleChanged = "ace_playerVehicleChanged";
     playerChanged = "ace_playerChanged";
     interactMenuOpened = "ace_interactMenuOpened";
-};
\ No newline at end of file
+};
diff --git a/addons/ui/config.cpp b/addons/ui/config.cpp
index 36f97719e7..b00b209f52 100644
--- a/addons/ui/config.cpp
+++ b/addons/ui/config.cpp
@@ -21,4 +21,4 @@ class CfgPatches {
 
 class ACE_newEvents {
     SettingsInitialized = "ace_settingsInitialized";
-};
\ No newline at end of file
+};
diff --git a/addons/vector/config.cpp b/addons/vector/config.cpp
index a39bab6e72..fae30f790e 100644
--- a/addons/vector/config.cpp
+++ b/addons/vector/config.cpp
@@ -20,5 +20,5 @@ class CfgPatches {
 #include "RscInGameUI.hpp"
 
 class ACE_newEvents {
-    RangerfinderData = "ace_rangerfinderData";
-};
\ No newline at end of file
+    RangerfinderData = "ace_rangefinderData";
+};
diff --git a/addons/vector/functions/fnc_dataTransfer.sqf b/addons/vector/functions/fnc_dataTransfer.sqf
index 6c51332e88..1c3a67c1cb 100644
--- a/addons/vector/functions/fnc_dataTransfer.sqf
+++ b/addons/vector/functions/fnc_dataTransfer.sqf
@@ -22,4 +22,4 @@ _direction = call FUNC(getDirection);
 _azimuth = _direction select 0;
 _inclination = _direction select 1;
 //Send Data to connected GPS
-["ace_rangerfinderData", [_distance, _azimuth, _inclination]] call CBA_fnc_localEvent;
\ No newline at end of file
+["ace_rangefinderData", [_distance, _azimuth, _inclination]] call CBA_fnc_localEvent;
\ No newline at end of file
diff --git a/addons/vehiclelock/config.cpp b/addons/vehiclelock/config.cpp
index 31a87fafdf..8dbc7a5ece 100644
--- a/addons/vehiclelock/config.cpp
+++ b/addons/vehiclelock/config.cpp
@@ -22,7 +22,4 @@ class ACE_newEvents {
     SettingsInitialized = "ace_settingsInitialized";
     VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
     VehicleLock_SetupCustomKey = "ace_vehicleLock_SetupCustomKey";
-    VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
-    VehicleLock_SetVehicleLock = "ace_vehicleLock_SetVehicleLock";
-    VehicleLock_SetupCustomKey = "ace_vehicleLock_SetupCustomKey";
-};
\ No newline at end of file
+};
diff --git a/addons/viewdistance/config.cpp b/addons/viewdistance/config.cpp
index 83fda3cc09..a9af73b78e 100644
--- a/addons/viewdistance/config.cpp
+++ b/addons/viewdistance/config.cpp
@@ -18,4 +18,4 @@ class CfgPatches {
 
 class ACE_newEvents {
     SettingsInitialized = "ace_settingsInitialized";
-};
\ No newline at end of file
+};
diff --git a/addons/weaponselect/config.cpp b/addons/weaponselect/config.cpp
index 5132c4084b..04a674a576 100644
--- a/addons/weaponselect/config.cpp
+++ b/addons/weaponselect/config.cpp
@@ -18,4 +18,4 @@ class CfgPatches {
 class ACE_newEvents {
     firedPlayer = "ace_firedPlayer";
     displayTextPicture = "ace_displayTextPicture";
-};
\ No newline at end of file
+};
diff --git a/addons/weather/config.cpp b/addons/weather/config.cpp
index 35c3237ad8..280efd3654 100644
--- a/addons/weather/config.cpp
+++ b/addons/weather/config.cpp
@@ -18,5 +18,4 @@ class CfgPatches {
 #include "ACE_Settings.hpp"
 class ACE_newEvents {
     SettingsInitialized = "ace_settingsInitialized";
-    SettingsInitialized = "ace_settingsInitialized";
-};
\ No newline at end of file
+};
diff --git a/addons/winddeflection/config.cpp b/addons/winddeflection/config.cpp
index 220899d184..48f24920c4 100644
--- a/addons/winddeflection/config.cpp
+++ b/addons/winddeflection/config.cpp
@@ -30,4 +30,4 @@ class ACE_newEvents {
     firedPlayerVehicle = "ace_firedPlayerVehicle";
     firedPlayerNonLocal = "ace_firedPlayerNonLocal";
     firedPlayer = "ace_firedPlayer";
-};
\ No newline at end of file
+};
diff --git a/addons/zeus/config.cpp b/addons/zeus/config.cpp
index 737c73cb9a..0758e1557b 100644
--- a/addons/zeus/config.cpp
+++ b/addons/zeus/config.cpp
@@ -48,6 +48,4 @@ class ACE_newEvents {
     SetSurrendered = "ace_setSurrendered";
     SetHandcuffed = "ace_setHandcuffed";
     AddCargoByClass = "ace_addCargoByClass";
-    AddCargoByClass = "ace_addCargoByClass";
-    zeusUnitAssigned = "ace_zeusUnitAssigned";
-};
\ No newline at end of file
+};