diff --git a/amdis/LinearAlgebra.hpp b/amdis/LinearAlgebra.hpp
index 076f650c73101de728c48b343b7240a39af13efe..07dd3b31884b2b6e397292495c8e64d5910cc486 100644
--- a/amdis/LinearAlgebra.hpp
+++ b/amdis/LinearAlgebra.hpp
@@ -33,9 +33,9 @@
 #elif AMDIS_BACKEND == AMDIS_BACKEND_ISTL
 
 #include <amdis/linearalgebra/istl/Constraints.hpp>
+#include <amdis/linearalgebra/istl/DefaultPreconditioners.hpp>
+#include <amdis/linearalgebra/istl/DefaultSolvers.hpp>
 #include <amdis/linearalgebra/istl/LinearSolver.hpp>
-#include <amdis/linearalgebra/istl/Preconditioners.hpp>
-#include <amdis/linearalgebra/istl/Solvers.hpp>
 #include <amdis/linearalgebra/istl/Traits.hpp>
 #include <amdis/linearalgebra/istl/MatrixBackend.hpp>
 #include <amdis/linearalgebra/istl/VectorBackend.hpp>
diff --git a/amdis/linearalgebra/istl/CMakeLists.txt b/amdis/linearalgebra/istl/CMakeLists.txt
index a86762ffd2dd399cd3fbd56f3e68449434167ee5..316fb40e8aae448eefc869eb5ce46fd1739a8387 100644
--- a/amdis/linearalgebra/istl/CMakeLists.txt
+++ b/amdis/linearalgebra/istl/CMakeLists.txt
@@ -1,6 +1,6 @@
 target_sources(amdis PRIVATE
-    Preconditioners.cpp
-    Solvers.cpp)
+    DefaultPreconditioners.cpp
+    DefaultSolvers.cpp)
 
 install(FILES
     AMGPrecon.hpp
@@ -8,14 +8,14 @@ install(FILES
     Communication.inc.hpp
     Constraints.hpp
     Creators.hpp
+    DefaultPreconditioners.hpp
+    DefaultSolvers.hpp
     ISTLPreconCreator.hpp
     ISTLSolverCreator.hpp
     LinearSolver.hpp
     MatrixBackend.hpp
     Operations.hpp
-    Preconditioners.hpp
     PreconWrapper.hpp
-    Solvers.hpp
     SolverWrapper.hpp
     Traits.hpp
     VectorBackend.hpp
diff --git a/amdis/linearalgebra/istl/Preconditioners.cpp b/amdis/linearalgebra/istl/DefaultPreconditioners.cpp
similarity index 73%
rename from amdis/linearalgebra/istl/Preconditioners.cpp
rename to amdis/linearalgebra/istl/DefaultPreconditioners.cpp
index 48aee837ab5f9dc743f7e5f0102db86145d74b3c..87b08e5e76b101e3084d1c61e254c6136b25a35d 100644
--- a/amdis/linearalgebra/istl/Preconditioners.cpp
+++ b/amdis/linearalgebra/istl/DefaultPreconditioners.cpp
@@ -1,7 +1,7 @@
 #include <config.h>
 
-#include "Preconditioners.hpp"
-#include "Solvers.hpp"
+#include "DefaultPreconditioners.hpp"
+#include "DefaultSolvers.hpp"
 
 namespace AMDiS
 {
diff --git a/amdis/linearalgebra/istl/Preconditioners.hpp b/amdis/linearalgebra/istl/DefaultPreconditioners.hpp
similarity index 100%
rename from amdis/linearalgebra/istl/Preconditioners.hpp
rename to amdis/linearalgebra/istl/DefaultPreconditioners.hpp
diff --git a/amdis/linearalgebra/istl/Solvers.cpp b/amdis/linearalgebra/istl/DefaultSolvers.cpp
similarity index 72%
rename from amdis/linearalgebra/istl/Solvers.cpp
rename to amdis/linearalgebra/istl/DefaultSolvers.cpp
index 7804e4532bfdd6f4b8a889a32c51a72d69b7ae9d..93b31dd7db944665e1dd2204d1b4c6f923c88ae1 100644
--- a/amdis/linearalgebra/istl/Solvers.cpp
+++ b/amdis/linearalgebra/istl/DefaultSolvers.cpp
@@ -1,7 +1,7 @@
 #include <config.h>
 
-#include "Preconditioners.hpp"
-#include "Solvers.hpp"
+#include "DefaultPreconditioners.hpp"
+#include "DefaultSolvers.hpp"
 
 namespace AMDiS
 {
diff --git a/amdis/linearalgebra/istl/Solvers.hpp b/amdis/linearalgebra/istl/DefaultSolvers.hpp
similarity index 100%
rename from amdis/linearalgebra/istl/Solvers.hpp
rename to amdis/linearalgebra/istl/DefaultSolvers.hpp
diff --git a/amdis/linearalgebra/istl/LinearSolver.hpp b/amdis/linearalgebra/istl/LinearSolver.hpp
index 54a7b6c916ce757c3b0a8c8fe068be3c70361e52..fb8ef6f8e642f87bceaed86caeec36fe5f70513d 100644
--- a/amdis/linearalgebra/istl/LinearSolver.hpp
+++ b/amdis/linearalgebra/istl/LinearSolver.hpp
@@ -3,9 +3,9 @@
 #include <dune/istl/solver.hh>
 
 #include <amdis/linearalgebra/LinearSolverInterface.hpp>
+#include <amdis/linearalgebra/istl/DefaultPreconditioners.hpp>
+#include <amdis/linearalgebra/istl/DefaultSolvers.hpp>
 #include <amdis/linearalgebra/istl/ISTLSolverCreator.hpp>
-#include <amdis/linearalgebra/istl/Preconditioners.hpp>
-#include <amdis/linearalgebra/istl/Solvers.hpp>
 #include <amdis/linearalgebra/istl/Traits.hpp>
 
 namespace AMDiS