diff --git a/fgd/bases/BaseBrush.fgd b/fgd/bases/BaseBrush.fgd
deleted file mode 100644
index a64ff644b..000000000
--- a/fgd/bases/BaseBrush.fgd
+++ /dev/null
@@ -1,6 +0,0 @@
-@BaseClass = BaseBrush
-	[
-	// Inputs
-	input SetTextureIndex(integer) : "Used by HL1Port. Sets the brush texture index. Use a material_modify_control entity instead."
-	input IncrementTextureIndex(void) : "Used by HL1Port. Increments the brush texture index. Use a material_modify_control entity instead."
-	]
diff --git a/fgd/bases/BaseZombie.fgd b/fgd/bases/BaseZombie.fgd
deleted file mode 100644
index 26a7a3d7a..000000000
--- a/fgd/bases/BaseZombie.fgd
+++ /dev/null
@@ -1,4 +0,0 @@
-@BaseClass base(BaseNPC) 
-= BaseZombie
-	[
-	]
diff --git a/fgd/bases/ItemAmmo.fgd b/fgd/bases/ItemAmmo.fgd
deleted file mode 100644
index 1e8670a36..000000000
--- a/fgd/bases/ItemAmmo.fgd
+++ /dev/null
@@ -1,3 +0,0 @@
-@BaseClass base(Item) = ItemAmmo
-	[
-	]
diff --git a/fgd/bases/Territory.fgd b/fgd/bases/Territory.fgd
deleted file mode 100644
index 7841f81dd..000000000
--- a/fgd/bases/Territory.fgd
+++ /dev/null
@@ -1,7 +0,0 @@
-@BaseClass base(BaseEntityPoint) // Animating?
-	studio("models/props/cs_assault/consolepanelloadingbay.mdl") 
-= Territory
-	[
-	respawn_area(string) : "Respawn area name"
-	buyzone(string) : "Buy Zone name"
-	]
diff --git a/fgd/point/item/item_ammo_357.fgd b/fgd/point/item/item_ammo_357.fgd
index 06481c464..7558f33d4 100644
--- a/fgd/point/item/item_ammo_357.fgd
+++ b/fgd/point/item/item_ammo_357.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo)
+@PointClass base(Item)
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/357ammo.mdl")
 = item_ammo_357: "Box of 357 ammo"
diff --git a/fgd/point/item/item_ammo_357_large.fgd b/fgd/point/item/item_ammo_357_large.fgd
index e34263c0a..3e8dbdb96 100644
--- a/fgd/point/item/item_ammo_357_large.fgd
+++ b/fgd/point/item/item_ammo_357_large.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/357ammobox.mdl")
 = item_ammo_357_large: "Large Box of 357 ammo"
diff --git a/fgd/point/item/item_ammo_ar2.fgd b/fgd/point/item/item_ammo_ar2.fgd
index 122baa097..3ae1e1ef1 100644
--- a/fgd/point/item/item_ammo_ar2.fgd
+++ b/fgd/point/item/item_ammo_ar2.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/combine_rifle_cartridge01.mdl")
 = item_ammo_ar2: "Cartridge of AR2 ammo"
diff --git a/fgd/point/item/item_ammo_ar2_altfire.fgd b/fgd/point/item/item_ammo_ar2_altfire.fgd
index b9d65aac4..40843872f 100644
--- a/fgd/point/item/item_ammo_ar2_altfire.fgd
+++ b/fgd/point/item/item_ammo_ar2_altfire.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/combine_rifle_ammo01.mdl")
 = item_ammo_ar2_altfire: "AR2 Alt-fire Round"
diff --git a/fgd/point/item/item_ammo_ar2_large.fgd b/fgd/point/item/item_ammo_ar2_large.fgd
index 75ad6befb..92b392d69 100644
--- a/fgd/point/item/item_ammo_ar2_large.fgd
+++ b/fgd/point/item/item_ammo_ar2_large.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/combine_rifle_cartridge01.mdl")
 = item_ammo_ar2_large: "Large cartridge of AR2 ammo"
diff --git a/fgd/point/item/item_ammo_crossbow.fgd b/fgd/point/item/item_ammo_crossbow.fgd
index e62a40951..15feb1ea1 100644
--- a/fgd/point/item/item_ammo_crossbow.fgd
+++ b/fgd/point/item/item_ammo_crossbow.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo)
+@PointClass base(Item)
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/crossbowrounds.mdl")
 = item_ammo_crossbow: "Box of Crossbow ammo"
diff --git a/fgd/point/item/item_ammo_pistol.fgd b/fgd/point/item/item_ammo_pistol.fgd
index 2c34c1ec8..371dc473b 100644
--- a/fgd/point/item/item_ammo_pistol.fgd
+++ b/fgd/point/item/item_ammo_pistol.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/boxsrounds.mdl")
 = item_ammo_pistol: "Box of Pistol ammo"
diff --git a/fgd/point/item/item_ammo_pistol_large.fgd b/fgd/point/item/item_ammo_pistol_large.fgd
index 5bb674236..7055b9d21 100644
--- a/fgd/point/item/item_ammo_pistol_large.fgd
+++ b/fgd/point/item/item_ammo_pistol_large.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/boxsrounds.mdl")
 = item_ammo_pistol_large: "Large Box of Pistol ammo"
diff --git a/fgd/point/item/item_ammo_smg1.fgd b/fgd/point/item/item_ammo_smg1.fgd
index 569002661..20c87b724 100644
--- a/fgd/point/item/item_ammo_smg1.fgd
+++ b/fgd/point/item/item_ammo_smg1.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/BoxMRounds.mdl")
 = item_ammo_smg1: "Box of SMG1 ammo"
diff --git a/fgd/point/item/item_ammo_smg1_grenade.fgd b/fgd/point/item/item_ammo_smg1_grenade.fgd
index e03c92546..4b8d34766 100644
--- a/fgd/point/item/item_ammo_smg1_grenade.fgd
+++ b/fgd/point/item/item_ammo_smg1_grenade.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/AR2_Grenade.mdl") 
 = item_ammo_smg1_grenade: "SMG1's grenade ammo."
diff --git a/fgd/point/item/item_ammo_smg1_large.fgd b/fgd/point/item/item_ammo_smg1_large.fgd
index 9e156e45d..0a09ec6cb 100644
--- a/fgd/point/item/item_ammo_smg1_large.fgd
+++ b/fgd/point/item/item_ammo_smg1_large.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/boxmrounds.mdl")
 = item_ammo_smg1_large: "Large Box of SMG1 ammo"
diff --git a/fgd/point/item/item_ar2_grenade.fgd b/fgd/point/item/item_ar2_grenade.fgd
index 63af8410d..6f9576da2 100644
--- a/fgd/point/item/item_ar2_grenade.fgd
+++ b/fgd/point/item/item_ar2_grenade.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/items/AR2_Grenade.mdl") 
 = item_ar2_grenade: "Alternate classname for the SMG1 Grenade's ammo."
diff --git a/fgd/point/item/item_box_buckshot.fgd b/fgd/point/item/item_box_buckshot.fgd
index ed6bd2753..665269350 100644
--- a/fgd/point/item/item_box_buckshot.fgd
+++ b/fgd/point/item/item_box_buckshot.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES) 
 	studio("models/items/BoxBuckshot.mdl")
 = item_box_buckshot: "Box Buckshot"
diff --git a/fgd/point/item/item_rpg_round.fgd b/fgd/point/item/item_rpg_round.fgd
index e8e73d59c..e4b708807 100644
--- a/fgd/point/item/item_rpg_round.fgd
+++ b/fgd/point/item/item_rpg_round.fgd
@@ -1,4 +1,4 @@
-@PointClass base(ItemAmmo) 
+@PointClass base(Item) 
 	appliesto(+HL2_ENTITIES) 
 	studio("models/weapons/w_missile_closed.mdl")
 = item_rpg_round: "RPG Round"
diff --git a/fgd/point/npc/npc_fastzombie.fgd b/fgd/point/npc/npc_fastzombie.fgd
index 0740b8f94..bcccf074e 100644
--- a/fgd/point/npc/npc_fastzombie.fgd
+++ b/fgd/point/npc/npc_fastzombie.fgd
@@ -1,4 +1,4 @@
-@NpcClass base(BaseZombie) 
+@NpcClass base(BaseNPC) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/Zombie/fast.mdl") 
 = npc_fastzombie: "Fast Zombie"
diff --git a/fgd/point/npc/npc_fastzombie_torso.fgd b/fgd/point/npc/npc_fastzombie_torso.fgd
index 87d2f244c..dcaefb83b 100644
--- a/fgd/point/npc/npc_fastzombie_torso.fgd
+++ b/fgd/point/npc/npc_fastzombie_torso.fgd
@@ -1,4 +1,4 @@
-@NpcClass base(BaseZombie) 
+@NpcClass base(BaseNPC) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/Zombie/Fast_torso.mdl") 
 = npc_fastzombie_torso: "Fast Zombie Torso"
diff --git a/fgd/point/npc/npc_zombie.fgd b/fgd/point/npc/npc_zombie.fgd
index f62d5543e..8f85b5239 100644
--- a/fgd/point/npc/npc_zombie.fgd
+++ b/fgd/point/npc/npc_zombie.fgd
@@ -1,4 +1,4 @@
-@NpcClass base(BaseZombie) 
+@NpcClass base(BaseNPC) 
 	appliesto(+HL2_ENTITIES)
 	studio("models/Zombie/Classic.mdl") 
 = npc_zombie: "Zombie"