diff --git a/MathLib/ODE/CVodeSolver.cpp b/MathLib/ODE/CVodeSolver.cpp
index 2fd48c3d14539565c31ff7422f31d97795181c1e..a38cf686d0d8b870ea796af650fa2340f8ead991 100644
--- a/MathLib/ODE/CVodeSolver.cpp
+++ b/MathLib/ODE/CVodeSolver.cpp
@@ -61,11 +61,11 @@ namespace MathLib
 /**
  * This class provides concrete access to Sundials' CVode solver.
  *
- * OdeSolver (implicitly bounds checked, agnostic to concrete ODE solver)
+ * ODESolver (implicitly bounds checked, agnostic to concrete ODE solver)
  *  |
  *  | Dynamic polymorphism
  *  v
- * ConcreteOdeSolver (implicitly bounds checked, interfaces with a specific
+ * ConcreteODESolver (implicitly bounds checked, interfaces with a specific
  * library)
  *  |
  *  | Forward calls, disable bounds checking, no need for templates anymore
diff --git a/MathLib/ODE/CVodeSolver.h b/MathLib/ODE/CVodeSolver.h
index c36e55e0a2ff14db79b2bbc42fb6a1bb07ce1050..8c5ca3d5cf58d934916701ce50376cafad4780ae 100644
--- a/MathLib/ODE/CVodeSolver.h
+++ b/MathLib/ODE/CVodeSolver.h
@@ -12,7 +12,7 @@
 
 #include "BaseLib/ConfigTree.h"
 
-#include "OdeSolverTypes.h"
+#include "ODESolverTypes.h"
 #include "FunctionHandles.h"
 
 namespace MathLib
diff --git a/MathLib/ODE/ConcreteOdeSolver.h b/MathLib/ODE/ConcreteODESolver.h
similarity index 83%
rename from MathLib/ODE/ConcreteOdeSolver.h
rename to MathLib/ODE/ConcreteODESolver.h
index 06dad3d19c85900c77e31b729fef1157e0c35c4f..a0022dae8aee47affc8d7ab1fa4f302271c3eb3e 100644
--- a/MathLib/ODE/ConcreteOdeSolver.h
+++ b/MathLib/ODE/ConcreteODESolver.h
@@ -14,7 +14,7 @@
 
 #include "BaseLib/ConfigTree.h"
 
-#include "OdeSolver.h"
+#include "ODESolver.h"
 #include "FunctionHandles.h"
 
 #ifdef CVODE_FOUND
@@ -24,17 +24,17 @@
 namespace MathLib
 {
 template <unsigned NumEquations>
-std::unique_ptr<OdeSolver<NumEquations>> createOdeSolver(
+std::unique_ptr<ODESolver<NumEquations>> createODESolver(
     BaseLib::ConfigTree const& config);
 
 /**
  * ODE solver with a bounds-safe interface.
  *
- * This class makes contact between the abstract \c OdeSolver interface and a
+ * This class makes contact between the abstract \c ODESolver interface and a
  * certain solver \c Implementation.
  *
  * The interface of this class inherits the array bounds checking from \c
- * OdeSolver.
+ * ODESolver.
  * Its methods forward calls to the \c Implementation erasing array bounds info
  * by
  * passing \c std::array as raw pointer.
@@ -42,11 +42,11 @@ std::unique_ptr<OdeSolver<NumEquations>> createOdeSolver(
  * This way the \c Implementation does not need to be templated.
  */
 template <typename Implementation, unsigned NumEquations>
-class ConcreteOdeSolver final : public OdeSolver<NumEquations>,
+class ConcreteODESolver final : public ODESolver<NumEquations>,
                                 private Implementation
 {
 public:
-	using Interface = OdeSolver<NumEquations>;
+	using Interface = ODESolver<NumEquations>;
 	using Function = typename Interface::Function;
 	using JacobianFunction = typename Interface::JacobianFunction;
 
@@ -101,22 +101,22 @@ public:
 private:
 	/// instances of this class shall only be constructed by
 	/// the friend function listed below
-	ConcreteOdeSolver(BaseLib::ConfigTree const& config)
+	ConcreteODESolver(BaseLib::ConfigTree const& config)
 	    : Implementation{config, NumEquations}
 	{
 	}
 
-	friend std::unique_ptr<OdeSolver<NumEquations>>
-	createOdeSolver<NumEquations>(BaseLib::ConfigTree const& config);
+	friend std::unique_ptr<ODESolver<NumEquations>>
+	createODESolver<NumEquations>(BaseLib::ConfigTree const& config);
 };
 
 template <unsigned NumEquations>
-std::unique_ptr<OdeSolver<NumEquations>> createOdeSolver(
+std::unique_ptr<ODESolver<NumEquations>> createODESolver(
     BaseLib::ConfigTree const& config)
 {
 #ifdef CVODE_FOUND
-	return std::unique_ptr<OdeSolver<NumEquations>>(
-	    new ConcreteOdeSolver<CVodeSolver, NumEquations>(config));
+	return std::unique_ptr<ODESolver<NumEquations>>(
+	    new ConcreteODESolver<CVodeSolver, NumEquations>(config));
 #else
 	return nullptr;
 #endif  // CVODE_FOUND
diff --git a/MathLib/ODE/FunctionHandles.h b/MathLib/ODE/FunctionHandles.h
index 03023aeb085d9f7eff5d66ee961b4a192be29b66..26e3eee1a5942d1a0df5c2f5143805ebdabf3fe2 100644
--- a/MathLib/ODE/FunctionHandles.h
+++ b/MathLib/ODE/FunctionHandles.h
@@ -10,7 +10,7 @@
 #ifndef MATHLIB_ODE_HANDLES_H
 #define MATHLIB_ODE_HANDLES_H
 
-#include "OdeSolverTypes.h"
+#include "ODESolverTypes.h"
 
 namespace MathLib
 {
diff --git a/MathLib/ODE/OdeSolver.h b/MathLib/ODE/ODESolver.h
similarity index 95%
rename from MathLib/ODE/OdeSolver.h
rename to MathLib/ODE/ODESolver.h
index 800caa377cb632952e048a7c18e77544b176d627..fdc2b26908f1c628f3edc4879c8e28cd9a29e7e3 100644
--- a/MathLib/ODE/OdeSolver.h
+++ b/MathLib/ODE/ODESolver.h
@@ -12,7 +12,7 @@
 
 #include <array>
 
-#include "OdeSolverTypes.h"
+#include "ODESolverTypes.h"
 
 namespace MathLib
 {
@@ -24,7 +24,7 @@ namespace MathLib
  * ODE solver libraries. However, it is agnostic to the specific solver used.
  */
 template <unsigned NumEquations>
-class OdeSolver
+class ODESolver
 {
 public:
 	using Function = MathLib::Function<NumEquations>;
@@ -51,7 +51,7 @@ public:
 	virtual Eigen::Matrix<double, NumEquations, 1, Eigen::ColMajor> getYDot(
 	    const double t, const MappedConstVector<NumEquations>& y) const = 0;
 
-	virtual ~OdeSolver() = default;
+	virtual ~ODESolver() = default;
 };
 
 }  // namespace MathLib
diff --git a/MathLib/ODE/OdeSolverTypes.h b/MathLib/ODE/ODESolverTypes.h
similarity index 100%
rename from MathLib/ODE/OdeSolverTypes.h
rename to MathLib/ODE/ODESolverTypes.h