diff --git a/addons/respawn/CfgVehicles.hpp b/addons/respawn/CfgVehicles.hpp
index 665ea1865d..55a18ad478 100644
--- a/addons/respawn/CfgVehicles.hpp
+++ b/addons/respawn/CfgVehicles.hpp
@@ -1,7 +1,7 @@
 class CfgVehicles {
     class Module_F;
     class ACE_ModuleRespawn : Module_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         category = "ACE";
         displayName = "Respawn System";
         function = FUNC(module);
@@ -31,7 +31,7 @@ class CfgVehicles {
     };
 
     class ACE_ModuleFriendlyFire : Module_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         category = "ACE";
         displayName = "Friendly Fire Messages";
         function = FUNC(moduleFriendlyFire);
@@ -43,7 +43,7 @@ class CfgVehicles {
     };
 
     class ACE_ModuleRallypoint : Module_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         category = "ACE";
         displayName = "Rallypoint System";
         function = FUNC(moduleRallypoint);
@@ -70,7 +70,7 @@ class CfgVehicles {
 
     // static
     class ACE_Rallypoint_West : Flag_NATO_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         displayName = "Rallypoint West Base";
         vehicleClass = QGVAR(Rallypoints);
 
@@ -90,7 +90,7 @@ class CfgVehicles {
     };
 
     class ACE_Rallypoint_East : Flag_CSAT_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         displayName = "Rallypoint East Base";
         vehicleClass = QGVAR(Rallypoints);
 
@@ -110,7 +110,7 @@ class CfgVehicles {
     };
 
     class ACE_Rallypoint_Independent : Flag_AAF_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         displayName = "Rallypoint Independent Base";
         vehicleClass = QGVAR(Rallypoints);
 
@@ -131,7 +131,7 @@ class CfgVehicles {
 
     // moveable
     class ACE_RallypointExit_West : Flag_NATO_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         displayName = "Rallypoint West";
         vehicleClass = QGVAR(Rallypoints);
 
@@ -151,7 +151,7 @@ class CfgVehicles {
     };
 
     class ACE_RallypointExit_East : Flag_CSAT_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         displayName = "Rallypoint East";
         vehicleClass = QGVAR(Rallypoints);
 
@@ -171,7 +171,7 @@ class CfgVehicles {
     };
 
     class ACE_RallypointExit_Independent : Flag_AAF_F {
-        author = "$STR_ACE_Core_ACETeam";
+        author = "$STR_ACE_Common_ACETeam";
         displayName = "Rallypoint Independent";
         vehicleClass = QGVAR(Rallypoints);
 
diff --git a/addons/respawn/config.cpp b/addons/respawn/config.cpp
index 6f8ea1ceb2..18a83d60e9 100644
--- a/addons/respawn/config.cpp
+++ b/addons/respawn/config.cpp
@@ -5,7 +5,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = { "ACE_Rallypoint_West", "ACE_Rallypoint_East", "ACE_Rallypoint_Independent", "ACE_RallypointExit_West", "ACE_RallypointExit_East", "ACE_RallypointExit_Independent" };
         requiredVersion = 0.60;
-        requiredAddons[] = { "ace_core" };
+        requiredAddons[] = { "ace_common" };
         version = QUOTE(VERSION);
         versionStr = QUOTE(VERSION);
         versionAr[] = { VERSION_AR };
diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf
index b64a5465fb..e83a1f1dec 100644
--- a/addons/respawn/functions/fnc_handleKilled.sqf
+++ b/addons/respawn/functions/fnc_handleKilled.sqf
@@ -29,5 +29,5 @@ if (GVAR(SavePreDeathGear)) then {
 };
 
 if (missionNamespace getVariable [QGVAR(showFriendlyFireMessage), false]) then {
-    [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(Core,execRemoteFnc);
+    [_this, FUNC(showFriendlyFireMessage), 2] call EFUNC(common,execRemoteFnc);
 };
diff --git a/addons/respawn/functions/fnc_module.sqf b/addons/respawn/functions/fnc_module.sqf
index 28cb68e889..0a98eb24da 100644
--- a/addons/respawn/functions/fnc_module.sqf
+++ b/addons/respawn/functions/fnc_module.sqf
@@ -27,8 +27,8 @@ if !(_activated) exitWith {};
 
 GVAR(Module) = true;
 
-[_logic, QGVAR(SavePreDeathGear),             "SavePreDeathGear"]             call EFUNC(Core,readBooleanParameterFromModule);
-[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(Core,readBooleanParameterFromModule);
+[_logic, QGVAR(SavePreDeathGear),             "SavePreDeathGear"]             call EFUNC(common,readBooleanParameterFromModule);
+[_logic, QGVAR(RemoveDeadBodiesDisonncected), "RemoveDeadBodiesDisonncected"] call EFUNC(common,readBooleanParameterFromModule);
 
 if (isServer) then {
     if (GVAR(RemoveDeadBodiesDisonncected)) then {
diff --git a/addons/respawn/functions/fnc_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf
index 788031fcf3..dcd4810844 100644
--- a/addons/respawn/functions/fnc_moveRallypoint.sqf
+++ b/addons/respawn/functions/fnc_moveRallypoint.sqf
@@ -38,7 +38,7 @@ _this spawn {
 
     _position set [2, 0];
 
-    [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured);
+    [localize "STR_ACE_Respawn_Deploy"] call EFUNC(common,displayTextStructured);
 
     sleep 5;
     _rallypoint setPosATL _position;
@@ -50,5 +50,5 @@ _this spawn {
     _marker setMarkerTextLocal format ["%1:%2", [date select 3, 2, 0] call CBA_fnc_FORMATNumber, [date select 4, 2, 0] call CBA_fnc_FORMATNumber];
     */
 
-    [localize "STR_ACE_Respawn_Deploy"] call EFUNC(Core,displayTextStructured);
+    [localize "STR_ACE_Respawn_Deploy"] call EFUNC(common,displayTextStructured);
 };
diff --git a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf
index 145792feff..f384b69284 100644
--- a/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf
+++ b/addons/respawn/functions/fnc_showFriendlyFireMessage.sqf
@@ -23,7 +23,7 @@ _unit = _this select 0;
 _killer = _this select 1;
 
 if (_unit != _killer && side group _unit in [side group ACE_player, civilian] && {side group _killer == side group ACE_player}) then {
-    systemChat format ["%1 was killed by %2", [_unit] call EFUNC(Core,getName), [_killer] call EFUNC(Core,getName)];
+    systemChat format ["%1 was killed by %2", [_unit] call EFUNC(common,getName), [_killer] call EFUNC(common,getName)];
 
-    [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(Core,callCustomEventHandlers);
+    [_unit, "killedByFriendly", [_unit, _killer]] call EFUNC(common,callCustomEventHandlers);
 };
diff --git a/addons/respawn/functions/fnc_teleportToRallypoint.sqf b/addons/respawn/functions/fnc_teleportToRallypoint.sqf
index 0bb262239a..8d898441ee 100644
--- a/addons/respawn/functions/fnc_teleportToRallypoint.sqf
+++ b/addons/respawn/functions/fnc_teleportToRallypoint.sqf
@@ -44,4 +44,4 @@ _rallypoint = ([
 if (isNull _rallypoint) exitWith {};
 
 _unit setPosASL (getPosASL _rallypoint);
-[[localize "STR_ACE_Respawn_TeleportedToRallypoint", localize "STR_ACE_Respawn_TeleportedToBase"] select _toBase] call EFUNC(Core, displayTextStructured);
+[[localize "STR_ACE_Respawn_TeleportedToRallypoint", localize "STR_ACE_Respawn_TeleportedToBase"] select _toBase] call EFUNC(common,displayTextStructured);