diff --git a/lua/acf/ballistics/ballistics_cl.lua b/lua/acf/ballistics/ballistics_cl.lua
index c9dcadc6e..7b439b0aa 100644
--- a/lua/acf/ballistics/ballistics_cl.lua
+++ b/lua/acf/ballistics/ballistics_cl.lua
@@ -18,7 +18,7 @@ local function BulletFlight(Bullet, DeltaTime)
 	debugoverlay.Line(Bullet.SimPosLast, Bullet.SimPos, 15, Yellow)
 end
 
-hook.Add("ACF_OnClock", "ACF_ManageBulletEffects", function(_, DeltaTime)
+hook.Add("ACF_OnTick", "ACF_ManageBulletEffects", function(_, DeltaTime)
 	for _, Bullet in pairs(ACF.BulletEffect) do
 		BulletFlight(Bullet, DeltaTime)
 	end
diff --git a/lua/acf/ballistics/ballistics_sv.lua b/lua/acf/ballistics/ballistics_sv.lua
index 3aa019e72..3579e9af2 100644
--- a/lua/acf/ballistics/ballistics_sv.lua
+++ b/lua/acf/ballistics/ballistics_sv.lua
@@ -59,7 +59,7 @@ function Ballistics.RemoveBullet(Bullet)
 	Bullet.Removed = true
 
 	if not next(Bullets) then
-		hook.Remove("ACF_OnClock", "ACF Iterate Bullets")
+		hook.Remove("ACF_OnTick", "ACF Iterate Bullets")
 	end
 end
 
@@ -144,7 +144,7 @@ function Ballistics.CreateBullet(BulletData)
 	end
 
 	if not next(Bullets) then
-		hook.Add("ACF_OnClock", "ACF Iterate Bullets", Ballistics.IterateBullets)
+		hook.Add("ACF_OnTick", "ACF Iterate Bullets", Ballistics.IterateBullets)
 	end
 
 	Bullets[Index] = Bullet
diff --git a/lua/acf/core/classes/grouped.lua b/lua/acf/core/classes/grouped.lua
index 957f1c2ad..7e95c2ef6 100644
--- a/lua/acf/core/classes/grouped.lua
+++ b/lua/acf/core/classes/grouped.lua
@@ -27,7 +27,7 @@ function Classes.AddGroup(ID, Destiny, Data)
 		Group[K] = V
 	end
 
-	hook.Run("ACF_OnNewGroup", ID, Group)
+	hook.Run("ACF_OnCreateGroup", ID, Group)
 
 	return Group
 end
@@ -58,7 +58,7 @@ function Classes.AddGroupItem(ID, GroupID, Destiny, Data)
 		Class[K] = V
 	end
 
-	hook.Run("ACF_OnNewGroupItem", ID, Group, Class)
+	hook.Run("ACF_OnCreateGroupItem", ID, Group, Class)
 
 	return Class
 end
@@ -147,13 +147,13 @@ function Classes.AddGroupedFunctions(Namespace, Entries)
 	end
 end
 
-hook.Add("ACF_OnNewGroup", "ACF Precache Model", function(_, Group)
+hook.Add("ACF_OnCreateGroup", "ACF Precache Model", function(_, Group)
 	if not isstring(Group.Model) then return end
 
 	util.PrecacheModel(Group.Model)
 end)
 
-hook.Add("ACF_OnNewGroupItem", "ACF Precache Model", function(_, _, Class)
+hook.Add("ACF_OnCreateGroupItem", "ACF Precache Model", function(_, _, Class)
 	if not isstring(Class.Model) then return end
 
 	util.PrecacheModel(Class.Model)
diff --git a/lua/acf/core/classes/object.lua b/lua/acf/core/classes/object.lua
index 89788b3cf..c0fc54859 100644
--- a/lua/acf/core/classes/object.lua
+++ b/lua/acf/core/classes/object.lua
@@ -52,7 +52,7 @@ local function AttachMetaTable(Class, Base)
 			Class:OnLoaded()
 		end
 
-		hook.Run("ACF_OnClassLoaded", Class.ID, Class)
+		hook.Run("ACF_OnLoadClass", Class.ID, Class)
 
 		Class.Loaded = true
 	end)
@@ -84,7 +84,7 @@ function Classes.AddObject(ID, Base, Destiny)
 	return Class
 end
 
-hook.Add("ACF_OnClassLoaded", "ACF Model Precache", function(_, Class)
+hook.Add("ACF_OnLoadClass", "ACF Model Precache", function(_, Class)
 	if not isstring(Class.Model) then return end
 
 	util.PrecacheModel(Class.Model)
diff --git a/lua/acf/core/classes/simple.lua b/lua/acf/core/classes/simple.lua
index 30f431f53..8411e75e5 100644
--- a/lua/acf/core/classes/simple.lua
+++ b/lua/acf/core/classes/simple.lua
@@ -24,7 +24,7 @@ function Classes.AddSimple(ID, Destiny, Data)
 		Class[K] = V
 	end
 
-	hook.Run("ACF_OnNewItem", ID, Class)
+	hook.Run("ACF_OnCreateItem", ID, Class)
 
 	return Class
 end
@@ -76,7 +76,7 @@ function Classes.AddSimpleFunctions(Namespace, Entries)
 	end
 end
 
-hook.Add("ACF_OnNewItem", "ACF Precache Model", function(_, Class)
+hook.Add("ACF_OnCreateItem", "ACF Precache Model", function(_, Class)
 	if not isstring(Class.Model) then return end
 
 	util.PrecacheModel(Class.Model)
diff --git a/lua/acf/core/networking/data_vars/data_vars_cl.lua b/lua/acf/core/networking/data_vars/data_vars_cl.lua
index 4fd1a6b1f..8db35c086 100644
--- a/lua/acf/core/networking/data_vars/data_vars_cl.lua
+++ b/lua/acf/core/networking/data_vars/data_vars_cl.lua
@@ -62,7 +62,7 @@ do -- Server data var syncronization
 			if Values[K] ~= V then
 				Values[K] = V
 
-				hook.Run("ACF_OnServerDataUpdate", nil, K, V)
+				hook.Run("ACF_OnUpdateServerData", nil, K, V)
 			end
 
 			Received[K] = nil
@@ -130,7 +130,7 @@ do -- Client data setter function
 		if Forced or Client[Key] ~= Value then
 			Client[Key] = Value
 
-			hook.Run("ACF_OnClientDataUpdate", LocalPlayer(), Key, Value)
+			hook.Run("ACF_OnUpdateClientData", LocalPlayer(), Key, Value)
 
 			NetworkData(Key)
 		end
@@ -150,7 +150,7 @@ do -- Server data setter function
 		if Forced or Server[Key] ~= Value then
 			Server[Key] = Value
 
-			hook.Run("ACF_OnServerDataUpdate", Player, Key, Value)
+			hook.Run("ACF_OnUpdateServerData", Player, Key, Value)
 
 			NetworkData(Key, true)
 		end
diff --git a/lua/acf/core/networking/data_vars/data_vars_sv.lua b/lua/acf/core/networking/data_vars/data_vars_sv.lua
index 4f09f047a..693959844 100644
--- a/lua/acf/core/networking/data_vars/data_vars_sv.lua
+++ b/lua/acf/core/networking/data_vars/data_vars_sv.lua
@@ -191,7 +191,7 @@ do -- Server data setter function
 		if Forced or Server[Key] ~= Value then
 			Server[Key] = Value
 
-			hook.Run("ACF_OnServerDataUpdate", nil, Key, Value)
+			hook.Run("ACF_OnUpdateServerData", nil, Key, Value)
 
 			NetworkData(Key)
 		end
diff --git a/lua/acf/core/utilities/clock/clock.lua b/lua/acf/core/utilities/clock/clock.lua
index 0d12a8fe8..224029f6d 100644
--- a/lua/acf/core/utilities/clock/clock.lua
+++ b/lua/acf/core/utilities/clock/clock.lua
@@ -10,5 +10,5 @@ hook.Add("Think", "ACF Clock Update", function()
 	Clock.DeltaTime = Delta
 	Clock.CurTime   = Now
 
-	hook.Run("ACF_OnClock", New, Delta)
+	hook.Run("ACF_OnTick", New, Delta)
 end)
diff --git a/lua/acf/core/validation_sv.lua b/lua/acf/core/validation_sv.lua
index 43b0c2ed3..dd613d24d 100644
--- a/lua/acf/core/validation_sv.lua
+++ b/lua/acf/core/validation_sv.lua
@@ -179,7 +179,7 @@ function ACF.UpdateThickness(Entity, PhysObj, Area, Ductility)
 	return math.Clamp(Armor, MinimumArmor, MaximumArmor)
 end
 
-hook.Add("ACF_OnServerDataUpdate", "ACF_MaxThickness", function(_, Key, Value)
+hook.Add("ACF_OnUpdateServerData", "ACF_MaxThickness", function(_, Key, Value)
 	if Key ~= "MaxThickness" then return end
 
 	MaximumArmor = math.floor(ACF.CheckNumber(Value, ACF.MaximumArmor))
diff --git a/lua/acf/entities/ammo_types/ap.lua b/lua/acf/entities/ammo_types/ap.lua
index 18bc1a751..e3b0a21ef 100644
--- a/lua/acf/entities/ammo_types/ap.lua
+++ b/lua/acf/entities/ammo_types/ap.lua
@@ -27,7 +27,7 @@ function Ammo:GetDisplayData(Data)
 		MaxPen = self:GetPenetration(Data, Data.MuzzleVel)
 	}
 
-	hook.Run("ACF_GetDisplayData", self, Data, Display)
+	hook.Run("ACF_OnGetDisplayData", self, Data, Display)
 
 	return Display
 end
@@ -42,7 +42,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef   = Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass   = Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/apcr.lua b/lua/acf/entities/ammo_types/apcr.lua
index 8752b6ed5..bec3d1ce0 100644
--- a/lua/acf/entities/ammo_types/apcr.lua
+++ b/lua/acf/entities/ammo_types/apcr.lua
@@ -29,7 +29,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef  = Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass  = Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/apds.lua b/lua/acf/entities/ammo_types/apds.lua
index 2def30f53..22bdba0c6 100644
--- a/lua/acf/entities/ammo_types/apds.lua
+++ b/lua/acf/entities/ammo_types/apds.lua
@@ -31,7 +31,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef  = Data.ProjArea * 0.000125 / Data.ProjMass -- Worse drag (Manually fudged to make a meaningful difference)
 	Data.CartMass  = Data.PropMass + Data.ProjMass + SabotMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/apfsds.lua b/lua/acf/entities/ammo_types/apfsds.lua
index 5fffbac88..8c809245a 100644
--- a/lua/acf/entities/ammo_types/apfsds.lua
+++ b/lua/acf/entities/ammo_types/apfsds.lua
@@ -60,7 +60,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef  = Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass  = Data.PropMass + Data.ProjMass + SabotMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/aphe.lua b/lua/acf/entities/ammo_types/aphe.lua
index 0d5c6c7fd..caf69b5c9 100644
--- a/lua/acf/entities/ammo_types/aphe.lua
+++ b/lua/acf/entities/ammo_types/aphe.lua
@@ -35,7 +35,7 @@ function Ammo:GetDisplayData(Data)
 	Display.FragMass    = FragMass / Display.Fragments
 	Display.FragVel     = (Data.FillerMass * ACF.HEPower * 1000 / Display.FragMass / Display.Fragments) ^ 0.5
 
-	hook.Run("ACF_GetDisplayData", self, Data, Display)
+	hook.Run("ACF_OnGetDisplayData", self, Data, Display)
 
 	return Display
 end
@@ -55,7 +55,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.CartMass   = Data.PropMass + Data.ProjMass
 	Data.FillerRatio = math.Clamp(ToolData.FillerRatio, 0, 1)
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/fl.lua b/lua/acf/entities/ammo_types/fl.lua
index 65efa0501..86eaea765 100644
--- a/lua/acf/entities/ammo_types/fl.lua
+++ b/lua/acf/entities/ammo_types/fl.lua
@@ -41,7 +41,7 @@ function Ammo:GetDisplayData(Data)
 		MaxPen = self:GetPenetration(Data, Data.MuzzleVel)
 	}
 
-	hook.Run("ACF_GetDisplayData", self, Data, Display)
+	hook.Run("ACF_OnGetDisplayData", self, Data, Display)
 
 	return Display
 end
@@ -64,7 +64,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.MuzzleVel		   = ACF.MuzzleVelocity(Data.PropMass, Data.ProjMass, Data.Efficiency)
 	Data.CartMass		   = Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/he.lua b/lua/acf/entities/ammo_types/he.lua
index 469b30663..a20acada9 100644
--- a/lua/acf/entities/ammo_types/he.lua
+++ b/lua/acf/entities/ammo_types/he.lua
@@ -28,7 +28,7 @@ function Ammo:GetDisplayData(Data)
 		FragVel     = (Data.FillerMass * ACF.HEPower * 1000 / (FragMass / Fragments) / Fragments) ^ 0.5,
 	}
 
-	hook.Run("ACF_GetDisplayData", self, Data, Display)
+	hook.Run("ACF_OnGetDisplayData", self, Data, Display)
 
 	return Display
 end
@@ -47,7 +47,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef   = Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass   = Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/heat.lua b/lua/acf/entities/ammo_types/heat.lua
index 7cc0c83ac..4c7b8c1f7 100644
--- a/lua/acf/entities/ammo_types/heat.lua
+++ b/lua/acf/entities/ammo_types/heat.lua
@@ -68,7 +68,7 @@ function Ammo:GetDisplayData(Data)
 		FragVel        = (Data.BoomFillerMass * ACF.HEPower * 1000 / Data.CasingMass) ^ 0.5,
 	}
 
-	hook.Run("ACF_GetDisplayData", self, Data, Display)
+	hook.Run("ACF_OnGetDisplayData", self, Data, Display)
 
 	return Display
 end
@@ -137,7 +137,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef		= Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass		= Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	-- Recalculate the standoff for missiles
 	if Data.MissileStandoff then
diff --git a/lua/acf/entities/ammo_types/heatfs.lua b/lua/acf/entities/ammo_types/heatfs.lua
index c9094a333..30b30c6dc 100644
--- a/lua/acf/entities/ammo_types/heatfs.lua
+++ b/lua/acf/entities/ammo_types/heatfs.lua
@@ -80,7 +80,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef		= Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass		= Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	-- Recalculate the standoff for missiles
 	if Data.MissileStandoff then
diff --git a/lua/acf/entities/ammo_types/hp.lua b/lua/acf/entities/ammo_types/hp.lua
index 830e859a7..40d4add13 100644
--- a/lua/acf/entities/ammo_types/hp.lua
+++ b/lua/acf/entities/ammo_types/hp.lua
@@ -20,7 +20,7 @@ function Ammo:GetDisplayData(Data)
 
 	Display.MaxKETransfert = Energy.Kinetic * Data.ShovePower
 
-	hook.Run("ACF_GetDisplayData", self, Data, Display)
+	hook.Run("ACF_OnGetDisplayData", self, Data, Display)
 
 	return Display
 end
@@ -42,7 +42,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef   = Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass   = Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/entities/ammo_types/smoke.lua b/lua/acf/entities/ammo_types/smoke.lua
index 88eae9eea..6ddeeeac8 100644
--- a/lua/acf/entities/ammo_types/smoke.lua
+++ b/lua/acf/entities/ammo_types/smoke.lua
@@ -36,7 +36,7 @@ function Ammo:GetDisplayData(Data)
 		WPRadiusMax = math.Round(WPFiller * 1.25 * 2 * 0.0254, 2),
 	}
 
-	hook.Run("ACF_GetDisplayData", self, Data, Display)
+	hook.Run("ACF_OnGetDisplayData", self, Data, Display)
 
 	return Display
 end
@@ -62,7 +62,7 @@ function Ammo:UpdateRoundData(ToolData, Data, GUIData)
 	Data.DragCoef   = Data.ProjArea * 0.0001 / Data.ProjMass
 	Data.CartMass   = Data.PropMass + Data.ProjMass
 
-	hook.Run("ACF_UpdateRoundData", self, ToolData, Data, GUIData)
+	hook.Run("ACF_OnUpdateRound", self, ToolData, Data, GUIData)
 
 	for K, V in pairs(self:GetDisplayData(Data)) do
 		GUIData[K] = V
diff --git a/lua/acf/hooks/hooks_sh.lua b/lua/acf/hooks/hooks_sh.lua
index c7e0a4f1f..9349fc0ad 100644
--- a/lua/acf/hooks/hooks_sh.lua
+++ b/lua/acf/hooks/hooks_sh.lua
@@ -10,7 +10,7 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	--- Called when a class group object is created, not necessarily for the first time.
 	-- @param ID The ID of the group that was registered.
 	-- @param Group The group object that was registered.
-	function Gamemode:ACF_OnNewGroup()
+	function Gamemode:ACF_OnCreateGroup()
 	end
 
 	--- Called when a grouped item object is created, not necessarily for the first time.
@@ -18,20 +18,20 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	-- @param ID The ID of the group item that was registered.
 	-- @param GroupID The ID of the group where the item was registered.
 	-- @param Item The item object that was registered.
-	function Gamemode:ACF_OnNewGroupItem()
+	function Gamemode:ACF_OnCreateGroupItem()
 	end
 
 	--- Called when a standalone item object is created, not necessarily for the first time.
 	-- @param ID The ID of the standalone item that was registered.
 	-- @param Group The item object that was registered.
-	function Gamemode:ACF_OnNewItem()
+	function Gamemode:ACF_OnCreateItem()
 	end
 
 	--- Called when a class object is fully created and loaded.
 	-- This will not be instant on startup since the object has to wait for the base objects to load.
 	-- @param ID The ID of the object class that has been loaded.
 	-- @param Class The object class that has been loaded.
-	function Gamemode:ACF_OnClassLoaded()
+	function Gamemode:ACF_OnLoadClass()
 	end
 
 	--- Called when a server data variable value gets updated.
@@ -40,7 +40,7 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	-- On the serverside, if the change was done by the server then this will always be nil.
 	-- @param Key The name of the affected server data variable.
 	-- @param Value The new value assigned to the server data variable.
-	function Gamemode:ACF_OnServerDataUpdate()
+	function Gamemode:ACF_OnUpdateServerData()
 	end
 
 	--- Called when a client data variable value gets updated.
@@ -50,7 +50,7 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	-- @param Player The player that triggered the client data variable change.
 	-- @param Key The name of the affected client data variable.
 	-- @param Value The new value assigned to the client data variable.
-	function Gamemode:ACF_OnClientDataUpdate()
+	function Gamemode:ACF_OnUpdateClientData()
 	end
 
 	--- Called after the Think hook is called.
@@ -58,7 +58,7 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	-- @param CurTime Returns the uptime of the server.
 	-- @param DeltaTime Returns the delay between this hook's call and the previous.
 	-- This value will usually be similar if not the same as the server tickrate.
-	function Gamemode:ACF_OnClock()
+	function Gamemode:ACF_OnTick()
 	end
 
 	--- Called when an ammo type has to provide its display information.
@@ -66,7 +66,7 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	-- @param AmmoType The ammo type object requesting its display information.
 	-- @param Bullet The bullet object being used to get display information.
 	-- @param GUIData The display information table itself.
-	function Gamemode:ACF_GetDisplayData()
+	function Gamemode:ACF_OnGetDisplayData()
 	end
 
 	--- Called when a bullet object is created or updated.
@@ -75,7 +75,7 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	-- @param Bullet The bullet object itself.
 	-- @param GUIData The table of information that's only required for the clientside, such as the menu.
 	-- On the serverside, this will be the same as the Bullet object.
-	function Gamemode:ACF_UpdateRoundData()
+	function Gamemode:ACF_OnUpdateRound()
 	end
 
 	--- Called every time a scalable entity is resized.
@@ -84,6 +84,6 @@ Hooks.Add("ACF_Base_Shared", function(Gamemode)
 	-- @param Size The new size of the entity.
 	-- @param Scale The new scale of the entity.
 	-- This is based off the size of the model the entity it's using and the scale that was given.
-	function Gamemode:ACF_OnEntityResized()
+	function Gamemode:ACF_OnResizeEntity()
 	end
 end)
diff --git a/lua/acf/menu/tool_functions.lua b/lua/acf/menu/tool_functions.lua
index 05b1b6e78..b0d922aad 100644
--- a/lua/acf/menu/tool_functions.lua
+++ b/lua/acf/menu/tool_functions.lua
@@ -354,7 +354,7 @@ end
 
 do -- Clientside Tool interaction
 	if SERVER then
-		hook.Add("ACF_OnClientDataUpdate", "ACF ToolMode", function(Player, Key, Value)
+		hook.Add("ACF_OnUpdateClientData", "ACF ToolMode", function(Player, Key, Value)
 			local Header, Name = unpack(string.Explode(":", Key), 1, 2)
 
 			if Header ~= "ToolMode" then return end
diff --git a/lua/entities/acf_piledriver/shared.lua b/lua/entities/acf_piledriver/shared.lua
index 344bc51be..605e3aec5 100644
--- a/lua/entities/acf_piledriver/shared.lua
+++ b/lua/entities/acf_piledriver/shared.lua
@@ -7,7 +7,7 @@ ENT.IsACFPiledriver = true
 
 cleanup.Register("acf_piledriver")
 
-hook.Add("ACF_UpdateRoundData", "ACF Piledriver Ammo", function(Ammo, _, Data, GUIData)
+hook.Add("ACF_OnUpdateRound", "ACF Piledriver Ammo", function(Ammo, _, Data, GUIData)
 	if not Ammo.SpikeLength then return end
 
 	local Cavity   = ACF.RoundShellCapacity(Data.PropMass, Data.ProjArea, Data.Caliber, Data.ProjLength)
diff --git a/lua/entities/base_scalable/cl_init.lua b/lua/entities/base_scalable/cl_init.lua
index 33c405d80..8e01efef8 100644
--- a/lua/entities/base_scalable/cl_init.lua
+++ b/lua/entities/base_scalable/cl_init.lua
@@ -112,7 +112,7 @@ do -- Size and scale setter methods
 		if IsValid(PhysObj) then
 			if Entity.OnResized then Entity:OnResized(Size, Scale) end
 
-			hook.Run("ACF_OnEntityResized", Entity, PhysObj, Size, Scale)
+			hook.Run("ACF_OnResizeEntity", Entity, PhysObj, Size, Scale)
 		end
 
 		return true
diff --git a/lua/entities/base_scalable/init.lua b/lua/entities/base_scalable/init.lua
index f5d1cbc7a..53d8a9c5a 100644
--- a/lua/entities/base_scalable/init.lua
+++ b/lua/entities/base_scalable/init.lua
@@ -51,7 +51,7 @@ do -- Size and scale setter methods
 		if IsValid(PhysObj) then
 			if Entity.OnResized then Entity:OnResized(Size, Scale) end
 
-			hook.Run("ACF_OnEntityResized", Entity, PhysObj, Size, Scale)
+			hook.Run("ACF_OnResizeEntity", Entity, PhysObj, Size, Scale)
 		end
 
 		return true
diff --git a/lua/tests/acf/ballistics/ballistics_sv/create_bullet.lua b/lua/tests/acf/ballistics/ballistics_sv/create_bullet.lua
index 4dc8cf51f..047249044 100644
--- a/lua/tests/acf/ballistics/ballistics_sv/create_bullet.lua
+++ b/lua/tests/acf/ballistics/ballistics_sv/create_bullet.lua
@@ -19,7 +19,7 @@ return {
 
     afterEach = function()
         table.Empty( ACF.Ballistics.Bullets )
-        hook.Remove( "ACF_OnClock", "ACF Iterate Bullets" )
+        hook.Remove( "ACF_OnTick", "ACF Iterate Bullets" )
     end,
 
     afterAll = function( State )
diff --git a/lua/weapons/gmod_tool/stools/acfarmorprop.lua b/lua/weapons/gmod_tool/stools/acfarmorprop.lua
index bb7c69fea..bb3942f93 100644
--- a/lua/weapons/gmod_tool/stools/acfarmorprop.lua
+++ b/lua/weapons/gmod_tool/stools/acfarmorprop.lua
@@ -61,7 +61,7 @@ local function UpdateArmor(_, Entity, Data)
 	duplicator.StoreEntityModifier(Entity, "ACF_Armor", { Thickness = Data.Thickness, Ductility = Ductility })
 end
 
-hook.Add("ACF_OnServerDataUpdate", "ACF_ArmorTool_MaxThickness", function(_, Key, Value)
+hook.Add("ACF_OnUpdateServerData", "ACF_ArmorTool_MaxThickness", function(_, Key, Value)
 	if Key ~= "MaxThickness" then return end
 
 	MaximumArmor = math.floor(ACF.CheckNumber(Value, ACF.MaximumArmor))