diff --git a/AMDiS/CMakeLists.txt b/AMDiS/CMakeLists.txt
index aefb08e6219e86b846d19c71a56291783eda22c4..dd38f8a684ba6bd201165ca8140af47156bc5743 100644
--- a/AMDiS/CMakeLists.txt
+++ b/AMDiS/CMakeLists.txt
@@ -225,12 +225,12 @@ if(ENABLE_PARALLEL_DOMAIN)
                	${SOURCE_DIR}/parallel/DofComm.cc
 		${SOURCE_DIR}/parallel/CheckerPartitioner.cc
 		${SOURCE_DIR}/parallel/ElementObjectDatabase.cc
-		${SOURCE_DIR}/parallel/FeSpaceMapping.cc
 		${SOURCE_DIR}/parallel/MeshDistributor.cc 
 		${SOURCE_DIR}/parallel/MeshManipulation.cc
 		${SOURCE_DIR}/parallel/MeshPartitioner.cc
 		${SOURCE_DIR}/parallel/MpiHelper.cc
 		${SOURCE_DIR}/parallel/ParallelDebug.cc
+		${SOURCE_DIR}/parallel/ParallelDofMapping.cc
 		${SOURCE_DIR}/parallel/ParallelProblemStatBase.cc
 		${SOURCE_DIR}/parallel/PeriodicMap.cc
                 ${SOURCE_DIR}/parallel/ParMetisPartitioner.cc
diff --git a/AMDiS/src/parallel/FeSpaceMapping.cc b/AMDiS/src/parallel/ParallelDofMapping.cc
similarity index 99%
rename from AMDiS/src/parallel/FeSpaceMapping.cc
rename to AMDiS/src/parallel/ParallelDofMapping.cc
index 7daa9ef39a905ffc2913d6d354a4d564106ee287..2c58ad1e42d2753abb3ff29340ebac6a5ed4769a 100644
--- a/AMDiS/src/parallel/FeSpaceMapping.cc
+++ b/AMDiS/src/parallel/ParallelDofMapping.cc
@@ -10,7 +10,7 @@
 // See also license.opensource.txt in the distribution.
 
 
-#include "parallel/FeSpaceMapping.h"
+#include "parallel/ParallelDofMapping.h"
 #include "parallel/StdMpi.h"
 
 namespace AMDiS {
diff --git a/AMDiS/src/parallel/FeSpaceMapping.h b/AMDiS/src/parallel/ParallelDofMapping.h
similarity index 100%
rename from AMDiS/src/parallel/FeSpaceMapping.h
rename to AMDiS/src/parallel/ParallelDofMapping.h
diff --git a/AMDiS/src/parallel/PetscSolverFeti.h b/AMDiS/src/parallel/PetscSolverFeti.h
index 1855eabd1bca8511d608ece7dee2eb45e3892744..580f3ba085493e9030efd7f3406fff0537466465 100644
--- a/AMDiS/src/parallel/PetscSolverFeti.h
+++ b/AMDiS/src/parallel/PetscSolverFeti.h
@@ -21,10 +21,10 @@
 /** \file PetscSolverFeti.h */
 
 #include <map>
-#include "parallel/FeSpaceMapping.h"
 #include "parallel/MpiHelper.h"
 #include "parallel/PetscSolver.h"
 #include "parallel/PetscSolverFetiStructs.h"
+#include "parallel/ParallelDofMapping.h"
 #include "parallel/ParallelTypes.h"
 
 #ifndef AMDIS_PETSC_SOLVER_FETI_H
diff --git a/AMDiS/src/parallel/PetscSolverGlobalMatrix.h b/AMDiS/src/parallel/PetscSolverGlobalMatrix.h
index ed2abcf95b3ca316ca9f866a2b555c09c3a5fef2..e9a4d036971194fe078f5c50de68cb1d741df788 100644
--- a/AMDiS/src/parallel/PetscSolverGlobalMatrix.h
+++ b/AMDiS/src/parallel/PetscSolverGlobalMatrix.h
@@ -26,7 +26,6 @@
 #include <boost/tuple/tuple.hpp>
 #include "AMDiS_fwd.h"
 #include "parallel/PetscSolver.h"
-#include "parallel/FeSpaceMapping.h"
 
 namespace AMDiS {