diff --git a/src/game/AuctionHouse.cpp b/src/game/AuctionHouseHandler.cpp
similarity index 99%
rename from src/game/AuctionHouse.cpp
rename to src/game/AuctionHouseHandler.cpp
index 189121d70..86573c4df 100644
--- a/src/game/AuctionHouse.cpp
+++ b/src/game/AuctionHouseHandler.cpp
@@ -24,7 +24,7 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "UpdateMask.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
 #include "Util.h"
 
 //please DO NOT use iterator++, because it is slower than ++iterator!!!
diff --git a/src/game/AuctionHouseObject.h b/src/game/AuctionHouseMgr.h
similarity index 100%
rename from src/game/AuctionHouseObject.h
rename to src/game/AuctionHouseMgr.h
diff --git a/src/game/Makefile.am b/src/game/Makefile.am
index d3d2e7839..109df2a54 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -40,8 +40,8 @@ libmangosgame_a_SOURCES = \
     ArenaTeam.cpp \
     ArenaTeam.h \
     ArenaTeamHandler.cpp \
-    AuctionHouse.cpp \
-    AuctionHouseObject.h \
+    AuctionHouseHandler.cpp \
+    AuctionHouseMgr.h \
     Bag.cpp \
     Bag.h \
     BattleGround.cpp \
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index 319ce825c..d9e0f29fc 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -32,7 +32,7 @@
 #include "ItemPrototype.h"
 #include "NPCHandler.h"
 #include "Database/DatabaseEnv.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
 #include "Mail.h"
 #include "Map.h"
 #include "ObjectAccessor.h"
diff --git a/win/VC71/game.vcproj b/win/VC71/game.vcproj
index 78764d30f..75c217bc4 100644
--- a/win/VC71/game.vcproj
+++ b/win/VC71/game.vcproj
@@ -153,7 +153,7 @@
 				RelativePath="..\..\src\game\ArenaTeamHandler.cpp">
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouse.cpp">
+				RelativePath="..\..\src\game\AuctionHouseHandler.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\game\BattleGround.cpp">
@@ -504,7 +504,7 @@
 				RelativePath="..\..\src\game\ArenaTeam.h">
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouseObject.h">
+				RelativePath="..\..\src\game\AuctionHouseMgr.h">
 			</File>
 			<File
 				RelativePath="..\..\src\game\Bag.cpp">
diff --git a/win/VC80/game.vcproj b/win/VC80/game.vcproj
index 0102369f0..8ccb80921 100644
--- a/win/VC80/game.vcproj
+++ b/win/VC80/game.vcproj
@@ -375,7 +375,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouse.cpp"
+				RelativePath="..\..\src\game\AuctionHouseHandler.cpp"
 				>
 			</File>
 			<File
@@ -843,7 +843,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouseObject.h"
+				RelativePath="..\..\src\game\AuctionHouseMgr.h"
 				>
 			</File>
 			<File
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index 37cf9c487..091f33a22 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -377,7 +377,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouse.cpp"
+				RelativePath="..\..\src\game\AuctionHouseHandler.cpp"
 				>
 			</File>
 			<File
@@ -845,7 +845,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouseObject.h"
+				RelativePath="..\..\src\game\AuctionHouseMgr.h"
 				>
 			</File>
 			<File