diff --git a/addons/attach/CfgVehicles.hpp b/addons/attach/CfgVehicles.hpp
index 047549dfba..15eca2fb62 100644
--- a/addons/attach/CfgVehicles.hpp
+++ b/addons/attach/CfgVehicles.hpp
@@ -6,7 +6,7 @@
                 displayName = "$STR_ACE_Attach_AttachDetach"; \
                 condition = QUOTE(([ARR_3(_player, _target, '')] call FUNC(canAttach))); \
                 statement = QUOTE( [ARR_2(_player, _target)] call FUNC(openAttachUI);); \
-                exceptions[] = {"ACE_Drag_isNotDragging"}; \
+                exceptions[] = {"isNotDragging"}; \
                 showDisabled = 0; \
                 priority = 0; \
                 icon = PATHTOF(UI\attach_ca.paa); \
@@ -16,7 +16,7 @@
                 displayName = "$STR_ACE_Attach_Detach"; \
                 condition = QUOTE(([ARR_2(_player, _target)] call FUNC(canDetach))); \
                 statement = QUOTE( [ARR_2(_player, _target)] call FUNC(detach) ); \
-                exceptions[] = {"ACE_Drag_isNotDragging"}; \
+                exceptions[] = {"isNotDragging"}; \
                 showDisabled = 0; \
                 priority = 0; \
                 icon = PATHTOF(UI\detach_ca.paa); \
@@ -57,7 +57,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_Attach_AttachDetach";
                     condition = QUOTE(([ARR_3(_player, _player, '')] call FUNC(canAttach)));
                     statement = QUOTE( [ARR_2(_player, _player)] call FUNC(openAttachUI); );
-                    exceptions[] = {"ACE_Drag_isNotDragging"};
+                    exceptions[] = {"isNotDragging"};
                     showDisabled = 0;
                     priority = 5;
                     icon = PATHTOF(UI\attach_ca.paa);
@@ -67,7 +67,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_Attach_Detach";
                     condition = QUOTE(([ARR_2(_player, _player)] call FUNC(canDetach)));
                     statement = QUOTE( [ARR_2(_player, _player)] call FUNC(detach) );
-                    exceptions[] = {"ACE_Drag_isNotDragging"};
+                    exceptions[] = {"isNotDragging"};
                     showDisabled = 0;
                     priority = 5;
                     icon = PATHTOF(UI\detach_ca.paa);
diff --git a/addons/captives/CfgVehicles.hpp b/addons/captives/CfgVehicles.hpp
index 930f2b27d8..a8eb5ecc2a 100644
--- a/addons/captives/CfgVehicles.hpp
+++ b/addons/captives/CfgVehicles.hpp
@@ -39,7 +39,7 @@ class CfgVehicles {
                     distance = 4;
                     condition = QUOTE([ARR_2(_player, _target)] call FUNC(canStopEscorting));
                     statement = QUOTE([ARR_3(_player,_target, false)] call FUNC(doEscortCaptive));
-                    exceptions[] = {QGVAR(isNotEscorting)};
+                    exceptions[] = {"isNotEscorting"};
                     showDisabled = 0;
                     icon = QUOTE(PATHTOF(UI\captive_ca.paa));
                     priority = 2.3;
@@ -50,7 +50,7 @@ class CfgVehicles {
                     distance = 4;
                     condition = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(canLoadCaptive));
                     statement = QUOTE([ARR_3(_player, _target, objNull)] call FUNC(doLoadCaptive));
-                    exceptions[] = {QGVAR(isNotEscorting)};
+                    exceptions[] = {"isNotEscorting"};
                     showDisabled = 0;
                     icon = QUOTE(PATHTOF(UI\captive_ca.paa));
                     priority = 2.2;
@@ -74,7 +74,7 @@ class CfgVehicles {
                 displayName = "$STR_ACE_Captives_StopEscorting";
                 condition = QUOTE([ARR_2(_player, objNull)] call FUNC(canStopEscorting));
                 statement = QUOTE([ARR_3(_player,objNull, false)] call FUNC(doEscortCaptive));
-                exceptions[] = {QGVAR(isNotEscorting)};
+                exceptions[] = {"isNotEscorting"};
                 showDisabled = 0;
                 priority = 2.3;
                 hotkey = "C";
@@ -91,7 +91,7 @@ class CfgVehicles {
                 displayName = "$STR_ACE_Captives_StopSurrendering";
                 condition = QUOTE([ARR_2(_player, false)] call FUNC(canSurrender));
                 statement = QUOTE([ARR_2(_player, false)] call FUNC(setSurrendered));
-                exceptions[] = {QGVAR(isNotSurrendering)};
+                exceptions[] = {"isNotSurrendering"};
                 showDisabled = 0;
                 priority = 0;
             };
@@ -107,7 +107,7 @@ class CfgVehicles {
                     distance = 4; \
                     condition = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(canLoadCaptive)); \
                     statement = QUOTE([ARR_3(_player, objNull, _target)] call FUNC(doLoadCaptive)); \
-                    exceptions[] = {QGVAR(isNotEscorting)}; \
+                    exceptions[] = {"isNotEscorting"}; \
                     showDisabled = 0; \
                     priority = 1.2; \
                     hotkey = "L"; \
diff --git a/addons/explosives/CfgVehicles.hpp b/addons/explosives/CfgVehicles.hpp
index e62b31aa56..af2ed90cb6 100644
--- a/addons/explosives/CfgVehicles.hpp
+++ b/addons/explosives/CfgVehicles.hpp
@@ -7,7 +7,7 @@ class CfgVehicles {
         displayName = $STR_ACE_Explosives_Menu;
         condition = QUOTE(!(_player getVariable [ARR_2('ace_explosives_PlantingExplosive',false)]));
         statement = "";
-        exceptions[] = {"ACE_Interaction_isNotSwimming"};
+        exceptions[] = {"isNotSwimming"};
         showDisabled = 1;
         priority = 4;
         icon = PATHTOF(UI\Explosives_Menu_ca.paa);
@@ -17,7 +17,7 @@ class CfgVehicles {
           displayName = $STR_ACE_Explosives_Detonate;
           condition = QUOTE([_player] call FUNC(canDetonate));
           statement = QUOTE([_player] call FUNC(openTransmitterUI););
-          exceptions[] = {"ACE_Interaction_isNotSwimming"};
+          exceptions[] = {"isNotSwimming"};
           showDisabled = 1;
           icon = PATHTOF(UI\Explosives_Menu_ca.paa);
           priority = 2;
@@ -27,7 +27,7 @@ class CfgVehicles {
           displayName = $STR_ACE_Explosives_Place;
           condition = QUOTE((vehicle _player == _player) and {[_player] call FUNC(hasExplosives)});
           statement = QUOTE([_player] call FUNC(openPlaceUI););
-          exceptions[] = {"ACE_Interaction_isNotSwimming"};
+          exceptions[] = {"isNotSwimming"};
           showDisabled = 1;
           icon = PATHTOF(UI\Place_Explosive_ca.paa);
           priority = 1;
@@ -37,7 +37,7 @@ class CfgVehicles {
           displayName = $STR_ACE_Explosives_Defuse;
           condition = QUOTE([_player] call FUNC(canDefuse));
           statement = QUOTE([ARR_2(_player,EGVAR(Interaction,Target))] call FUNC(startDefuse););
-          exceptions[] = {"ACE_Interaction_isNotSwimming"};
+          exceptions[] = {"isNotSwimming"};
           showDisabled = 0;
           icon = PATHTOF(UI\Defuse_ca.paa);
           priority = 0.8;
@@ -47,7 +47,7 @@ class CfgVehicles {
           displayName = $STR_ACE_Explosives_cellphone_displayName;
           condition = "('ACE_Cellphone' in (items ace_player))";
           statement = "closeDialog 0;createDialog 'Rsc_ACE_PhoneInterface';";
-          exceptions[] = {"ACE_Interaction_isNotSwimming"};
+          exceptions[] = {"isNotSwimming"};
           showDisabled = 0;
           icon = PATHTOF(Data\UI\Cellphone_UI.paa);
           priority = 0.8;
diff --git a/addons/maptools/CfgVehicles.hpp b/addons/maptools/CfgVehicles.hpp
index 4ecc649893..7d81ae7e08 100644
--- a/addons/maptools/CfgVehicles.hpp
+++ b/addons/maptools/CfgVehicles.hpp
@@ -7,7 +7,7 @@ class CfgVehicles {
                 displayName = "$STR_ACE_MapTools_MapTools_Menu";
                 condition = QUOTE((call FUNC(canUseMapTools) || {call FUNC(canUseMapGPS)}));
                 statement = "";
-                exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                exceptions[] = {"isNotDragging", "notOnMap"};
                 showDisabled = 0;
                 priority = 100;
                 enableInside = 1;
@@ -16,7 +16,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MapTools_MapToolsHide";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}));
                     statement = QUOTE(GVAR(mapTool_Shown) = 0; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                    exceptions[] = {"isNotDragging", "notOnMap"};
                     showDisabled = 1;
                     priority = 5;
                     enableInside = 1;
@@ -25,7 +25,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MapTools_MapToolsShowNormal";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 1}));
                     statement = QUOTE(GVAR(mapTool_Shown) = 1; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                    exceptions[] = {"isNotDragging", "notOnMap"};
                     showDisabled = 1;
                     priority = 4;
                     enableInside = 1;
@@ -34,7 +34,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MapTools_MapToolsShowSmall";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 2}));
                     statement = QUOTE(GVAR(mapTool_Shown) = 2; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                    exceptions[] = {"isNotDragging", "notOnMap"};
                     showDisabled = 1;
                     priority = 3;
                     enableInside = 1;
@@ -43,7 +43,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MapTools_MapToolsAlignNorth";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0}));
                     statement = QUOTE(GVAR(mapTool_angle) = 0; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                    exceptions[] = {"isNotDragging", "notOnMap"};
                     showDisabled = 1;
                     priority = 2;
                     enableInside = 1;
@@ -52,7 +52,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MapTools_MapToolsAlignCompass";
                     condition = QUOTE((call FUNC(canUseMapTools) && {GVAR(mapTool_Shown) != 0} && {('ItemCompass' in assigneditems ACE_player) || {'ItemCompass' in assigneditems ACE_player}}));
                     statement = QUOTE(GVAR(mapTool_angle) = getDir ACE_player; [] call FUNC(updateMapToolMarkers));
-                    exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                    exceptions[] = {"isNotDragging", "notOnMap"};
                     showDisabled = 1;
                     priority = 1;
                     enableInside = 1;
@@ -61,7 +61,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MapTools_MapGpsShow";
                     condition = QUOTE((call FUNC(canUseMapGPS) && {!GVAR(mapGpsShow)}));
                     statement = QUOTE(GVAR(mapGpsShow) = true; [GVAR(mapGpsShow)] call FUNC(openMapGps));
-                    exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                    exceptions[] = {"isNotDragging", "notOnMap"};
                     showDisabled = 0;
                     priority = 0;
                     enableInside = 1;
@@ -70,7 +70,7 @@ class CfgVehicles {
                     displayName = "$STR_ACE_MapTools_MapGpsHide";
                     condition = QUOTE((call FUNC(canUseMapGPS) && {GVAR(mapGpsShow)}));
                     statement = QUOTE(GVAR(mapGpsShow) = false; [GVAR(mapGpsShow)] call FUNC(openMapGps));
-                    exceptions[] = {"ACE_Drag_isNotDragging", QEGVAR(common,notOnMap)};
+                    exceptions[] = {"isNotDragging", "notOnMap"};
                     showDisabled = 0;
                     priority = 0;
                     enableInside = 1;