diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index b7d1f5580..d8a3b38dc 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -46,15 +46,15 @@ set(client_SRCS
 	mainmenu/CPrologEpilogVideo.cpp
 	mainmenu/CreditsScreen.cpp
 
-	mapRenderer/MapRenderer.cpp
-	mapRenderer/MapRendererContext.cpp
-	mapRenderer/MapRendererContextState.cpp
-	mapRenderer/MapView.cpp
-	mapRenderer/MapViewActions.cpp
-	mapRenderer/MapViewCache.cpp
-	mapRenderer/MapViewController.cpp
-	mapRenderer/MapViewModel.cpp
-	mapRenderer/mapHandler.cpp
+	mapView/MapRenderer.cpp
+	mapView/MapRendererContext.cpp
+	mapView/MapRendererContextState.cpp
+	mapView/MapView.cpp
+	mapView/MapViewActions.cpp
+	mapView/MapViewCache.cpp
+	mapView/MapViewController.cpp
+	mapView/MapViewModel.cpp
+	mapView/mapHandler.cpp
 
 	render/CAnimation.cpp
 	render/CBitmapHandler.cpp
@@ -167,17 +167,17 @@ set(client_HEADERS
 	mainmenu/CPrologEpilogVideo.h
 	mainmenu/CreditsScreen.h
 
-	mapRenderer/IMapRendererContext.h
-	mapRenderer/IMapRendererObserver.h
-	mapRenderer/MapRenderer.h
-	mapRenderer/MapRendererContext.h
-	mapRenderer/MapRendererContextState.h
-	mapRenderer/MapView.h
-	mapRenderer/MapViewActions.h
-	mapRenderer/MapViewCache.h
-	mapRenderer/MapViewController.h
-	mapRenderer/MapViewModel.h
-	mapRenderer/mapHandler.h
+	mapView/IMapRendererContext.h
+	mapView/IMapRendererObserver.h
+	mapView/MapRenderer.h
+	mapView/MapRendererContext.h
+	mapView/MapRendererContextState.h
+	mapView/MapView.h
+	mapView/MapViewActions.h
+	mapView/MapViewCache.h
+	mapView/MapViewController.h
+	mapView/MapViewModel.h
+	mapView/mapHandler.h
 
 	render/CAnimation.h
 	render/CBitmapHandler.h
diff --git a/client/CPlayerInterface.cpp b/client/CPlayerInterface.cpp
index 7dee70b3a..0329db0dc 100644
--- a/client/CPlayerInterface.cpp
+++ b/client/CPlayerInterface.cpp
@@ -12,7 +12,7 @@
 #include <vcmi/Artifact.h>
 
 #include "adventureMap/CAdvMapInt.h"
-#include "mapRenderer/mapHandler.h"
+#include "mapView/mapHandler.h"
 #include "adventureMap/CList.h"
 #include "adventureMap/CInfoBar.h"
 #include "adventureMap/CMinimap.h"
diff --git a/client/Client.cpp b/client/Client.cpp
index ba16f5738..168b1d24b 100644
--- a/client/Client.cpp
+++ b/client/Client.cpp
@@ -14,7 +14,7 @@
 #include "../lib/mapping/CCampaignHandler.h"
 #include "../CCallback.h"
 #include "adventureMap/CAdvMapInt.h"
-#include "mapRenderer/mapHandler.h"
+#include "mapView/mapHandler.h"
 #include "../lib/CConsoleHandler.h"
 #include "CGameInfo.h"
 #include "../lib/CGameState.h"
diff --git a/client/NetPacksClient.cpp b/client/NetPacksClient.cpp
index 2342224c0..d41ca125f 100644
--- a/client/NetPacksClient.cpp
+++ b/client/NetPacksClient.cpp
@@ -14,7 +14,7 @@
 #include "CPlayerInterface.h"
 #include "CGameInfo.h"
 #include "windows/GUIClasses.h"
-#include "mapRenderer/mapHandler.h"
+#include "mapView/mapHandler.h"
 #include "adventureMap/CInGameConsole.h"
 #include "battle/BattleInterface.h"
 #include "gui/CGuiHandler.h"
diff --git a/client/adventureMap/CAdvMapInt.cpp b/client/adventureMap/CAdvMapInt.cpp
index 2acfcd30a..eeaa6ee10 100644
--- a/client/adventureMap/CAdvMapInt.cpp
+++ b/client/adventureMap/CAdvMapInt.cpp
@@ -18,10 +18,8 @@
 #include "CList.h"
 #include "CInfoBar.h"
 
-#include "../mapRenderer/mapHandler.h"
-#include "../mapRenderer/MapView.h"
-#include "../mapRenderer/MapViewModel.h"
-#include "../mapRenderer/MapViewController.h"
+#include "../mapView/mapHandler.h"
+#include "../mapView/MapView.h"
 #include "../windows/CKingdomInterface.h"
 #include "../windows/CSpellWindow.h"
 #include "../windows/CTradeWindow.h"
diff --git a/client/mapView/mapHandler.cpp b/client/mapView/mapHandler.cpp
index aeeea9438..acb6e6f39 100644
--- a/client/mapView/mapHandler.cpp
+++ b/client/mapView/mapHandler.cpp
@@ -82,7 +82,7 @@ bool CMapHandler::compareObjectBlitOrder(const CGObjectInstance * a, const CGObj
 		if(a->appearance->printPriority != b->appearance->printPriority)
 			return a->appearance->printPriority > b->appearance->printPriority;
 
-		//Two background objects will be placed beased on their placement order on map
+		//Two background objects will be placed based on their placement order on map
 		return a->id < b->id;
 	}
 
diff --git a/client/windows/CPuzzleWindow.cpp b/client/windows/CPuzzleWindow.cpp
index 954e192d3..36e16e2c7 100644
--- a/client/windows/CPuzzleWindow.cpp
+++ b/client/windows/CPuzzleWindow.cpp
@@ -16,7 +16,7 @@
 #include "../adventureMap/CResDataBar.h"
 #include "../gui/CGuiHandler.h"
 #include "../gui/TextAlignment.h"
-#include "../mapRenderer/MapView.h"
+#include "../mapView/MapView.h"
 #include "../widgets/Buttons.h"
 #include "../widgets/Images.h"
 #include "../widgets/TextControls.h"