71 files changed, 514 insertions, 514 deletions

diff --git a/src/Mobs/NewBat.cpp b/src/Mobs/Bat.cpp
index 2de28d63a..c072d4f48 100644
--- a/src/Mobs/NewBat.cpp
+++ b/src/Mobs/Bat.cpp
@@ -1,12 +1,12 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewBat.h"
+#include "Bat.h"
 #include "../Vector3.h"
 #include "../Chunk.h"
 
 
-cNewBat::cNewBat(void) :
+cBat::cBat(void) :
 	super("Bat", mtBat,  "mob.bat.hurt", "mob.bat.death", 0.5, 0.9)
 {
 }
diff --git a/src/Mobs/Bat.h b/src/Mobs/Bat.h
new file mode 100644
index 000000000..2d65f1a7f
--- /dev/null
+++ b/src/Mobs/Bat.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cBat :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cBat(void);
+
+	CLASS_PROTODEF(cBat)
+	
+	bool IsHanging(void) const {return false; }
+} ;
+
+
+
+
diff --git a/src/Mobs/NewBlaze.cpp b/src/Mobs/Blaze.cpp
index 699a14227..954bbfa6c 100644
--- a/src/Mobs/NewBlaze.cpp
+++ b/src/Mobs/Blaze.cpp
@@ -1,14 +1,14 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewBlaze.h"
+#include "Blaze.h"
 #include "../World.h"
 #include "../Entities/FireChargeEntity.h"
 
 
 
 
-cNewBlaze::cNewBlaze(void) :
+cBlaze::cBlaze(void) :
 	super("Blaze", mtBlaze, "mob.blaze.hit", "mob.blaze.death", 0.6, 1.8)
 {
 }
@@ -17,7 +17,7 @@ cNewBlaze::cNewBlaze(void) :
 
 
 
-void cNewBlaze::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cBlaze::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	if ((a_Killer != NULL) && (a_Killer->IsPlayer() || a_Killer->IsA("cWolf")))
 	{
diff --git a/src/Mobs/Blaze.h b/src/Mobs/Blaze.h
new file mode 100644
index 000000000..65645bce9
--- /dev/null
+++ b/src/Mobs/Blaze.h
@@ -0,0 +1,21 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cBlaze :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cBlaze(void);
+
+	CLASS_PROTODEF(cBlaze)
+	
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
diff --git a/src/Mobs/NewCaveSpider.cpp b/src/Mobs/CaveSpider.cpp
index c3acb926b..09bb6c2f5 100644
--- a/src/Mobs/NewCaveSpider.cpp
+++ b/src/Mobs/CaveSpider.cpp
@@ -1,13 +1,13 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewCaveSpider.h"
+#include "CaveSpider.h"
 #include "../World.h"
 
 
 
 
 
-cNewCaveSpider::cNewCaveSpider(void) :
+cCaveSpider::cCaveSpider(void) :
 	super("CaveSpider", mtCaveSpider, "mob.spider.say", "mob.spider.death", 0.7, 0.5)
 {
 }
@@ -16,7 +16,7 @@ cNewCaveSpider::cNewCaveSpider(void) :
 
 
 
-void cNewCaveSpider::Tick(float a_Dt, cChunk & a_Chunk)
+void cCaveSpider::Tick(float a_Dt, cChunk & a_Chunk)
 {
 	super::Tick(a_Dt, a_Chunk);
 }
@@ -25,7 +25,7 @@ void cNewCaveSpider::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
-void cNewCaveSpider::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cCaveSpider::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewCaveSpider.h b/src/Mobs/CaveSpider.h
index 3e52189a0..0dab0d798 100644
--- a/src/Mobs/NewCaveSpider.h
+++ b/src/Mobs/CaveSpider.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewCaveSpider :
-	public cNewMonster
+class cCaveSpider :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewCaveSpider(void);
+	cCaveSpider(void);
 
-	CLASS_PROTODEF(cNewCaveSpider)
+	CLASS_PROTODEF(cCaveSpider)
 
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
diff --git a/src/Mobs/NewChicken.cpp b/src/Mobs/Chicken.cpp
index 6c61507f2..f7e44238f 100644
--- a/src/Mobs/NewChicken.cpp
+++ b/src/Mobs/Chicken.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewChicken.h"
+#include "Chicken.h"
 #include "../World.h"
 
 
@@ -9,7 +9,7 @@
 
 
 
-cNewChicken::cNewChicken(void) :
+cChicken::cChicken(void) :
 	super("Chicken", mtChicken, "mob.chicken.hurt", "mob.chicken.hurt", 0.3, 0.4),
 	m_EggDropTimer(0)
 {
@@ -18,7 +18,7 @@ cNewChicken::cNewChicken(void) :
 
 
 
-void cNewChicken::Tick(float a_Dt, cChunk & a_Chunk)
+void cChicken::Tick(float a_Dt, cChunk & a_Chunk)
 {
 	super::Tick(a_Dt, a_Chunk);
 
@@ -46,7 +46,7 @@ void cNewChicken::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
-void cNewChicken::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cChicken::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewChicken.h b/src/Mobs/Chicken.h
index 4323585e6..7e52d6d83 100644
--- a/src/Mobs/NewChicken.h
+++ b/src/Mobs/Chicken.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewChicken :
-	public cNewMonster
+class cChicken :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewChicken(void);
+	cChicken(void);
 
-	CLASS_PROTODEF(cNewChicken)
+	CLASS_PROTODEF(cChicken)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
diff --git a/src/Mobs/NewCow.cpp b/src/Mobs/Cow.cpp
index 8009a5f0d..391abd453 100644
--- a/src/Mobs/NewCow.cpp
+++ b/src/Mobs/Cow.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewCow.h"
+#include "Cow.h"
 #include "../Entities/Player.h"
 
 
@@ -10,7 +10,7 @@
 
 
 
-cNewCow::cNewCow(void) :
+cCow::cCow(void) :
 	super("Cow", mtCow, "mob.cow.hurt", "mob.cow.hurt", 0.9, 1.3)
 {
 }
@@ -19,7 +19,7 @@ cNewCow::cNewCow(void) :
 
 
 
-void cNewCow::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cCow::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/Cow.h b/src/Mobs/Cow.h
new file mode 100644
index 000000000..09f68fe13
--- /dev/null
+++ b/src/Mobs/Cow.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cCow :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cCow();
+
+	CLASS_PROTODEF(cCow)
+
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewCreeper.cpp b/src/Mobs/Creeper.cpp
index a6f5e0e4d..9b7fc52c1 100644
--- a/src/Mobs/NewCreeper.cpp
+++ b/src/Mobs/Creeper.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewCreeper.h"
+#include "Creeper.h"
 #include "../World.h"
 #include "../Entities/ProjectileEntity.h"
 #include "../Entities/Player.h"
@@ -11,7 +11,7 @@
 
 
 
-cNewCreeper::cNewCreeper(void) :
+cCreeper::cCreeper(void) :
 	super("Creeper", mtCreeper, "mob.creeper.say", "mob.creeper.say", 0.6, 1.8),
 	m_bIsBlowing(false),
 	m_bIsCharged(false),
@@ -24,7 +24,7 @@ cNewCreeper::cNewCreeper(void) :
 
 
 
-void cNewCreeper::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cCreeper::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	if (m_ExplodingTimer == 30)
 	{
@@ -50,7 +50,7 @@ void cNewCreeper::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 			virtual bool Item(cEntity * a_Entity) override
 			{
-				if (a_Entity->IsMob() && ((cNewMonster *)a_Entity)->GetMobType() == mtSkeleton)
+				if (a_Entity->IsMob() && ((cMonster *)a_Entity)->GetMobType() == mtSkeleton)
 				{
 					return true;
 				}
diff --git a/src/Mobs/NewCreeper.h b/src/Mobs/Creeper.h
index 61a16bf68..9824608b5 100644
--- a/src/Mobs/NewCreeper.h
+++ b/src/Mobs/Creeper.h
@@ -1,21 +1,21 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewCreeper :
-	public cNewMonster
+class cCreeper :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewCreeper(void);
+	cCreeper(void);
 
-	CLASS_PROTODEF(cNewCreeper)
+	CLASS_PROTODEF(cCreeper)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
diff --git a/src/Mobs/NewEnderDragon.cpp b/src/Mobs/EnderDragon.cpp
index 7ed9ab25a..acd81cde1 100644
--- a/src/Mobs/NewEnderDragon.cpp
+++ b/src/Mobs/EnderDragon.cpp
@@ -1,13 +1,13 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewEnderDragon.h"
+#include "EnderDragon.h"
 
 
 
 
 
-cNewEnderDragon::cNewEnderDragon(void) :
+cEnderDragon::cEnderDragon(void) :
 	// TODO: Vanilla source says this, but is it right? Dragons fly, they don't stand
 	super("EnderDragon", mtEnderDragon, "mob.enderdragon.hit", "mob.enderdragon.end", 16.0, 8.0)
 {
@@ -17,7 +17,7 @@ cNewEnderDragon::cNewEnderDragon(void) :
 
 
 
-void cNewEnderDragon::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cEnderDragon::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	return;
 }
diff --git a/src/Mobs/EnderDragon.h b/src/Mobs/EnderDragon.h
new file mode 100644
index 000000000..2876c3b99
--- /dev/null
+++ b/src/Mobs/EnderDragon.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cEnderDragon :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cEnderDragon(void);
+
+	CLASS_PROTODEF(cEnderDragon)
+	
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewEnderman.cpp b/src/Mobs/Enderman.cpp
index 5a61265d7..8a2803492 100644
--- a/src/Mobs/NewEnderman.cpp
+++ b/src/Mobs/Enderman.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewEnderman.h"
+#include "Enderman.h"
 #include "../Entities/Player.h"
 #include "../Tracer.h"
 
@@ -9,7 +9,7 @@
 
 
 
-cNewEnderman::cNewEnderman(void) :
+cEnderman::cEnderman(void) :
 	super("Enderman", mtEnderman, "mob.endermen.hit", "mob.endermen.death", 0.5, 2.9),
 	m_bIsScreaming(false),
 	CarriedBlock(E_BLOCK_AIR),
@@ -21,7 +21,7 @@ cNewEnderman::cNewEnderman(void) :
 
 
 
-void cNewEnderman::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cEnderman::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewEnderman.h b/src/Mobs/Enderman.h
index 1a0a9a81b..47d92e686 100644
--- a/src/Mobs/NewEnderman.h
+++ b/src/Mobs/Enderman.h
@@ -1,21 +1,21 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewEnderman :
-	public cNewMonster
+class cEnderman :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewEnderman(void);
+	cEnderman(void);
 
-	CLASS_PROTODEF(cNewEnderman)
+	CLASS_PROTODEF(cEnderman)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
diff --git a/src/Mobs/NewGhast.cpp b/src/Mobs/Ghast.cpp
index eb49a7a4f..4bea6dd0d 100644
--- a/src/Mobs/NewGhast.cpp
+++ b/src/Mobs/Ghast.cpp
@@ -1,14 +1,14 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewGhast.h"
+#include "Ghast.h"
 #include "../World.h"
 #include "../Entities/GhastFireballEntity.h"
 
 
 
 
-cNewGhast::cNewGhast(void) :
+cGhast::cGhast(void) :
 	super("Ghast", mtGhast, "mob.ghast.scream", "mob.ghast.death", 4, 4)
 {
 }
@@ -17,7 +17,7 @@ cNewGhast::cNewGhast(void) :
 
 
 
-void cNewGhast::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cGhast::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewGhast.h b/src/Mobs/Ghast.h
index d0af768c5..26f8845a9 100644
--- a/src/Mobs/NewGhast.h
+++ b/src/Mobs/Ghast.h
@@ -1,21 +1,21 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewGhast :
-	public cNewMonster
+class cGhast :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewGhast(void);
+	cGhast(void);
 
-	CLASS_PROTODEF(cNewGhast)
+	CLASS_PROTODEF(cGhast)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
diff --git a/src/Mobs/NewGiant.cpp b/src/Mobs/Giant.cpp
index a6bb0b3ed..bbcad46f0 100644
--- a/src/Mobs/NewGiant.cpp
+++ b/src/Mobs/Giant.cpp
@@ -1,13 +1,13 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewGiant.h"
+#include "Giant.h"
 
 
 
 
 
-cNewGiant::cNewGiant(void) :
+cGiant::cGiant(void) :
 	super("Giant", mtGiant, "mob.zombie.hurt", "mob.zombie.death", 3.6, 10.8)
 {
 
@@ -17,7 +17,7 @@ cNewGiant::cNewGiant(void) :
 
 
 
-void cNewGiant::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cGiant::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	AddRandomDropItem(a_Drops, 10, 50, E_ITEM_ROTTEN_FLESH);
 }
diff --git a/src/Mobs/Giant.h b/src/Mobs/Giant.h
new file mode 100644
index 000000000..e9bda920d
--- /dev/null
+++ b/src/Mobs/Giant.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cGiant :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cGiant(void);
+
+	CLASS_PROTODEF(cGiant)
+	
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewHorse.cpp b/src/Mobs/Horse.cpp
index 2d02aeed2..48bd9fef5 100644
--- a/src/Mobs/NewHorse.cpp
+++ b/src/Mobs/Horse.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewHorse.h"
+#include "Horse.h"
 #include "../World.h"
 #include "../Entities/Player.h"
 
@@ -8,7 +8,7 @@
 
 
 
-cNewHorse::cNewHorse(int Type, int Color, int Style, int TameTimes) :
+cHorse::cHorse(int Type, int Color, int Style, int TameTimes) :
 	super("Horse", mtHorse, "mob.horse.hit", "mob.horse.death", 1.4, 1.6),
 	m_bHasChest(false),
 	m_bIsEating(false),
@@ -30,7 +30,7 @@ cNewHorse::cNewHorse(int Type, int Color, int Style, int TameTimes) :
 
 
 
-void cNewHorse::Tick(float a_Dt, cChunk & a_Chunk)
+void cHorse::Tick(float a_Dt, cChunk & a_Chunk)
 {
 	super::Tick(a_Dt, a_Chunk);
 
@@ -90,7 +90,7 @@ void cNewHorse::Tick(float a_Dt, cChunk & a_Chunk)
 
 
 
-void cNewHorse::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cHorse::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewHorse.h b/src/Mobs/Horse.h
index 8eadf01d4..f34283a80 100644
--- a/src/Mobs/NewHorse.h
+++ b/src/Mobs/Horse.h
@@ -1,21 +1,21 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewHorse :
-	public cNewMonster
+class cHorse :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewHorse(int Type, int Color, int Style, int TameTimes);
+	cHorse(int Type, int Color, int Style, int TameTimes);
 
-	CLASS_PROTODEF(cNewHorse)
+	CLASS_PROTODEF(cHorse)
 	
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
diff --git a/src/Mobs/NewIronGolem.cpp b/src/Mobs/IronGolem.cpp
index 0fa3eadee..dae4615e4 100644
--- a/src/Mobs/NewIronGolem.cpp
+++ b/src/Mobs/IronGolem.cpp
@@ -1,13 +1,13 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewIronGolem.h"
+#include "IronGolem.h"
 
 
 
 
 
-cNewIronGolem::cNewIronGolem(void) :
+cIronGolem::cIronGolem(void) :
 	super("IronGolem", mtIronGolem, "mob.IronGolem.hit", "mob.IronGolem.death", 1.4, 2.9)
 {
 }
@@ -16,7 +16,7 @@ cNewIronGolem::cNewIronGolem(void) :
 
 
 
-void cNewIronGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cIronGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	UNUSED(a_Killer);
 	AddRandomDropItem(a_Drops, 0, 5, E_ITEM_IRON);
diff --git a/src/Mobs/IronGolem.h b/src/Mobs/IronGolem.h
new file mode 100644
index 000000000..5a024cfbc
--- /dev/null
+++ b/src/Mobs/IronGolem.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cIronGolem :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cIronGolem(void);
+
+	CLASS_PROTODEF(cIronGolem)
+	
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewMagmaCube.cpp b/src/Mobs/MagmaCube.cpp
index 931adf12d..3e9abc108 100644
--- a/src/Mobs/NewMagmaCube.cpp
+++ b/src/Mobs/MagmaCube.cpp
@@ -1,12 +1,12 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewMagmaCube.h"
+#include "MagmaCube.h"
 
 
 
 
 
-cNewMagmaCube::cNewMagmaCube(int a_Size) :
+cMagmaCube::cMagmaCube(int a_Size) :
 	super("MagmaCube", mtMagmaCube, "mob.MagmaCube.big", "mob.MagmaCube.big", 0.6 * a_Size, 0.6 * a_Size),
 	m_Size(a_Size)
 {
@@ -16,7 +16,7 @@ cNewMagmaCube::cNewMagmaCube(int a_Size) :
 
 
 
-void cNewMagmaCube::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cMagmaCube::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	UNUSED(a_Killer);
 	if (GetSize() > 1)
diff --git a/src/Mobs/NewMagmaCube.h b/src/Mobs/MagmaCube.h
index f55f0164a..d27bba4d3 100644
--- a/src/Mobs/NewMagmaCube.h
+++ b/src/Mobs/MagmaCube.h
@@ -1,21 +1,21 @@
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewMagmaCube :
-	public cNewMonster
+class cMagmaCube :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
 	/// Creates a MagmaCube of the specified size; size is 1 .. 3, with 1 being the smallest
-	cNewMagmaCube(int a_Size);
+	cMagmaCube(int a_Size);
 
-	CLASS_PROTODEF(cNewMagmaCube)
+	CLASS_PROTODEF(cMagmaCube)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	int GetSize(void) const { return m_Size; }
diff --git a/src/Mobs/NewMonster.cpp b/src/Mobs/Monster.cpp
index bfa1f4e6d..4ea495279 100644
--- a/src/Mobs/NewMonster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -1,9 +1,9 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "NewMonster.h"
+#include "Monster.h"
 #include "../ClientHandle.h"
 #include "../MersenneTwister.h"
 
-cNewMonster::cNewMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height)
+cMonster::cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height)
 	: super(etMonster, a_Width, a_Height)
 	, m_MobType(a_MobType)
 	, m_SoundHurt(a_SoundHurt)
@@ -26,7 +26,7 @@ cNewMonster::cNewMonster(const AString & a_ConfigName, eType a_MobType, const AS
 
 
 
-void cNewMonster::SpawnOn(cClientHandle & a_Client)
+void cMonster::SpawnOn(cClientHandle & a_Client)
 {
 	a_Client.SendSpawnMob(*this);
 }
@@ -35,7 +35,7 @@ void cNewMonster::SpawnOn(cClientHandle & a_Client)
 
 
 
-void cNewMonster::AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth)
+void cMonster::AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth)
 {
 	MTRand r1;
 	int Count = r1.randInt() % (a_Max + 1 - a_Min) + a_Min;
@@ -49,7 +49,7 @@ void cNewMonster::AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsign
 
 
 
-void cNewMonster::AddRandomUncommonDropItem(cItems & a_Drops, float a_Chance, short a_Item, short a_ItemHealth)
+void cMonster::AddRandomUncommonDropItem(cItems & a_Drops, float a_Chance, short a_Item, short a_ItemHealth)
 {
 	MTRand r1;
 	int Count = r1.randInt() % 1000;
@@ -63,7 +63,7 @@ void cNewMonster::AddRandomUncommonDropItem(cItems & a_Drops, float a_Chance, sh
 
 
 
-void cNewMonster::AddRandomRareDropItem(cItems & a_Drops, cItems & a_Items, short a_LootingLevel)
+void cMonster::AddRandomRareDropItem(cItems & a_Drops, cItems & a_Items, short a_LootingLevel)
 {
 	MTRand r1;
 	int Count = r1.randInt() % 200;
@@ -78,7 +78,7 @@ void cNewMonster::AddRandomRareDropItem(cItems & a_Drops, cItems & a_Items, shor
 
 
 
-void cNewMonster::AddRandomArmorDropItem(cItems & a_Drops, short a_LootingLevel)
+void cMonster::AddRandomArmorDropItem(cItems & a_Drops, short a_LootingLevel)
 {
 	MTRand r1;
 	if (r1.randInt() % 200 < ((m_DropChanceHelmet * 200) + (a_LootingLevel * 2)))
@@ -106,7 +106,7 @@ void cNewMonster::AddRandomArmorDropItem(cItems & a_Drops, short a_LootingLevel)
 
 
 
-void cNewMonster::AddRandomWeaponDropItem(cItems & a_Drops, short a_LootingLevel)
+void cMonster::AddRandomWeaponDropItem(cItems & a_Drops, short a_LootingLevel)
 {
 	MTRand r1;
 	if (r1.randInt() % 200 < ((m_DropChanceWeapon * 200) + (a_LootingLevel * 2)))
diff --git a/src/Mobs/NewMonster.h b/src/Mobs/Monster.h
index e7dc129c4..b03390930 100644
--- a/src/Mobs/NewMonster.h
+++ b/src/Mobs/Monster.h
@@ -15,7 +15,7 @@
 class cClientHandle;
 class cWorld;
 
-class cNewMonster : public cPawn {
+class cMonster : public cPawn {
 	typedef cPawn super;
 public:
 	/// This identifies individual monster type, as well as their network type-ID
@@ -57,7 +57,7 @@ public:
 protected:
 	eType  m_MobType;
 public:
-	cNewMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
+	cMonster(const AString & a_ConfigName, eType a_MobType, const AString & a_SoundHurt, const AString & a_SoundDeath, double a_Width, double a_Height);
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
 	eType  GetMobType() const { return m_MobType; }
 	virtual bool IsBaby    (void) const { return false; }
diff --git a/src/Mobs/NewMooshroom.cpp b/src/Mobs/Mooshroom.cpp
index c9362b0f2..d20c92fee 100644
--- a/src/Mobs/NewMooshroom.cpp
+++ b/src/Mobs/Mooshroom.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewMooshroom.h"
+#include "Mooshroom.h"
 #include "../Entities/Player.h"
 
 
@@ -13,7 +13,7 @@
 
 
 
-cNewMooshroom::cNewMooshroom(void) :
+cMooshroom::cMooshroom(void) :
 	super("Mooshroom", mtMooshroom, "mob.cow.hurt", "mob.cow.hurt", 0.9, 1.3)
 {
 }
@@ -22,7 +22,7 @@ cNewMooshroom::cNewMooshroom(void) :
 
 
 
-void cNewMooshroom::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cMooshroom::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/Mooshroom.h b/src/Mobs/Mooshroom.h
new file mode 100644
index 000000000..6630c57ec
--- /dev/null
+++ b/src/Mobs/Mooshroom.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cMooshroom :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cMooshroom(void);
+
+	CLASS_PROTODEF(cMooshroom)
+
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewBat.h b/src/Mobs/NewBat.h
deleted file mode 100644
index 354413cdf..000000000
--- a/src/Mobs/NewBat.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewBat :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewBat(void);
-
-	CLASS_PROTODEF(cNewBat)
-	
-	bool IsHanging(void) const {return false; }
-} ;
-
-
-
-
diff --git a/src/Mobs/NewBlaze.h b/src/Mobs/NewBlaze.h
deleted file mode 100644
index eebe491f5..000000000
--- a/src/Mobs/NewBlaze.h
+++ /dev/null
@@ -1,21 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewBlaze :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewBlaze(void);
-
-	CLASS_PROTODEF(cNewBlaze)
-	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
diff --git a/src/Mobs/NewCow.h b/src/Mobs/NewCow.h
deleted file mode 100644
index b0c770e84..000000000
--- a/src/Mobs/NewCow.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewCow :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewCow();
-
-	CLASS_PROTODEF(cNewCow)
-
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewEnderDragon.h b/src/Mobs/NewEnderDragon.h
deleted file mode 100644
index 524124f18..000000000
--- a/src/Mobs/NewEnderDragon.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewEnderDragon :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewEnderDragon(void);
-
-	CLASS_PROTODEF(cNewEnderDragon)
-	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewGiant.h b/src/Mobs/NewGiant.h
deleted file mode 100644
index 823cb9638..000000000
--- a/src/Mobs/NewGiant.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewGiant :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewGiant(void);
-
-	CLASS_PROTODEF(cNewGiant)
-	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewIronGolem.h b/src/Mobs/NewIronGolem.h
deleted file mode 100644
index 6cd86b237..000000000
--- a/src/Mobs/NewIronGolem.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewIronGolem :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewIronGolem(void);
-
-	CLASS_PROTODEF(cNewIronGolem)
-	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewMooshroom.h b/src/Mobs/NewMooshroom.h
deleted file mode 100644
index 2e10ad0a3..000000000
--- a/src/Mobs/NewMooshroom.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewMooshroom :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewMooshroom(void);
-
-	CLASS_PROTODEF(cNewMooshroom)
-
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewOcelot.h b/src/Mobs/NewOcelot.h
deleted file mode 100644
index c1eb3b9e3..000000000
--- a/src/Mobs/NewOcelot.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewOcelot :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewOcelot(void) :
-		super("Ocelot", mtOcelot, "mob.cat.hitt", "mob.cat.hitt", 0.6, 0.8)
-	{
-	}
-
-	CLASS_PROTODEF(cNewOcelot)
-} ;
-
-
-
-
diff --git a/src/Mobs/NewSilverfish.h b/src/Mobs/NewSilverfish.h
deleted file mode 100644
index 144ede242..000000000
--- a/src/Mobs/NewSilverfish.h
+++ /dev/null
@@ -1,26 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewSilverfish :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewSilverfish(void) :
-		super("Silverfish", mtSilverfish, "mob.silverfish.hit", "mob.silverfish.kill", 0.3, 0.7)
-	{
-	}
-
-	CLASS_PROTODEF(cNewSilverfish)
-} ;
-
-
-
-
diff --git a/src/Mobs/NewSnowGolem.h b/src/Mobs/NewSnowGolem.h
deleted file mode 100644
index 3305bf3c2..000000000
--- a/src/Mobs/NewSnowGolem.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewSnowGolem :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewSnowGolem(void);
-
-	CLASS_PROTODEF(cNewSnowGolem)
-	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewSpider.h b/src/Mobs/NewSpider.h
deleted file mode 100644
index f0543d1e1..000000000
--- a/src/Mobs/NewSpider.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewSpider :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewSpider(void);
-
-	CLASS_PROTODEF(cNewSpider)
-
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewSquid.h b/src/Mobs/NewSquid.h
deleted file mode 100644
index 203ff7af5..000000000
--- a/src/Mobs/NewSquid.h
+++ /dev/null
@@ -1,25 +0,0 @@
-
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewSquid :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewSquid();
-
-	CLASS_PROTODEF(cNewSquid)
-	
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/NewZombiePigman.h b/src/Mobs/NewZombiePigman.h
deleted file mode 100644
index 13a67f4b0..000000000
--- a/src/Mobs/NewZombiePigman.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "NewMonster.h"
-
-
-
-
-
-class cNewZombiePigman :
-	public cNewMonster
-{
-	typedef cNewMonster super;
-	
-public:
-	cNewZombiePigman(void);
-
-	CLASS_PROTODEF(cNewZombiePigman)
-
-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
-} ;
-
-
-
-
diff --git a/src/Mobs/Ocelot.h b/src/Mobs/Ocelot.h
new file mode 100644
index 000000000..1777b14ce
--- /dev/null
+++ b/src/Mobs/Ocelot.h
@@ -0,0 +1,26 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cOcelot :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cOcelot(void) :
+		super("Ocelot", mtOcelot, "mob.cat.hitt", "mob.cat.hitt", 0.6, 0.8)
+	{
+	}
+
+	CLASS_PROTODEF(cOcelot)
+} ;
+
+
+
+
diff --git a/src/Mobs/NewPig.cpp b/src/Mobs/Pig.cpp
index c5fbddfd0..fe0434a89 100644
--- a/src/Mobs/NewPig.cpp
+++ b/src/Mobs/Pig.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewPig.h"
+#include "Pig.h"
 #include "../Entities/Player.h"
 #include "../World.h"
 
@@ -9,7 +9,7 @@
 
 
 
-cNewPig::cNewPig(void) :
+cPig::cPig(void) :
 	super("Pig", mtPig, "mob.pig.say", "mob.pig.death", 0.9, 0.9),
 	m_bIsSaddled(false)
 {
@@ -19,7 +19,7 @@ cNewPig::cNewPig(void) :
 
 
 
-void cNewPig::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cPig::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewPig.h b/src/Mobs/Pig.h
index 2255c44c8..480acc477 100644
--- a/src/Mobs/NewPig.h
+++ b/src/Mobs/Pig.h
@@ -1,21 +1,21 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewPig :
-	public cNewMonster
+class cPig :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewPig(void);
+	cPig(void);
 
-	CLASS_PROTODEF(cNewPig)
+	CLASS_PROTODEF(cPig)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
diff --git a/src/Mobs/NewSheep.cpp b/src/Mobs/Sheep.cpp
index 78e3418e8..e370a7639 100644
--- a/src/Mobs/NewSheep.cpp
+++ b/src/Mobs/Sheep.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewSheep.h"
+#include "Sheep.h"
 #include "../BlockID.h"
 #include "../Entities/Player.h"
 #include "../World.h"
@@ -11,7 +11,7 @@
 
 
 
-cNewSheep::cNewSheep(int a_Color) :
+cSheep::cSheep(int a_Color) :
 	super("Sheep", mtSheep, "mob.sheep.say", "mob.sheep.say", 0.6, 1.3),
 	m_IsSheared(false),
 	m_WoolColor(a_Color)
@@ -33,7 +33,7 @@ cNewSheep::cNewSheep(int a_Color) :
 
 
 
-void cNewSheep::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cSheep::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	if (!m_IsSheared)
 	{
@@ -45,7 +45,7 @@ void cNewSheep::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
-NIBBLETYPE cNewSheep::GenerateNaturalRandomColor(void)
+NIBBLETYPE cSheep::GenerateNaturalRandomColor(void)
 {
 	cFastRandom Random;
 	int Chance = Random.NextInt(101);
diff --git a/src/Mobs/NewSheep.h b/src/Mobs/Sheep.h
index a4925b686..8bcfddab6 100644
--- a/src/Mobs/NewSheep.h
+++ b/src/Mobs/Sheep.h
@@ -1,16 +1,16 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewSheep :
-	public cNewMonster
+class cSheep :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
 
@@ -18,9 +18,9 @@ public:
 	Use E_META_WOOL_* constants for the wool color.
 	If you type -1, the server will generate a random color
 	with the GenerateNaturalRandomColor() function. */
-	cNewSheep(int a_Color = -1);
+	cSheep(int a_Color = -1);
 
-	CLASS_PROTODEF(cNewSheep)
+	CLASS_PROTODEF(cSheep)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
diff --git a/src/Mobs/Silverfish.h b/src/Mobs/Silverfish.h
new file mode 100644
index 000000000..1211aa06f
--- /dev/null
+++ b/src/Mobs/Silverfish.h
@@ -0,0 +1,26 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cSilverfish :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cSilverfish(void) :
+		super("Silverfish", mtSilverfish, "mob.silverfish.hit", "mob.silverfish.kill", 0.3, 0.7)
+	{
+	}
+
+	CLASS_PROTODEF(cSilverfish)
+} ;
+
+
+
+
diff --git a/src/Mobs/NewSkeleton.cpp b/src/Mobs/Skeleton.cpp
index 4c9e31e63..090f881f2 100644
--- a/src/Mobs/NewSkeleton.cpp
+++ b/src/Mobs/Skeleton.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewSkeleton.h"
+#include "Skeleton.h"
 #include "../World.h"
 #include "../Entities/ArrowEntity.h"
 #include "ClientHandle.h"
@@ -9,7 +9,7 @@
 
 
 
-cNewSkeleton::cNewSkeleton(bool IsWither) :
+cSkeleton::cSkeleton(bool IsWither) :
 	super("Skeleton", mtSkeleton, "mob.skeleton.hurt", "mob.skeleton.death", 0.6, 1.8),
 	m_bIsWither(IsWither)
 {
@@ -19,7 +19,7 @@ cNewSkeleton::cNewSkeleton(bool IsWither) :
 
 
 
-void cNewSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
@@ -47,7 +47,7 @@ void cNewSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
-void cNewSkeleton::SpawnOn(cClientHandle & a_ClientHandle)
+void cSkeleton::SpawnOn(cClientHandle & a_ClientHandle)
 {
 	super::SpawnOn(a_ClientHandle);
 	a_ClientHandle.SendEntityEquipment(*this, 0, cItem(E_ITEM_BOW));
diff --git a/src/Mobs/NewSkeleton.h b/src/Mobs/Skeleton.h
index 2355a377e..683a54705 100644
--- a/src/Mobs/NewSkeleton.h
+++ b/src/Mobs/Skeleton.h
@@ -1,21 +1,21 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewSkeleton :
-	public cNewMonster
+class cSkeleton :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewSkeleton(bool IsWither);
+	cSkeleton(bool IsWither);
 
-	CLASS_PROTODEF(cNewSkeleton)
+	CLASS_PROTODEF(cSkeleton)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;\
 	virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
diff --git a/src/Mobs/NewSlime.cpp b/src/Mobs/Slime.cpp
index 60f0021ab..c9498b036 100644
--- a/src/Mobs/NewSlime.cpp
+++ b/src/Mobs/Slime.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewSlime.h"
+#include "Slime.h"
 #include "FastRandom.h"
 #include "World.h"
 
@@ -9,7 +9,7 @@
 
 
 
-cNewSlime::cNewSlime(int a_Size) :
+cSlime::cSlime(int a_Size) :
 	super("Slime",
 		mtSlime,
 		Printf("mob.slime.%s", GetSizeName(a_Size).c_str()),
@@ -25,7 +25,7 @@ cNewSlime::cNewSlime(int a_Size) :
 
 
 
-void cNewSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
@@ -44,7 +44,7 @@ void cNewSlime::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 
 
 
-const AString cNewSlime::GetSizeName(int a_Size) const
+const AString cSlime::GetSizeName(int a_Size) const
 {
 	if (a_Size > 1)
 	{
diff --git a/src/Mobs/NewSlime.h b/src/Mobs/Slime.h
index 458879a76..e093a8109 100644
--- a/src/Mobs/NewSlime.h
+++ b/src/Mobs/Slime.h
@@ -1,22 +1,22 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewSlime :
-	public cNewMonster
+class cSlime :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
 	/** Creates a slime of the specified size; size can be 1, 2 or 4, with 1 is the smallest and 4 is the tallest. */
-	cNewSlime(int a_Size);
+	cSlime(int a_Size);
 
-	CLASS_PROTODEF(cNewSlime)
+	CLASS_PROTODEF(cSlime)
 
 	// cAggressiveMonster overrides:
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
diff --git a/src/Mobs/NewSnowGolem.cpp b/src/Mobs/SnowGolem.cpp
index c7f91b1ce..b1b0099fa 100644
--- a/src/Mobs/NewSnowGolem.cpp
+++ b/src/Mobs/SnowGolem.cpp
@@ -1,14 +1,14 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewSnowGolem.h"
+#include "SnowGolem.h"
 #include "../World.h"
 
 
 
 
 
-cNewSnowGolem::cNewSnowGolem(void) :
+cSnowGolem::cSnowGolem(void) :
 	super("SnowGolem", mtSnowGolem, "", "", 0.4, 1.8)
 {
 }
@@ -17,7 +17,7 @@ cNewSnowGolem::cNewSnowGolem(void) :
 
 
 
-void cNewSnowGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cSnowGolem::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	UNUSED(a_Killer);
 	AddRandomDropItem(a_Drops, 0, 15, E_ITEM_SNOWBALL);
diff --git a/src/Mobs/SnowGolem.h b/src/Mobs/SnowGolem.h
new file mode 100644
index 000000000..f5665b864
--- /dev/null
+++ b/src/Mobs/SnowGolem.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cSnowGolem :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cSnowGolem(void);
+
+	CLASS_PROTODEF(cSnowGolem)
+	
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewSpider.cpp b/src/Mobs/Spider.cpp
index 56d04c0ae..8b978ff6b 100644
--- a/src/Mobs/NewSpider.cpp
+++ b/src/Mobs/Spider.cpp
@@ -1,13 +1,13 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewSpider.h"
+#include "Spider.h"
 
 
 
 
 
-cNewSpider::cNewSpider(void) :
+cSpider::cSpider(void) :
 	super("Spider", mtSpider, "mob.spider.say", "mob.spider.death", 1.4, 0.9)
 {
 }
@@ -16,7 +16,7 @@ cNewSpider::cNewSpider(void) :
 
 
 
-void cNewSpider::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cSpider::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/Spider.h b/src/Mobs/Spider.h
new file mode 100644
index 000000000..2799bacc7
--- /dev/null
+++ b/src/Mobs/Spider.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cSpider :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cSpider(void);
+
+	CLASS_PROTODEF(cSpider)
+
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewSquid.cpp b/src/Mobs/Squid.cpp
index 40f4ed3c1..55939ee98 100644
--- a/src/Mobs/NewSquid.cpp
+++ b/src/Mobs/Squid.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewSquid.h"
+#include "Squid.h"
 #include "../Vector3.h"
 #include "../Chunk.h"
 
@@ -9,7 +9,7 @@
 
 
 
-cNewSquid::cNewSquid(void) :
+cSquid::cSquid(void) :
 	super("Squid", mtSquid, "", "", 0.95, 0.95)
 {
 }
@@ -18,7 +18,7 @@ cNewSquid::cNewSquid(void) :
 
 
 
-void cNewSquid::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cSquid::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	// Drops 0-3 Ink Sacs
 	int LootingLevel = 0;
diff --git a/src/Mobs/Squid.h b/src/Mobs/Squid.h
new file mode 100644
index 000000000..edae5a16c
--- /dev/null
+++ b/src/Mobs/Squid.h
@@ -0,0 +1,25 @@
+
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cSquid :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cSquid();
+
+	CLASS_PROTODEF(cSquid)
+	
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/src/Mobs/NewVillager.cpp b/src/Mobs/Villager.cpp
index 844d65b61..9e3559f08 100644
--- a/src/Mobs/NewVillager.cpp
+++ b/src/Mobs/Villager.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewVillager.h"
+#include "Villager.h"
 #include "../World.h"
 #include "../BlockArea.h"
 #include "../Blocks/BlockHandler.h"
@@ -11,7 +11,7 @@
 
 
 
-cNewVillager::cNewVillager(eVillagerType VillagerType) :
+cVillager::cVillager(eVillagerType VillagerType) :
 	super("Villager", mtVillager, "", "", 0.6, 1.8),
 	m_Type(VillagerType)
 {
diff --git a/src/Mobs/NewVillager.h b/src/Mobs/Villager.h
index fb543d90c..349eb7195 100644
--- a/src/Mobs/NewVillager.h
+++ b/src/Mobs/Villager.h
@@ -1,16 +1,16 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewVillager :
-	public cNewMonster
+class cVillager :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
 
@@ -25,9 +25,9 @@ public:
 		vtMax
 	} ;
 
-	cNewVillager(eVillagerType VillagerType);
+	cVillager(eVillagerType VillagerType);
 
-	CLASS_PROTODEF(cNewVillager)
+	CLASS_PROTODEF(cVillager)
 
 	// Get and set functions.
 	int      GetVilType(void)              const { return m_Type; }
diff --git a/src/Mobs/NewWitch.cpp b/src/Mobs/Witch.cpp
index 34036fe4b..6956f7b7a 100644
--- a/src/Mobs/NewWitch.cpp
+++ b/src/Mobs/Witch.cpp
@@ -1,13 +1,13 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewWitch.h"
+#include "Witch.h"
 
 
 
 
 
-cNewWitch::cNewWitch(void) :
+cWitch::cWitch(void) :
 	super("Witch", mtWitch, "", "", 0.6, 1.8)
 {
 }
@@ -16,7 +16,7 @@ cNewWitch::cNewWitch(void) :
 
 
 
-void cNewWitch::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cWitch::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewWitch.h b/src/Mobs/Witch.h
index 02d9cc3d0..f92db79d6 100644
--- a/src/Mobs/NewWitch.h
+++ b/src/Mobs/Witch.h
@@ -1,22 +1,22 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 #include "../MersenneTwister.h"
 
 
 
 
 
-class cNewWitch :
-	public cNewMonster
+class cWitch :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewWitch();
+	cWitch();
 
-	CLASS_PROTODEF(cNewWitch)
+	CLASS_PROTODEF(cWitch)
 
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 
diff --git a/src/Mobs/NewWither.cpp b/src/Mobs/Wither.cpp
index c4f26f1da..bda216c5b 100644
--- a/src/Mobs/NewWither.cpp
+++ b/src/Mobs/Wither.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewWither.h"
+#include "Wither.h"
 
 #include "../World.h"
 #include "../Entities/Player.h"
@@ -10,7 +10,7 @@
 
 
 
-cNewWither::cNewWither(void) :
+cWither::cWither(void) :
 	super("Wither", mtWither, "mob.wither.hurt", "mob.wither.death", 0.9, 4.0)
 {
 	SetMaxHealth(300);
@@ -20,7 +20,7 @@ cNewWither::cNewWither(void) :
 
 
 
-bool cNewWither::Initialize(cWorld & a_World)
+bool cWither::Initialize(cWorld & a_World)
 {
 	// Set health before BroadcastSpawnEntity()
 	SetHealth(GetMaxHealth() / 3);
@@ -32,7 +32,7 @@ bool cNewWither::Initialize(cWorld & a_World)
 
 
 
-void cNewWither::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cWither::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	AddRandomDropItem(a_Drops, 1, 1, E_ITEM_NETHER_STAR);
 }
diff --git a/src/Mobs/NewWither.h b/src/Mobs/Wither.h
index 399ba6866..cc327741a 100644
--- a/src/Mobs/NewWither.h
+++ b/src/Mobs/Wither.h
@@ -1,21 +1,21 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewWither :
-	public cNewMonster
+class cWither :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewWither(void);
+	cWither(void);
 
-	CLASS_PROTODEF(cNewWither)
+	CLASS_PROTODEF(cWither)
 
 	/** Returns whether the wither is invulnerable to arrows. */
 	bool IsArmored(void) const;
diff --git a/src/Mobs/NewWolf.cpp b/src/Mobs/Wolf.cpp
index 4e95bf6e8..c3ff4b2eb 100644
--- a/src/Mobs/NewWolf.cpp
+++ b/src/Mobs/Wolf.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewWolf.h"
+#include "Wolf.h"
 #include "../World.h"
 #include "../Entities/Player.h"
 #include "../Items/ItemHandler.h"
@@ -10,7 +10,7 @@
 
 
 
-cNewWolf::cNewWolf(void) :
+cWolf::cWolf(void) :
 	super("Wolf", mtWolf, "mob.wolf.hurt", "mob.wolf.death", 0.6, 0.8),
 	m_IsSitting(false),
 	m_IsBegging(false),
diff --git a/src/Mobs/NewWolf.h b/src/Mobs/Wolf.h
index 6df63d795..da8366e6f 100644
--- a/src/Mobs/NewWolf.h
+++ b/src/Mobs/Wolf.h
@@ -1,22 +1,22 @@
 
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 #include "../Entities/Entity.h"
 
 
 
 
 
-class cNewWolf :
-	public cNewMonster
+class cWolf :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewWolf(void);
+	cWolf(void);
 
-	CLASS_PROTODEF(cNewWolf)
+	CLASS_PROTODEF(cWolf)
 
 	// Get functions
 	bool    IsSitting     (void) const { return m_IsSitting; }
diff --git a/src/Mobs/NewZombie.cpp b/src/Mobs/Zombie.cpp
index d37ea22bc..f96db6942 100644
--- a/src/Mobs/NewZombie.cpp
+++ b/src/Mobs/Zombie.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewZombie.h"
+#include "Zombie.h"
 #include "../World.h"
 #include "../LineBlockTracer.h"
 
@@ -9,7 +9,7 @@
 
 
 
-cNewZombie::cNewZombie(bool a_IsVillagerZombie) :
+cZombie::cZombie(bool a_IsVillagerZombie) :
 	super("Zombie", mtZombie, "mob.zombie.hurt", "mob.zombie.death", 0.6, 1.8),
 	m_IsVillagerZombie(a_IsVillagerZombie),
 	m_IsConverting(false)
@@ -20,7 +20,7 @@ cNewZombie::cNewZombie(bool a_IsVillagerZombie) :
 
 
 
-void cNewZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/NewZombie.h b/src/Mobs/Zombie.h
index 7388711c6..e3f499c64 100644
--- a/src/Mobs/NewZombie.h
+++ b/src/Mobs/Zombie.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include "NewMonster.h"
+#include "Monster.h"
 
 
 
 
 
-class cNewZombie :
-	public cNewMonster
+class cZombie :
+	public cMonster
 {
-	typedef cNewMonster super;
+	typedef cMonster super;
 	
 public:
-	cNewZombie(bool a_IsVillagerZombie);
+	cZombie(bool a_IsVillagerZombie);
 
-	CLASS_PROTODEF(cNewZombie)
+	CLASS_PROTODEF(cZombie)
 	
 	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
 	
diff --git a/src/Mobs/NewZombiePigman.cpp b/src/Mobs/ZombiePigman.cpp
index e0a491805..a8e5ffd39 100644
--- a/src/Mobs/NewZombiePigman.cpp
+++ b/src/Mobs/ZombiePigman.cpp
@@ -1,13 +1,13 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "NewZombiePigman.h"
+#include "ZombiePigman.h"
 #include "../World.h"
 
 
 
 
 
-cNewZombiePigman::cNewZombiePigman(void) :
+cZombiePigman::cZombiePigman(void) :
 	super("ZombiePigman", mtZombiePigman, "mob.zombiepig.zpighurt", "mob.zombiepig.zpigdeath", 0.6, 1.8)
 {
 }
@@ -16,7 +16,7 @@ cNewZombiePigman::cNewZombiePigman(void) :
 
 
 
-void cNewZombiePigman::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cZombiePigman::GetDrops(cItems & a_Drops, cEntity * a_Killer)
 {
 	int LootingLevel = 0;
 	if (a_Killer != NULL)
diff --git a/src/Mobs/ZombiePigman.h b/src/Mobs/ZombiePigman.h
new file mode 100644
index 000000000..0e7d77c2d
--- /dev/null
+++ b/src/Mobs/ZombiePigman.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "Monster.h"
+
+
+
+
+
+class cZombiePigman :
+	public cMonster
+{
+	typedef cMonster super;
+	
+public:
+	cZombiePigman(void);
+
+	CLASS_PROTODEF(cZombiePigman)
+
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+