diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index 7289c5fbe33c45e0ae381c3a7827dce05e22660b..2d72aad9c7e8047b55ffc525d35570f889153e90 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -28,7 +28,7 @@
 #include "FileIO/XmlIO/Boost/BoostXmlGmlInterface.h"
 #include "FileIO/readMeshFromFile.h"
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 namespace detail
 {
diff --git a/Applications/ApplicationsLib/ProjectData.h b/Applications/ApplicationsLib/ProjectData.h
index 6850837e74983e2620b66c0568f7e9aca531e268..af31f06faf856daff43aca86cfc5a355f3b01dd9 100644
--- a/Applications/ApplicationsLib/ProjectData.h
+++ b/Applications/ApplicationsLib/ProjectData.h
@@ -15,7 +15,7 @@
 
 #include <memory>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 #include "GeoLib/GEOObjects.h"
 
diff --git a/BaseLib/ConfigTreeNew-impl.h b/BaseLib/ConfigTree-impl.h
similarity index 99%
rename from BaseLib/ConfigTreeNew-impl.h
rename to BaseLib/ConfigTree-impl.h
index 55ca2fe37afcc9eb6ac09395c9e4ec8e4200b8ae..5e83580f3a9324262491f0962692dad41b5c0fd4 100644
--- a/BaseLib/ConfigTreeNew-impl.h
+++ b/BaseLib/ConfigTree-impl.h
@@ -7,7 +7,7 @@
  *
  */
 
-#include "ConfigTreeNew.h"
+#include "ConfigTree.h"
 
 namespace BaseLib
 {
diff --git a/BaseLib/ConfigTreeNew.cpp b/BaseLib/ConfigTree.cpp
similarity index 99%
rename from BaseLib/ConfigTreeNew.cpp
rename to BaseLib/ConfigTree.cpp
index 76712ac3775789daabf2846d08b30214128d3cdf..c43f8ff73a32e90c29d17bfc1c00d36b47f4c3ec 100644
--- a/BaseLib/ConfigTreeNew.cpp
+++ b/BaseLib/ConfigTree.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <logog/include/logog.hpp>
-#include "ConfigTreeNew.h"
+#include "ConfigTree.h"
 
 // Explicitly instantiate the boost::property_tree::ptree which is a typedef to
 // the following basic_ptree.
diff --git a/BaseLib/ConfigTreeNew.h b/BaseLib/ConfigTree.h
similarity index 99%
rename from BaseLib/ConfigTreeNew.h
rename to BaseLib/ConfigTree.h
index e776b28ef7739978ecb92a556afa66dd79cba20e..728ac8a78c1c58b3f0774ec616c8aad2767fe96e 100644
--- a/BaseLib/ConfigTreeNew.h
+++ b/BaseLib/ConfigTree.h
@@ -631,7 +631,7 @@ private:
 
 }
 
-#include "ConfigTreeNew-impl.h"
+#include "ConfigTree-impl.h"
 
 
 #endif // BASELIB_CONFIGTREE_H_
diff --git a/BaseLib/ConfigTreeUtil.h b/BaseLib/ConfigTreeUtil.h
index 8fa18613ff1b6113199b09ac6ab7c37108213a54..c8b67c972d2624d13687de8ab9969d08896e20f0 100644
--- a/BaseLib/ConfigTreeUtil.h
+++ b/BaseLib/ConfigTreeUtil.h
@@ -10,7 +10,7 @@
 #ifndef BASELIB_CONFIGTREEUTIL
 #define BASELIB_CONFIGTREEUTIL
 
-#include "ConfigTreeNew.h"
+#include "ConfigTree.h"
 
 namespace BaseLib
 {
diff --git a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h
index 1a711c0c64d5d4a3321ece72c30f091dc4283d32..4fe364ea88adb7f7607a10c2094581639c171b37 100644
--- a/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h
+++ b/FileIO/XmlIO/Boost/BoostXmlGmlInterface.h
@@ -20,7 +20,7 @@
 #include <vector>
 
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "FileIO/XmlIO/XMLInterface.h"
 
 namespace GeoLib
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
index e8ebda34ad805e51f215cab331938dcc785964d9..cf975bed091c550677c3af6f1fff74c1af9a4c8d 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
@@ -11,7 +11,7 @@
 
 #include <logog/include/logog.hpp>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "EigenVector.h"
 #include "EigenMatrix.h"
 #include "EigenTools.h"
diff --git a/MathLib/LinAlg/Eigen/EigenLinearSolver.h b/MathLib/LinAlg/Eigen/EigenLinearSolver.h
index 5a6bbc56ccafd1db2cd1dce5aef1af2621cb164c..4b8d29925177053d42d2f86ee5013aefbf0b5c39 100644
--- a/MathLib/LinAlg/Eigen/EigenLinearSolver.h
+++ b/MathLib/LinAlg/Eigen/EigenLinearSolver.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "EigenVector.h"
 #include "EigenOption.h"
 
diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
index e51b6a64484e735b0b8e188059c7c6989b0144ff..a8147a30487d079f4a30de28b031ca6d8889644f 100644
--- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
+++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp
@@ -14,7 +14,7 @@
 #endif
 #include <logog/include/logog.hpp>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/Eigen/EigenMatrix.h"
 #include "MathLib/LinAlg/Eigen/EigenVector.h"
 #include "MathLib/LinAlg/Lis/LisMatrix.h"
diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h
index 03c7f24eb56f7d7e8e89bdd098649b70902b75e9..bbe710b9f86f76ac90114729269ab707ac1ab825 100644
--- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h
+++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.h
@@ -14,7 +14,7 @@
 
 #include <lis.h>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/Lis/LisOption.h"
 
 namespace MathLib
diff --git a/MathLib/LinAlg/LinearSolverOptions.h b/MathLib/LinAlg/LinearSolverOptions.h
index 33133ba5175ff6473a982a8526485e5d8e9561ea..9a3156b05c8bd890150267cb2b0ce5d96a23e4fd 100644
--- a/MathLib/LinAlg/LinearSolverOptions.h
+++ b/MathLib/LinAlg/LinearSolverOptions.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 namespace MathLib
 {
diff --git a/MathLib/LinAlg/Lis/LisLinearSolver.h b/MathLib/LinAlg/Lis/LisLinearSolver.h
index 96b65dc8c11a5060a988fe729f64db70f9e63b05..7f2db77d7d1f0da888c0fe27ea2fa575a6bb2fe0 100644
--- a/MathLib/LinAlg/Lis/LisLinearSolver.h
+++ b/MathLib/LinAlg/Lis/LisLinearSolver.h
@@ -20,7 +20,7 @@
 
 #include <lis.h>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 #include "LisOption.h"
 #include "LisVector.h"
diff --git a/MathLib/LinAlg/Lis/LisOption.h b/MathLib/LinAlg/Lis/LisOption.h
index a12d8a56a01027481d5e09885bb29b8e5562955f..74776c98bd7693e32087386dcb8bf8fec5a186d9 100644
--- a/MathLib/LinAlg/Lis/LisOption.h
+++ b/MathLib/LinAlg/Lis/LisOption.h
@@ -20,7 +20,7 @@
 
 #include <logog/include/logog.hpp>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/LinearSolverOptions.h"
 
 namespace MathLib
diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.h b/MathLib/LinAlg/PETSc/PETScLinearSolver.h
index 35010ab6e510a2503fc9f5ca5ad5544e617be633..01719de7df0c45d0450119e22ec2b88ec740bc24 100644
--- a/MathLib/LinAlg/PETSc/PETScLinearSolver.h
+++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.h
@@ -23,7 +23,7 @@
 
 #include "logog/include/logog.hpp"
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 #include "PETScMatrix.h"
 #include "PETScVector.h"
diff --git a/MathLib/LinAlg/Solvers/GaussAlgorithm.h b/MathLib/LinAlg/Solvers/GaussAlgorithm.h
index 3f52e7ed485d3916afeb41ca1f23cf68665b90c4..21b045aab2d63bcb022d5f26453659420c65770a 100644
--- a/MathLib/LinAlg/Solvers/GaussAlgorithm.h
+++ b/MathLib/LinAlg/Solvers/GaussAlgorithm.h
@@ -18,7 +18,7 @@
 #include <cstddef>
 
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "../Dense/DenseMatrix.h"
 #include "TriangularSolve.h"
 
diff --git a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp
index 63e84648b1f2419eb4847d1026d1fbbc01ab300e..999dcb23eaae48cede6f1f8b12db64f34186d901 100644
--- a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp
+++ b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.cpp
@@ -17,7 +17,7 @@
 #include <limits>
 #include <cassert>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "logog/include/logog.hpp"
 
 namespace NumLib
diff --git a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h
index ff892c927bcc750100c3646ebe1656c0011f60f5..c54ec87ce837f910ac8ea2ccdcbd725ae1f33e39 100644
--- a/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h
+++ b/NumLib/TimeStepping/Algorithms/FixedTimeStepping.h
@@ -14,7 +14,7 @@
 
 #include <vector>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "ITimeStepAlgorithm.h"
 
 namespace NumLib
diff --git a/ProcessLib/InitialCondition.cpp b/ProcessLib/InitialCondition.cpp
index 89f5e10b9cd445ae14936f97187c04f1ec791ef0..159736c54a286484fa5edecc3e65a6dd007e5582 100644
--- a/ProcessLib/InitialCondition.cpp
+++ b/ProcessLib/InitialCondition.cpp
@@ -16,7 +16,7 @@
 #include "MeshLib/Elements/Element.h"
 #include "MeshLib/Mesh.h"
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 namespace ProcessLib
 {
diff --git a/ProcessLib/InitialCondition.h b/ProcessLib/InitialCondition.h
index 850da20fa2798a1f37abcc3cc2d5dbc808512cdc..a0a82855115a7032a54ecffb858fa7b68f08cd3a 100644
--- a/ProcessLib/InitialCondition.h
+++ b/ProcessLib/InitialCondition.h
@@ -11,7 +11,7 @@
 #define PROCESS_LIB_INITIAL_CONDITION_H_
 
 #include <cassert>
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "MeshLib/Node.h"
 #include "MeshLib/PropertyVector.h"
 
diff --git a/ProcessLib/NeumannBcConfig.h b/ProcessLib/NeumannBcConfig.h
index 2ac0ef47bdb38eed02844ec2a58273a9c24fa0aa..1664b26fb0f23e3b20c82fa12f9e7cbaf2b4ed9e 100644
--- a/ProcessLib/NeumannBcConfig.h
+++ b/ProcessLib/NeumannBcConfig.h
@@ -12,7 +12,7 @@
 
 #include "logog/include/logog.hpp"
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "MathLib/ConstantFunction.h"
 #include "MeshGeoToolsLib/BoundaryElementsSearcher.h"
 #include "MeshLib/Elements/Element.h"
diff --git a/ProcessLib/Parameter.h b/ProcessLib/Parameter.h
index 9d7555c3204fbc5fb19be62c54fd1221871787eb..4a3d09753cd6b52ea7287f880b9f093784c92fc4 100644
--- a/ProcessLib/Parameter.h
+++ b/ProcessLib/Parameter.h
@@ -15,7 +15,7 @@
 #include <logog/include/logog.hpp>
 #include <boost/optional.hpp>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "MeshLib/Elements/Element.h"
 
 namespace MeshLib
diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h
index 8828b124915f5fae42329eb39b5a6d6f409e5226..ae2c5a9f490a61492d0c9d469d1984c1bc7ec968 100644
--- a/ProcessLib/Process.h
+++ b/ProcessLib/Process.h
@@ -19,7 +19,7 @@
 #include "AssemblerLib/ComputeSparsityPattern.h"
 #include "AssemblerLib/LocalToGlobalIndexMap.h"
 #include "AssemblerLib/VectorMatrixAssembler.h"
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "FileIO/VtkIO/VtuInterface.h"
 #include "MathLib/LinAlg/ApplyKnownSolution.h"
 #include "MathLib/LinAlg/SetMatrixSparsity.h"
diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp
index 51f70ee6c95c1b2bb12dc2b13c6b0424c9e189cd..d873d937d0c4ce1be9ad12a21606332c48750d91 100644
--- a/ProcessLib/ProcessVariable.cpp
+++ b/ProcessLib/ProcessVariable.cpp
@@ -14,7 +14,7 @@
 #include "GeoLib/GEOObjects.h"
 #include "MeshLib/Mesh.h"
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 namespace ProcessLib
 {
diff --git a/ProcessLib/UniformDirichletBoundaryCondition.h b/ProcessLib/UniformDirichletBoundaryCondition.h
index 3078bf2a2b4aa547a593ccf9d5694495b214bdf3..80627072198f72420be56692d51040a9860a8468 100644
--- a/ProcessLib/UniformDirichletBoundaryCondition.h
+++ b/ProcessLib/UniformDirichletBoundaryCondition.h
@@ -17,7 +17,7 @@
 
 #include "NumericsConfig.h" // for GlobalIndexType
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 #include "AssemblerLib/LocalToGlobalIndexMap.h"
 #include "MeshGeoToolsLib/MeshNodeSearcher.h"
 
diff --git a/Tests/BaseLib/TestConfigTree.cpp b/Tests/BaseLib/TestConfigTree.cpp
index 0b0e627febf81869875cc0b60b140feca8a606b0..d92e7eb411f3cea959c7b9d7551f3ad87cc8f2bc 100644
--- a/Tests/BaseLib/TestConfigTree.cpp
+++ b/Tests/BaseLib/TestConfigTree.cpp
@@ -13,7 +13,7 @@
 #include <boost/property_tree/xml_parser.hpp>
 #include <sstream>
 
-#include "BaseLib/ConfigTreeNew.h"
+#include "BaseLib/ConfigTree.h"
 
 // make useful line numbers appear in the output of gtest
 #define EXPECT_ERR_WARN(cbs, error, warning) do  { \