diff --git a/addons/cargo/functions/fnc_getCargoSpaceLeft.sqf b/addons/cargo/functions/fnc_getCargoSpaceLeft.sqf
index cae27a2d58..b858ebfddc 100644
--- a/addons/cargo/functions/fnc_getCargoSpaceLeft.sqf
+++ b/addons/cargo/functions/fnc_getCargoSpaceLeft.sqf
@@ -17,4 +17,4 @@
 
 params ["_object"];
 
-_object getVariable [QGVAR(space), getNumber (configFile >> "CfgVehicles" >> typeof _object >> QGVAR(space))]
+_object getVariable [QGVAR(space), getNumber (configFile >> "CfgVehicles" >> typeOf _object >> QGVAR(space))]
diff --git a/addons/common/functions/fnc_unloadPerson.sqf b/addons/common/functions/fnc_unloadPerson.sqf
index 0ab65a5983..73e02cd7ce 100644
--- a/addons/common/functions/fnc_unloadPerson.sqf
+++ b/addons/common/functions/fnc_unloadPerson.sqf
@@ -24,7 +24,7 @@ if (_vehicle == _unit) exitWith {false};
 if (speed _vehicle > 1 || getPos _vehicle select 2 > 2) exitWith {false};
 
 private "_emptyPos";
-_emptyPos = (getPos _vehicle) findEmptyPosition [0, 10, typeof _unit]; // @todo to small?
+_emptyPos = (getPos _vehicle) findEmptyPosition [0, 10, typeOf _unit]; // @todo to small?
 
 if (count _emptyPos == 0) exitWith {false};
 
diff --git a/addons/common/functions/fnc_unloadPersonLocal.sqf b/addons/common/functions/fnc_unloadPersonLocal.sqf
index 7b0d8082af..4e75791ff0 100644
--- a/addons/common/functions/fnc_unloadPersonLocal.sqf
+++ b/addons/common/functions/fnc_unloadPersonLocal.sqf
@@ -27,7 +27,7 @@ if (_vehicle isKindOf "Ship") then {
 
     TRACE_1("SHIP Ground Check",getPos _vehicle);
 
-    _emptyPos = (ASLToAGL getPosASL _vehicle) findEmptyPosition [0, 13, typeof _unit]; // TODO: if spot is underwater pick another spot.
+    _emptyPos = (ASLToAGL getPosASL _vehicle) findEmptyPosition [0, 13, typeOf _unit]; // TODO: if spot is underwater pick another spot.
 } else {
     if (_vehicle isKindOf "Air") then {
         if (speed _vehicle > 1 || {isTouchingGround _vehicle}) then {
@@ -45,7 +45,7 @@ if (_vehicle isKindOf "Ship") then {
 
         TRACE_1("Vehicle Ground Check", isTouchingGround _vehicle);
 
-        _emptyPos = (ASLToAGL getPosASL _vehicle) findEmptyPosition [0, 13, typeof _unit];
+        _emptyPos = (ASLToAGL getPosASL _vehicle) findEmptyPosition [0, 13, typeOf _unit];
     };
 };
 
diff --git a/addons/dragging/functions/fnc_getWeight.sqf b/addons/dragging/functions/fnc_getWeight.sqf
index dcdcbbf3fe..0fbee19d41 100644
--- a/addons/dragging/functions/fnc_getWeight.sqf
+++ b/addons/dragging/functions/fnc_getWeight.sqf
@@ -39,7 +39,7 @@ _totalWeight = 0;
 ];
 
 // add Weight of create to totalWeight
-_totalWeight = _totalWeight + (getNumber (configFile >> "CfgVehicles" >> typeof _object >> "mass"));
+_totalWeight = _totalWeight + (getNumber (configFile >> "CfgVehicles" >> typeOf _object >> "mass"));
 
 // Mass in Arma isn't an exact amount but rather a volume/weight value. This attempts to work around that by making it a usable value. (sort of).
 _totalWeight * 0.5
diff --git a/addons/explosives/functions/fnc_detonateExplosive.sqf b/addons/explosives/functions/fnc_detonateExplosive.sqf
index 74e4dfca11..d204ad7bad 100644
--- a/addons/explosives/functions/fnc_detonateExplosive.sqf
+++ b/addons/explosives/functions/fnc_detonateExplosive.sqf
@@ -30,10 +30,10 @@ _result = true;
 
 if (!_ignoreRange && {(_unit distance (_item select 0)) > _range}) exitWith {TRACE_1("out of range",_range); false};
 
-if (getNumber (ConfigFile >> "CfgAmmo" >> typeof (_item select 0) >> "TriggerWhenDestroyed") == 0) then {
+if (getNumber (ConfigFile >> "CfgAmmo" >> typeOf (_item select 0) >> "TriggerWhenDestroyed") == 0) then {
     private ["_exp", "_previousExp"];
     _previousExp = _item select 0;
-    _exp = getText (ConfigFile >> "CfgAmmo" >> typeof (_previousExp) >> "ACE_Explosive");
+    _exp = getText (ConfigFile >> "CfgAmmo" >> typeOf (_previousExp) >> "ACE_Explosive");
     if (_exp != "") then {
         _exp = createVehicle [_exp, [0,0,15001], [], 0, "NONE"];
         _exp setDir (getDir _previousExp);
diff --git a/addons/logistics_wirecutter/functions/fnc_isFence.sqf b/addons/logistics_wirecutter/functions/fnc_isFence.sqf
index 878f44cf9a..d9122139b7 100644
--- a/addons/logistics_wirecutter/functions/fnc_isFence.sqf
+++ b/addons/logistics_wirecutter/functions/fnc_isFence.sqf
@@ -1,6 +1,6 @@
 /*
  * Author: PabstMirror
- * Checks if object is a fence.  Should work on any fence type, even (typeof == "").
+ * Checks if object is a fence.  Should work on any fence type, even (typeOf == "").
  * Call is fairly expensive because of all of the string checking.
  *
  * Arguments:
diff --git a/addons/medical/functions/fnc_copyDeadBody.sqf b/addons/medical/functions/fnc_copyDeadBody.sqf
index 4d13d3823e..ff2f95a92e 100644
--- a/addons/medical/functions/fnc_copyDeadBody.sqf
+++ b/addons/medical/functions/fnc_copyDeadBody.sqf
@@ -20,12 +20,12 @@ params ["_oldBody", "_caller"];
 if (alive _oldBody) exitWith {_oldBody}; // we only want to do this for dead bodies
 
 _name = _oldBody getvariable ["ACE_name", "unknown"];
-_class = typeof _oldBody;
+_class = typeOf _oldBody;
 _side = side _caller;
 _group = createGroup _side;
 _position = getPos _oldBody;
 
-_newUnit = _group createUnit [typeof _oldBody, _position, [], 0, "NONE"];
+_newUnit = _group createUnit [typeOf _oldBody, _position, [], 0, "NONE"];
 _newUnit setVariable ["ACE_name", _name, true];
 
 _newUnit disableAI "TARGET";
diff --git a/addons/modules/XEH_postInit.sqf b/addons/modules/XEH_postInit.sqf
index 41013b7fe5..56b7cce091 100644
--- a/addons/modules/XEH_postInit.sqf
+++ b/addons/modules/XEH_postInit.sqf
@@ -9,7 +9,7 @@
     {
         [_x] call {
             params ["_logic"];
-            private _logicType = typeof _logic;
+            private _logicType = typeOf _logic;
             _logic hideobject true;
 
             if (_logic getvariable [QGVAR(initalized), false]) exitWith {};
diff --git a/addons/zeus/functions/fnc_bi_moduleCurator.sqf b/addons/zeus/functions/fnc_bi_moduleCurator.sqf
index f6421c71a9..109a4c502a 100644
--- a/addons/zeus/functions/fnc_bi_moduleCurator.sqf
+++ b/addons/zeus/functions/fnc_bi_moduleCurator.sqf
@@ -85,7 +85,7 @@ if (_activated) then {
             case 1: {
                 _addonsList = [];
                 {
-                    _addonsList = _addonsList + (unitaddons typeof _x);
+                    _addonsList = _addonsList + (unitaddons typeOf _x);
                 } foreach (entities "all");
                 removeallcuratoraddons _logic;
                 _logic addcuratoraddons _addonsList;
@@ -210,7 +210,7 @@ if (_activated) then {
         //--- Activated all future addons
         _addons = [];
         {
-            if (typeof _x == "ModuleCuratorAddAddons_F") then {
+            if (typeOf _x == "ModuleCuratorAddAddons_F") then {
                 _paramAddons = call compile ("[" + (_x getvariable ["addons",""]) + "]");
                 {
                     if !(_x in _addons) then {_addons set [count _addons,_x];};
diff --git a/addons/zeus/functions/fnc_bi_moduleMine.sqf b/addons/zeus/functions/fnc_bi_moduleMine.sqf
index 6b4df325fa..96ba99c903 100644
--- a/addons/zeus/functions/fnc_bi_moduleMine.sqf
+++ b/addons/zeus/functions/fnc_bi_moduleMine.sqf
@@ -21,7 +21,7 @@ _units = _this select 1;
 _activated = _this select 2;
 
 if (_activated) then {
-    _explosive = gettext (configfile >> "CfgVehicles" >> typeof _logic >> "explosive");
+    _explosive = gettext (configfile >> "CfgVehicles" >> typeOf _logic >> "explosive");
     if (_explosive != "") then {
         _explosive = createvehicle [_explosive,position _logic,[],0,"none"];
         _explosive attachto [_logic];
diff --git a/addons/zeus/functions/fnc_bi_moduleProjectile.sqf b/addons/zeus/functions/fnc_bi_moduleProjectile.sqf
index bdbd43b30e..f88ea5d391 100644
--- a/addons/zeus/functions/fnc_bi_moduleProjectile.sqf
+++ b/addons/zeus/functions/fnc_bi_moduleProjectile.sqf
@@ -39,11 +39,11 @@ if ({local _x} count (objectcurators _logic) > 0) then {
 if !(isserver) exitWith {};
 
 if (_activated) then {
-    _ammo = _logic getvariable ["type",gettext (configfile >> "CfgVehicles" >> typeof _logic >> "ammo")];
+    _ammo = _logic getvariable ["type",gettext (configfile >> "CfgVehicles" >> typeOf _logic >> "ammo")];
     if (_ammo != "") then {
         _CfgAmmo = configfile >> "CfgAmmo" >> _ammo;
         //if !(isclass _CfgAmmo) exitWith {["CfgAmmo class '%1' not found.",_ammo] call bis_fnc_error;};
-        _dirVar = _fnc_scriptname + typeof _logic;
+        _dirVar = _fnc_scriptname + typeOf _logic;
         _logic setdir (missionnamespace getvariable [_dirVar,direction _logic]); //--- Restore custom direction
         _pos = getposatl _logic;
         _posAmmo = +_pos;
@@ -194,6 +194,6 @@ if (_activated) then {
             deletevehicle _logic;
         };
     } else {
-        ["Cannot create projectile, 'ammo' config attribute is missing in %1",typeof _logic] call bis_fnc_error;
+        ["Cannot create projectile, 'ammo' config attribute is missing in %1",typeOf _logic] call bis_fnc_error;
     };
 };