diff --git a/src/game/AuctionHouseBot.h b/src/game/AuctionHouseBot.h
index afb3e15e96..0d45adb415 100644
--- a/src/game/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot.h
@@ -3,7 +3,7 @@
 #include "Common.h"
 #include "Log.h"
 #include "Config/ConfigEnv.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
 #define AHB_GREY        0
 #define AHB_WHITE       1
 #define AHB_GREEN       2
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 b9bafdf0eb..cb72862c2c 100644
--- a/src/game/AuctionHouse.cpp
+++ b/src/game/AuctionHouseHandler.cpp
@@ -26,7 +26,7 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "UpdateMask.h"
-#include "AuctionHouseObject.h"
+#include "AuctionHouseMgr.h"
 #include "Util.h"
 #include "AuctionHouseBot.h"
 
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 6107a75f20..2a8bfd2392 100644
--- a/src/game/Makefile.am
+++ b/src/game/Makefile.am
@@ -42,8 +42,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 99cd9a5d57..dd26e7fb37 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -34,7 +34,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/src/game/PlayerDump.h b/src/game/PlayerDump.h
index 365406beed..206045a1be 100644
--- a/src/game/PlayerDump.h
+++ b/src/game/PlayerDump.h
@@ -34,7 +34,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 04c5679b16..fef56d9493 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">
@@ -590,7 +590,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 46911487f8..72e0a05d16 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
@@ -926,7 +926,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 9018633600..bbfbe10d6b 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
@@ -919,7 +919,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\game\AuctionHouseObject.h"
+				RelativePath="..\..\src\game\AuctionHouseMgr.h"
 				>
 			</File>
 			<File