diff --git a/Applications/Utils/FileConverter/TIN2VTK.cpp b/Applications/Utils/FileConverter/TIN2VTK.cpp
index e63ed04f578055ea6a25dad172909af008ba0545..9106f78bc1de0829204d190be1c922e09a0c0080 100644
--- a/Applications/Utils/FileConverter/TIN2VTK.cpp
+++ b/Applications/Utils/FileConverter/TIN2VTK.cpp
@@ -59,7 +59,8 @@ int main (int argc, char* argv[])
 	auto pnt_vec = std::unique_ptr<std::vector<GeoLib::Point*>>(
 	    new std::vector<GeoLib::Point*>);
 	GeoLib::PointVec point_vec("SurfacePoints", std::move(pnt_vec));
-	std::unique_ptr<GeoLib::Surface> sfc(FileIO::TINInterface::readTIN(tinFileName, point_vec));
+	std::unique_ptr<GeoLib::Surface> sfc(
+	    GeoLib::IO::TINInterface::readTIN(tinFileName, point_vec));
 	if (!sfc)
 		return 1;
 	INFO("TIN read:  %d points, %d triangles", pnt_vec->size(), sfc->getNTriangles());
diff --git a/Applications/Utils/FileConverter/VTK2TIN.cpp b/Applications/Utils/FileConverter/VTK2TIN.cpp
index a766be69b280514cb8d165a38454de09f3255326..e716699991062bb21da473f48dd7b8f2b0478a9d 100644
--- a/Applications/Utils/FileConverter/VTK2TIN.cpp
+++ b/Applications/Utils/FileConverter/VTK2TIN.cpp
@@ -61,7 +61,9 @@ int main (int argc, char* argv[])
 	GeoLib::GEOObjects geo_objects;
 	if (MeshLib::convertMeshToGeo(*mesh, geo_objects)) {
 		INFO("Writing TIN into the file");
-		FileIO::TINInterface::writeSurfaceAsTIN(*(*geo_objects.getSurfaceVec(mesh->getName()))[0], mesh_out.getValue());
+		GeoLib::IO::TINInterface::writeSurfaceAsTIN(
+		    *(*geo_objects.getSurfaceVec(mesh->getName()))[0],
+		    mesh_out.getValue());
 	}
 
 	delete custom_format;
diff --git a/GeoLib/IO/Legacy/OGSIOVer4.cpp b/GeoLib/IO/Legacy/OGSIOVer4.cpp
index cec74bfe9292f57ed6b9f64ef3785a438134e58c..bcdbbfb69d246ce0e0e3d69c85101fb84705767d 100644
--- a/GeoLib/IO/Legacy/OGSIOVer4.cpp
+++ b/GeoLib/IO/Legacy/OGSIOVer4.cpp
@@ -311,7 +311,7 @@ std::string readSurface(std::istream &in,
 		{
 			in >> line; // read value (file name)
 			line = path + line;
-			sfc = FileIO::TINInterface::readTIN(line, pnt_vec, &errors);
+			sfc = GeoLib::IO::TINInterface::readTIN(line, pnt_vec, &errors);
 		}
 		//....................................................................
 		if (line.find("$MAT_GROUP") != std::string::npos) // subkeyword found
@@ -541,7 +541,7 @@ std::size_t writeTINSurfaces(std::ofstream &os, GeoLib::SurfaceVec const* sfcs_v
 		os << "\t\t" << sfc_name << "\n";
 		// create tin file
 		sfc_name = path + sfc_name;
-		FileIO::TINInterface::writeSurfaceAsTIN(*(*sfcs)[k], sfc_name.c_str());
+		GeoLib::IO::TINInterface::writeSurfaceAsTIN(*(*sfcs)[k], sfc_name.c_str());
 		sfc_count++;
 	}
 	return sfc_count;
diff --git a/GeoLib/IO/TINInterface.cpp b/GeoLib/IO/TINInterface.cpp
index 9d93d0fcae791de53eddab2bbdb365e28b680034..e47f94d296445574fdfff3af480905222389965e 100644
--- a/GeoLib/IO/TINInterface.cpp
+++ b/GeoLib/IO/TINInterface.cpp
@@ -20,7 +20,9 @@
 #include "GeoLib/Surface.h"
 #include "GeoLib/Triangle.h"
 
-namespace FileIO
+namespace GeoLib
+{
+namespace IO
 {
 
 GeoLib::Surface* TINInterface::readTIN(std::string const& fname,
@@ -139,5 +141,5 @@ void TINInterface::writeSurfaceAsTIN(GeoLib::Surface const& surface, std::string
 	}
 	os.close();
 }
-
+} // end namespace IO
 } // end namespace GeoLib
diff --git a/GeoLib/IO/TINInterface.h b/GeoLib/IO/TINInterface.h
index 41822205e13e70f9625d04007155f25c236f9940..a64d9740e6677aeb343fd2150e753a7f148a19a5 100644
--- a/GeoLib/IO/TINInterface.h
+++ b/GeoLib/IO/TINInterface.h
@@ -18,9 +18,8 @@
 namespace GeoLib
 {
 class Surface;
-}
 
-namespace FileIO
+namespace IO
 {
 
 /**
@@ -48,6 +47,7 @@ public:
 	static void writeSurfaceAsTIN(GeoLib::Surface const& surface, std::string const& file_name);
 };
 
-}
+} // end namespace IO
+} // end namespace GeoLib
 
 #endif /* TININTERFACE_H_ */