diff --git a/addons/common/scripts/KeyInput/initKeys.sqf b/addons/common/scripts/KeyInput/initKeys.sqf
index c4a88ede68..15d3960675 100644
--- a/addons/common/scripts/KeyInput/initKeys.sqf
+++ b/addons/common/scripts/KeyInput/initKeys.sqf
@@ -1,7 +1,7 @@
 // by commy2
 #include "\z\ace\addons\common\script_component.hpp"
 
-_config = configFile >> QGVAR(Default_Keys);
+_config = configFile >> ACE_Default_Keys;
 _count = count _config;
 
 _header = format ["_keyCode = [_this select 1, _this select 2, _this select 3, _this select 4] call %1; _keyIndex = floor _keyCode; if (_keyIndex == 0) exitWith {false}; if (!(profileNamespace getVariable ['ACE_enableNumberHotkeys', true]) && {_keyIndex < 12} && {_keyIndex > 1} && {_keyCode mod 1 == 0}) exitWith {false}; _time = time; _player = ACE_player; _vehicle = vehicle _player; _isInput = false;", QUOTE(FUNC(convertKeyCode))];
@@ -26,7 +26,7 @@ for "_index" from 0 to (_count - 1) do {
   _statement = getText (_configFile >> "statement");
 
   _exceptions = getArray (_configFile >> "exceptions");
-  _canInteract = format ["%1 call GVAR(canInteract)", _exceptions];
+  _canInteract = format [QUOTE(%1 call GVAR(canInteract)), _exceptions];
 
   _conditionName = format ["ACE_Key_%1_Condition", _keyName];
   _statementName = format ["ACE_Key_%1_Statement", _keyName];
diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp
index 62425636e7..ab3645eba3 100644
--- a/addons/interaction/config.cpp
+++ b/addons/interaction/config.cpp
@@ -16,7 +16,7 @@ class CfgPatches {
 
 #include "CfgEventHandlers.hpp"
 
-class ACE_Core_Default_Keys {
+class ACE_Default_Keys {
   class openInteractionMenuNew {
     displayName = "$STR_ACE_Interaction_InteractionMenu";
     condition = "true";
@@ -75,7 +75,7 @@ class ACE_Core_Default_Keys {
   };
 };
 
-class ACE_Core_Options {
+class ACE_Options {
   class Interaction_FlowMenu {
     displayName = "$STR_ACE_Interaction_FlowMenu";
     default = 0;
@@ -97,7 +97,7 @@ class ACE_Parameters_Boolean {
   ACE_Interaction_EnableTeamManagement = 1;
 };
 
-class ACE_Core_canInteractConditions {
+class ACE_canInteractConditions {
   class ACE_Interaction_isNotEscorting {
     condition = QUOTE( !(_player getVariable ['ACE_isEscorting', false]) );
   };
diff --git a/addons/interaction/functions/fnc_GetActions.sqf b/addons/interaction/functions/fnc_GetActions.sqf
index 30afaa095a..ede8adf3a8 100644
--- a/addons/interaction/functions/fnc_GetActions.sqf
+++ b/addons/interaction/functions/fnc_GetActions.sqf
@@ -77,7 +77,7 @@ for "_i" from 0 to (_count - 1) do {
 					_condition = getText (_action >> "condition");
 					if (_condition == "") then {_condition = "true"};
 
-					_condition = _condition + format [QUOTE( && {%1 call EGVAR(core,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")];
+					_condition = _condition + format [QUOTE( && {%1 call EGVAR(common,canInteract)} && {[ARR_2(ACE_player, GVAR(Target))] call EFUNC(common,canInteractWith)} ), getArray (_action >> "exceptions")];
 					if (_enableInside != 1) then {_condition = _condition + " && {_player == _vehicle}"};
 
 					_condition = compile _condition;
diff --git a/addons/interaction/functions/fnc_tapShoulder.sqf b/addons/interaction/functions/fnc_tapShoulder.sqf
index 9405be8ce8..02eed88542 100644
--- a/addons/interaction/functions/fnc_tapShoulder.sqf
+++ b/addons/interaction/functions/fnc_tapShoulder.sqf
@@ -9,7 +9,7 @@ _target = _this select 1;
 if (_target != ACE_player) exitWith {
   addCamShake [4, 0.5, 5];
   if !(local _target) then {
-    [[_tapper, _target], QUOTE(FUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc);
+    [[_tapper, _target], QUOTE(DFUNC(tapShoulder)), _target] call EFUNC(common,execRemoteFnc);
   };
 };