diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp
index c1fd34e4cb3776b3d4d32ee9dcd34785ac2baea8..19accd45c5b52443684ea235ea103a21c102a4c6 100644
--- a/Applications/DataExplorer/mainwindow.cpp
+++ b/Applications/DataExplorer/mainwindow.cpp
@@ -821,7 +821,7 @@ void MainWindow::mapGeometry(const std::string &geo_name)
 		settings.setValue("lastOpenedFileDirectory", dir.absolutePath());
 	}
 
-	GeoMapper geo_mapper(*_project.getGEOObjects(), geo_name);
+	MeshGeoToolsLib::GeoMapper geo_mapper(*_project.getGEOObjects(), geo_name);
 	QFileInfo fi(file_name);
 	if (choice == 1) // load raster from file
 	{
diff --git a/MeshGeoToolsLib/GeoMapper.cpp b/MeshGeoToolsLib/GeoMapper.cpp
index 9a50b71337f39718174d506f1aab63d06c8cc7f0..4a6131b00561a1d1076d430e33b82cbd7bd3f710 100644
--- a/MeshGeoToolsLib/GeoMapper.cpp
+++ b/MeshGeoToolsLib/GeoMapper.cpp
@@ -34,6 +34,8 @@
 #include "MeshLib/MeshSurfaceExtraction.h"
 #include "MeshLib/MeshEditing/projectMeshOntoPlane.h"
 
+namespace MeshGeoToolsLib {
+
 GeoMapper::GeoMapper(GeoLib::GEOObjects &geo_objects, const std::string &geo_name)
 	: _geo_objects(geo_objects), _geo_name(const_cast<std::string&>(geo_name)), _mesh(nullptr), _grid(nullptr), _raster(nullptr)
 {
@@ -366,8 +368,5 @@ double GeoMapper::getMaxSegmentLength(const std::vector<GeoLib::Polyline*> &line
 	return max_segment_length;
 }
 
-
-
-
-
+} // end namespace MeshGeoToolsLib
 
diff --git a/MeshGeoToolsLib/GeoMapper.h b/MeshGeoToolsLib/GeoMapper.h
index 14bd26c44977600009973ba84cacf67bda16f83d..bda12e778539b4a9c658708166c5fec8305cb738 100644
--- a/MeshGeoToolsLib/GeoMapper.h
+++ b/MeshGeoToolsLib/GeoMapper.h
@@ -34,6 +34,8 @@ namespace GeoLib {
 	class Raster;
 }
 
+namespace MeshGeoToolsLib {
+
 /**
  * \brief A set of tools for mapping the elevation of geometric objects
  */
@@ -89,7 +91,8 @@ private:
 
 	/// only necessary for mapping on DEM
 	GeoLib::Raster *_raster;
-
 };
 
+} // end namespace MeshGeoToolsLib
+
 #endif //GEOMAPPER_H