diff --git a/addons/overheating/CfgWeapons.hpp b/addons/overheating/CfgWeapons.hpp
index 92561ee63d..52fdcf6d13 100644
--- a/addons/overheating/CfgWeapons.hpp
+++ b/addons/overheating/CfgWeapons.hpp
@@ -16,37 +16,40 @@ class CfgWeapons {
     class RifleCore;
     class Rifle: RifleCore {
         //Mean Rounds Between Stoppages (this will be scaled based on the barrel temp)
-        ACE_MRBS = 3000;
+        GVAR(MRBS) = 3000;
 
         //Dispersion Factor (this will be scaled based on the barrel temp)
-        ACE_Dispersion = 1;
+        GVAR(dispersion) = 1;
 
         //Slowdown Factor (this will be scaled based on the barrel temp)
-        ACE_SlowdownFactor = 1;
+        GVAR(slowdownFactor) = 1;
     };
     class Rifle_Base_F : Rifle {};
     class Rifle_Long_Base_F : Rifle_Base_F {
-        ACE_Dispersion = 0.75;
+        GVAR(dispersion) = 0.75;
     };
 
     class arifle_MX_Base_F : Rifle_Base_F {
-        ACE_clearJamAction = "GestureReloadMX";   // Custom jam clearing action. Default uses reload animation.
+        // Custom jam clearing action. Default uses reload animation.
+        ACE_clearJamAction = "GestureReloadMX";
     };
     class arifle_MX_SW_F : arifle_MX_Base_F {
-        ACE_clearJamAction = "";              // Custom jam clearing action. Use empty string to undefine.
-        ACE_Overheating_allowSwapBarrel = 1;  // 1 to enable barrel swap. 0 to disable. Meant for machine guns where you can easily swap the barrel without dismantling the whole weapon.
-        ACE_Dispersion = 0.75;
+        // Custom jam clearing action. Use empty string to undefine.
+        ACE_clearJamAction = "";
+        // 1 to enable barrel swap. 0 to disable. Meant for machine guns where you can easily swap the barrel without dismantling the whole weapon.
+        GVAR(allowSwapBarrel) = 1;
+        GVAR(dispersion) = 0.75;
     };
     class MMG_01_base_F: Rifle_Long_Base_F {
-        ACE_Overheating_allowSwapBarrel = 1;
+        GVAR(allowSwapBarrel) = 1;
     };
     class MMG_02_base_F: Rifle_Long_Base_F {
-        ACE_Overheating_allowSwapBarrel = 1;
+        GVAR(allowSwapBarrel) = 1;
     };
     class LMG_Zafir_F : Rifle_Long_Base_F {
-        ACE_Overheating_allowSwapBarrel = 1;
+        GVAR(allowSwapBarrel) = 1;
     };
     class LMG_Mk200_F : Rifle_Long_Base_F {
-        ACE_Overheating_allowSwapBarrel = 1;
+        GVAR(allowSwapBarrel) = 1;
     };
 };
diff --git a/addons/overheating/functions/fnc_firedEH.sqf b/addons/overheating/functions/fnc_firedEH.sqf
index 1ec1409159..03a05ac250 100644
--- a/addons/overheating/functions/fnc_firedEH.sqf
+++ b/addons/overheating/functions/fnc_firedEH.sqf
@@ -44,18 +44,18 @@ TRACE_2("Unit fired with temp:",_unit,_temperature);
 //Get weapon data from cache:
 private _weaponData = GVAR(weaponInfoCache) getVariable _weapon;
 if (isNil "_weaponData") then {
-    private _dispersion = if (isNumber (configFile >> "CfgWeapons" >> _weapon >> "ACE_Dispersion")) then {
-        getNumber (configFile >> "CfgWeapons" >> _weapon >> "ACE_Dispersion");
+    private _dispersion = if (isNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(dispersion))) then {
+        getNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(dispersion));
     } else {
         1;
     };
-    private _slowdownFactor = if (isNumber (configFile >> "CfgWeapons" >> _weapon >> "ACE_SlowdownFactor")) then {
-        getNumber (configFile >> "CfgWeapons" >> _weapon >> "ACE_SlowdownFactor");
+    private _slowdownFactor = if (isNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(slowdownFactor))) then {
+        getNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(slowdownFactor));
     } else {
         1;
     };
-    private _jamChance = if (isNumber (configFile >> "CfgWeapons" >> _weapon >> "ACE_MRBS")) then {
-        getNumber (configFile >> "CfgWeapons" >> _weapon >> "ACE_MRBS");
+    private _jamChance = if (isNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(ACE_MRBS))) then {
+        getNumber (configFile >> "CfgWeapons" >> _weapon >> QGVAR(ACE_MRBS));
     } else {
         3000;
     };
diff --git a/optionals/compat_rhs_usf3/CfgWeapons.hpp b/optionals/compat_rhs_usf3/CfgWeapons.hpp
index becb91ada1..a0e1067fd9 100644
--- a/optionals/compat_rhs_usf3/CfgWeapons.hpp
+++ b/optionals/compat_rhs_usf3/CfgWeapons.hpp
@@ -115,31 +115,31 @@ class CfgWeapons
     class rhs_weap_mk18: rhs_weap_m4a1 {
         ACE_barrelTwist = 177.8;
         ACE_barrelLength = 261.62;
-        ACE_Overheating_Dispersion[] = {0, 0.001, 0.002, 0.004};
-        ACE_Overheating_SlowdownFactor[] = {1, 1, 1, 0.9};
-        ACE_Overheating_JamChance[] = {0, 0.0003, 0.0015, 0.0075};
+        ACE_Overheating_dispersion = 1;
+        ACE_Overheating_slowdownFactor = 1;
+        ACE_Overheating_MRBS = 3000;
     };
     class rhs_weap_m16a4: rhs_weap_m4_Base {
         ACE_barrelTwist = 177.8;
         ACE_barrelLength = 508.0;
     };
-	class rhs_weap_lmg_minimipara;	
+	class rhs_weap_lmg_minimipara;
     class rhs_weap_lmg_minimi_railed : rhs_weap_lmg_minimipara {
         ACE_barrelLength = 465.0;
         ACE_barrelTwist = 177.8;
         ACE_Overheating_allowSwapBarrel = 1;
-        ACE_Overheating_Dispersion[] = {0, -0.001, 0.001, 0.003};
-        ACE_Overheating_SlowdownFactor[] = {1, 1, 1, 0.9};
-        ACE_Overheating_JamChance[] = {0, 0.0003, 0.0015, 0.0075};
+        ACE_Overheating_dispersion = 0.75;
+        ACE_Overheating_slowdownFactor = 1;
+        ACE_Overheating_MRBS = 3000;
 	};
     class rhs_weap_m240_base;
     class rhs_weap_m240B: rhs_weap_m240_base {
         ACE_barrelTwist = 304.8;
         ACE_barrelLength = 629.92;
         ACE_Overheating_allowSwapBarrel = 1;
-        ACE_Overheating_Dispersion[] = {0, -0.001, 0.001, 0.004};
-        ACE_Overheating_SlowdownFactor[] = {1, 1, 1, 0.9};
-        ACE_Overheating_JamChance[] = {0, 0.0003, 0.0015, 0.0075};
+        ACE_Overheating_dispersion = 1;
+        ACE_Overheating_slowdownFactor = 1;
+        ACE_Overheating_MRBS = 3000;
     };
     class rhs_weap_m14ebrri: srifle_EBR_F {
         ACE_barrelTwist = 304.8;