diff --git a/addons/atragmx/functions/fnc_calculate_truing_drop.sqf b/addons/atragmx/functions/fnc_calculate_truing_drop.sqf
index fa43ac73c2..b21e3b0cba 100644
--- a/addons/atragmx/functions/fnc_calculate_truing_drop.sqf
+++ b/addons/atragmx/functions/fnc_calculate_truing_drop.sqf
@@ -46,8 +46,8 @@ if (_parseInput) then {
     };
     switch (_dropUnit) do {
         case 0: {
-            _transonicDrop = MRAD_TO_MOA(_transonicDrop);
-            _subsonicDrop  = MRAD_TO_MOA(_subsonicDrop);
+            _transonicDrop = MOA_TO_MRAD(_transonicDrop);
+            _subsonicDrop  = MOA_TO_MRAD(_subsonicDrop);
         };
         case 2: {
             _transonicDrop = _transonicDrop / 1.047;
diff --git a/addons/atragmx/functions/fnc_update_range_card.sqf b/addons/atragmx/functions/fnc_update_range_card.sqf
index 4bcf4c3e42..2f4aa3c7a2 100644
--- a/addons/atragmx/functions/fnc_update_range_card.sqf
+++ b/addons/atragmx/functions/fnc_update_range_card.sqf
@@ -45,9 +45,9 @@ private _speedOfSound = GVAR(temperature) call EFUNC(weather,calculateSpeedOfSou
 
     switch (GVAR(currentScopeUnit)) do {
         case 0: {
-            _elevation = MRAD_TO_MOA(_elevation);
-            _windage1 = MRAD_TO_MOA(_windage1);
-            _windage2 = MRAD_TO_MOA(_windage2);
+            _elevation = MOA_TO_MRAD(_elevation);
+            _windage1 = MOA_TO_MRAD(_windage1);
+            _windage2 = MOA_TO_MRAD(_windage2);
         };
         case 2: {
             _elevation = _elevation * 1.047;
@@ -55,7 +55,7 @@ private _speedOfSound = GVAR(temperature) call EFUNC(weather,calculateSpeedOfSou
             _windage2 = _windage2 * 1.047;
         };
         case 3: {
-            private _clickSize = [1, 1 / 1.047, MOA_TO_MRAD(1)] select (GVAR(workingMemory) select 7);
+            private _clickSize = [1, 1 / 1.047, MRAD_TO_MOA(1)] select (GVAR(workingMemory) select 7);
             private _clickNumber = GVAR(workingMemory) select 8;
             private _clickInterval = _clickSize / _clickNumber;
 
diff --git a/addons/atragmx/functions/fnc_update_result.sqf b/addons/atragmx/functions/fnc_update_result.sqf
index 0f69d742dc..1dc2c6204e 100644
--- a/addons/atragmx/functions/fnc_update_result.sqf
+++ b/addons/atragmx/functions/fnc_update_result.sqf
@@ -41,16 +41,16 @@ private _lead = GVAR(leadOutput) select GVAR(currentTarget);
 
 switch (GVAR(currentScopeUnit)) do {
     case 0: {
-        _elevationAbs = MRAD_TO_MOA(_elevationAbs);
-        _windageAbs = MRAD_TO_MOA(_windageAbs);
+        _elevationAbs = MOA_TO_MRAD(_elevationAbs);
+        _windageAbs = MOA_TO_MRAD(_windageAbs);
 
-        _wind2 = MRAD_TO_MOA(_wind2);
+        _wind2 = MOA_TO_MRAD(_wind2);
 
-        _elevationRel = MRAD_TO_MOA(_elevationRel);
-        _windageRel = MRAD_TO_MOA(_windageRel);
+        _elevationRel = MOA_TO_MRAD(_elevationRel);
+        _windageRel = MOA_TO_MRAD(_windageRel);
 
-        _elevationCur = MRAD_TO_MOA(_elevationCur);
-        _windageCur = MRAD_TO_MOA(_windageCur);
+        _elevationCur = MOA_TO_MRAD(_elevationCur);
+        _windageCur = MOA_TO_MRAD(_windageCur);
     };
     case 2: {
         _elevationAbs = _elevationAbs * 1.047;
@@ -65,7 +65,7 @@ switch (GVAR(currentScopeUnit)) do {
         _windageCur = _windageCur * 1.047;
     };
     case 3: {
-        private _clickSize = [1, 1 / 1.047, MOA_TO_MRAD(1)] select (GVAR(workingMemory) select 7);
+        private _clickSize = [1, 1 / 1.047, MRAD_TO_MOA(1)] select (GVAR(workingMemory) select 7);
         private _clickNumber = GVAR(workingMemory) select 8;
         private _clickInterval = _clickSize / _clickNumber;
 
diff --git a/addons/atragmx/functions/fnc_update_truing_drop_data.sqf b/addons/atragmx/functions/fnc_update_truing_drop_data.sqf
index c546e78d41..cd1fa9de68 100644
--- a/addons/atragmx/functions/fnc_update_truing_drop_data.sqf
+++ b/addons/atragmx/functions/fnc_update_truing_drop_data.sqf
@@ -42,9 +42,9 @@ private _dropData = +GVAR(truingDropDropData);
 
 switch (_dropUnit) do {
     case 0: {
-        _dropData set [0, MRAD_TO_MOA(_dropData select 0)];
-        _dropData set [1, MRAD_TO_MOA(_dropData select 1)];
-        _dropData set [2, MRAD_TO_MOA(_dropData select 2)];
+        _dropData set [0, MOA_TO_MRAD(_dropData select 0)];
+        _dropData set [1, MOA_TO_MRAD(_dropData select 1)];
+        _dropData set [2, MOA_TO_MRAD(_dropData select 2)];
     };
     case 2: {
         _dropData set [0, (_dropData select 0) * 1.047];
diff --git a/addons/atragmx/script_component.hpp b/addons/atragmx/script_component.hpp
index 7b6aaa74cd..e268999ebf 100644
--- a/addons/atragmx/script_component.hpp
+++ b/addons/atragmx/script_component.hpp
@@ -16,8 +16,8 @@
 
 #include "\z\ace\addons\main\script_macros.hpp"
 
-#define MOA_TO_MRAD(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
-#define MRAD_TO_MOA(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
+#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
+#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
 #define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
 #define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
 #define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9
diff --git a/addons/rangecard/script_component.hpp b/addons/rangecard/script_component.hpp
index 76106720bc..8a3f3825a9 100644
--- a/addons/rangecard/script_component.hpp
+++ b/addons/rangecard/script_component.hpp
@@ -16,8 +16,8 @@
 
 #include "\z\ace\addons\main\script_macros.hpp"
 
-#define MOA_TO_MRAD(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
-#define MRAD_TO_MOA(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
+#define MRAD_TO_MOA(d) (d * 3.43774677) // Conversion factor: 54 / (5 * PI)
+#define MOA_TO_MRAD(d) (d * 0.29088821) // Conversion factor: (5 * PI) / 54
 #define DEG_TO_MOA(d) (d * 60) // Conversion factor: 60
 #define MOA_TO_DEG(d) (d / 60) // Conversion factor: 1 / 60
 #define DEG_TO_MRAD(d) (d * 17.45329252) // Conversion factor: (50 * PI) / 9