diff --git a/addons/dogtags/XEH_postInit.sqf b/addons/dogtags/XEH_postInit.sqf
index 2d7b1dd49c..96a6a3180c 100644
--- a/addons/dogtags/XEH_postInit.sqf
+++ b/addons/dogtags/XEH_postInit.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 
-[QGVAR(showDogtag), DFUNC(showDogtag)] call EFUNC(common,addEventHandler);
-[QGVAR(sendDogtagData), DFUNC(sendDogtagData)] call EFUNC(common,addEventHandler);
-[QGVAR(getDogtagItem), DFUNC(getDogtagItem)] call EFUNC(common,addEventHandler);
-[QGVAR(addDogtagItem), DFUNC(addDogtagItem)] call EFUNC(common,addEventHandler);
+[QGVAR(showDogtag), DFUNC(showDogtag)] call CBA_fnc_addEventHandler;
+[QGVAR(sendDogtagData), DFUNC(sendDogtagData)] call CBA_fnc_addEventHandler;
+[QGVAR(getDogtagItem), DFUNC(getDogtagItem)] call CBA_fnc_addEventHandler;
+[QGVAR(addDogtagItem), DFUNC(addDogtagItem)] call CBA_fnc_addEventHandler;
diff --git a/addons/dogtags/functions/fnc_checkDogtag.sqf b/addons/dogtags/functions/fnc_checkDogtag.sqf
index bfd78e263c..4c606265f6 100644
--- a/addons/dogtags/functions/fnc_checkDogtag.sqf
+++ b/addons/dogtags/functions/fnc_checkDogtag.sqf
@@ -17,4 +17,4 @@ params ["_player", "_target"];
 
 private _doubleTags = !(_target getVariable [QGVAR(dogtagTaken), false]);
 private _nickname = [_target, false, true] call EFUNC(common,getName);
-[QGVAR(showDogtag), [_nickname, _doubleTags]] call EFUNC(common,localEvent);
+[QGVAR(showDogtag), [_nickname, _doubleTags]] call CBA_fnc_localEvent;
diff --git a/addons/dogtags/functions/fnc_checkDogtagItem.sqf b/addons/dogtags/functions/fnc_checkDogtagItem.sqf
index 786874dc65..930532a0d9 100644
--- a/addons/dogtags/functions/fnc_checkDogtagItem.sqf
+++ b/addons/dogtags/functions/fnc_checkDogtagItem.sqf
@@ -16,4 +16,4 @@
 
 params ["_player", "_target", "_item"];
 
-[QGVAR(sendDogtagData), [_player, _item]] call EFUNC(common,serverEvent);
+[QGVAR(sendDogtagData), [_player, _item]] call CBA_fnc_serverEvent;
diff --git a/addons/dogtags/functions/fnc_getDogtagItem.sqf b/addons/dogtags/functions/fnc_getDogtagItem.sqf
index 30e0584f7b..db12dd258a 100644
--- a/addons/dogtags/functions/fnc_getDogtagItem.sqf
+++ b/addons/dogtags/functions/fnc_getDogtagItem.sqf
@@ -34,7 +34,7 @@ missionNamespace setVariable [QGVAR(allDogtags), _allDogtags];
 missionNamespace setVariable [QGVAR(allDogtagNicknames), _allDogtagNicknames];
 
 if(isMultiplayer) then {
-    [QGVAR(addDogtagItem), [_target], [_item, _nickname]] call EFUNC(common,targetEvent);
+    [QGVAR(addDogtagItem), [_item, _nickname], [_target]] call CBA_fnc_targetEvent;
 } else {
-    [QGVAR(addDogtagItem), [_item, _nickname]] call EFUNC(common,localEvent);
+    [QGVAR(addDogtagItem), [_item, _nickname]] call CBA_fnc_localEvent;
 };
diff --git a/addons/dogtags/functions/fnc_sendDogtagData.sqf b/addons/dogtags/functions/fnc_sendDogtagData.sqf
index 9cb2efdd5d..d84c325c5a 100644
--- a/addons/dogtags/functions/fnc_sendDogtagData.sqf
+++ b/addons/dogtags/functions/fnc_sendDogtagData.sqf
@@ -27,4 +27,4 @@ if (_index >= 0) then {
     _nickname = _allDogtagNicknames select _index;
 };
 
-[QGVAR(showDogtag), [_target], [_nickname]] call EFUNC(common,targetEvent);
+[QGVAR(showDogtag), [_nickname], [_target]] call CBA_fnc_targetEvent;
diff --git a/addons/dogtags/functions/fnc_takeDogtag.sqf b/addons/dogtags/functions/fnc_takeDogtag.sqf
index 25a5b33389..585f89b697 100644
--- a/addons/dogtags/functions/fnc_takeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_takeDogtag.sqf
@@ -20,5 +20,5 @@ if (_target getVariable [QGVAR(dogtagTaken), false]) then {
     [localize LSTRING(dogtagAlreadyTaken)] call EFUNC(common,displayText);
 } else {
     _target setVariable [QGVAR(dogtagTaken), true, true];
-    [QGVAR(getDogtagItem), [_player, _target]] call EFUNC(common,serverEvent);
+    [QGVAR(getDogtagItem), [_player, _target]] call CBA_fnc_serverEvent;
 };