diff --git a/BaseLib/FileTools.cpp b/BaseLib/FileTools.cpp
index 22dbb223463c164eb0890d470ed4dd5dc4d41ed4..99454bea783b4634c86508ee9f04514ea59fd9c1 100644
--- a/BaseLib/FileTools.cpp
+++ b/BaseLib/FileTools.cpp
@@ -92,7 +92,7 @@ std::string extractBaseNameWithoutExtension(std::string const& pathname)
 
 std::string getSuffixFromPath(const std::string &path)
 {
-	const std::string str = getFileNameFromPath(path, true);
+	const std::string str = extractBaseName(path);
 	std::string::size_type beg(str.find_last_of('.'));
 	if (beg == std::string::npos)
 		return std::string();
diff --git a/FileIO/GMSInterface.cpp b/FileIO/GMSInterface.cpp
index 0a100dc0fb5af33992fbf19dfbc9e2264e080717..3559d4d1ba3fa16ba8788b2097eda8d9dcfcd00b 100644
--- a/FileIO/GMSInterface.cpp
+++ b/FileIO/GMSInterface.cpp
@@ -328,6 +328,6 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(std::string filename)
 	in.close();
 	std::cout << "finished" << std::endl;
 
-	std::string mesh_name (BaseLib::getFileNameFromPath(filename, false));
+	const std::string mesh_name = BaseLib::extractBaseNameWithoutExtension(filename);
 	return new MeshLib::Mesh(mesh_name, nodes, elements);
 }
diff --git a/FileIO/Legacy/MeshIO.cpp b/FileIO/Legacy/MeshIO.cpp
index 6c20b1b12cd3201fd3b99c5d5ca6216a2408e23d..ca866900e235b13a0049710a1a2eb40372e3eb11 100644
--- a/FileIO/Legacy/MeshIO.cpp
+++ b/FileIO/Legacy/MeshIO.cpp
@@ -107,7 +107,7 @@ MeshLib::Mesh* MeshIO::loadMeshFromFile(const std::string& file_name)
 		}
 
 
-		MeshLib::Mesh* mesh (new MeshLib::Mesh(BaseLib::getFileNameFromPath(file_name, false), nodes, elements));
+		MeshLib::Mesh* mesh (new MeshLib::Mesh(BaseLib::extractBaseNameWithoutExtension(file_name), nodes, elements));
 		mesh->setEdgeLengthRange(sqrt(edge_length[0]), sqrt(edge_length[1]));
 
 		std::cout << "finished." << std::endl;
diff --git a/FileIO/Legacy/OGSIOVer4.cpp b/FileIO/Legacy/OGSIOVer4.cpp
index b410427378fc26c6bd2ef56603056fb3ef3bd5d6..3f9332e415d3acfe49fad319d3b6d29bde9d37a1 100644
--- a/FileIO/Legacy/OGSIOVer4.cpp
+++ b/FileIO/Legacy/OGSIOVer4.cpp
@@ -551,7 +551,7 @@ bool readGLIFileV4(const std::string& fname, GEOObjects* geo, std::string& uniqu
 	tag = readPoints(in, pnt_vec, zero_based_idx, pnt_id_names_map);
 	std::cout << " ok, " << pnt_vec->size() << " points read" << std::endl;
 
-	unique_name = BaseLib::getFileNameFromPath(fname, true);
+	unique_name = BaseLib::extractBaseName(fname);
 	if (!pnt_vec->empty())
 		geo->addPointVec(pnt_vec, unique_name, pnt_id_names_map);  // KR: insert into GEOObjects if not empty
 
diff --git a/FileIO/MeshIO/GMSHInterface.cpp b/FileIO/MeshIO/GMSHInterface.cpp
index 3aa6e5cad64f6f15116d75367b7283d848e13b5d..9ab147541f9cb27f0ca948785da8b2f5f4a956a0 100644
--- a/FileIO/MeshIO/GMSHInterface.cpp
+++ b/FileIO/MeshIO/GMSHInterface.cpp
@@ -211,7 +211,7 @@ MeshLib::Mesh* GMSHInterface::readGMSHMesh(std::string const& fname)
 		}
 	}
 	in.close();
-	return new MeshLib::Mesh(BaseLib::getFileNameFromPath(fname, false), nodes, elements);
+	return new MeshLib::Mesh(BaseLib::extractBaseNameWithoutExtension(fname), nodes, elements);
 }
 
 void GMSHInterface::readNodeIDs(std::ifstream &in, unsigned n_nodes, std::vector<unsigned> &node_ids, std::map<unsigned, unsigned> &id_map)
diff --git a/FileIO/RapidXmlIO/RapidVtuInterface.cpp b/FileIO/RapidXmlIO/RapidVtuInterface.cpp
index 65738ea028f07a92f897c1eeadd3db15b3d11081..154452a6d8961e29ddb58edf5129af6a8f5c547c 100644
--- a/FileIO/RapidXmlIO/RapidVtuInterface.cpp
+++ b/FileIO/RapidXmlIO/RapidVtuInterface.cpp
@@ -178,7 +178,7 @@ MeshLib::Mesh* RapidVtuInterface::readVTUFile(const std::string &file_name)
 			std::cout << "Nr. Nodes: " << nodes.size() << std::endl;
 			std::cout << "Nr. Elements: " << elements.size() << std::endl;
 			delete [] buffer;
-			return new MeshLib::Mesh(BaseLib::getFileNameFromPath(file_name, false), nodes, elements);
+			return new MeshLib::Mesh(BaseLib::extractBaseNameWithoutExtension(file_name), nodes, elements);
 		}
 		else {
 			std::cout << "Error in RapidVtuInterface::readVTUFile() - Number of nodes and elements not specified." << std::endl;
diff --git a/Utils/FileConverter/generateMatPropsFromMatID.cpp b/Utils/FileConverter/generateMatPropsFromMatID.cpp
index 9a9aec192ef8223a0781d739389fecd71f8c285b..d5b475f37bb5b2b1d0f8eefe2df3657ca7cd3cba 100644
--- a/Utils/FileConverter/generateMatPropsFromMatID.cpp
+++ b/Utils/FileConverter/generateMatPropsFromMatID.cpp
@@ -28,7 +28,7 @@ int main (int argc, char* argv[])
 
 	// create file
 	std::string filename(argv[1]);
-	std::string name(BaseLib::getFileNameFromPath(filename, false));
+	std::string name = BaseLib::extractBaseNameWithoutExtension(filename);
 
 	std::string new_matname(name + "_prop");
 	std::ofstream out_prop( new_matname.c_str(), std::ios::out );