diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f18ad7..7ac6a06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -186,12 +186,12 @@ set(ONDSEL_EXPORT
         OndselSolver/LinearMultiStepMethod.cpp
         OndselSolver/LineInPlaneJoint.cpp
         OndselSolver/MarkerFrame.cpp
-        OndselSolver/Math.cpp
         OndselSolver/MatrixDecomposition.cpp
         OndselSolver/MatrixGaussElimination.cpp
         OndselSolver/MatrixLDU.cpp
         OndselSolver/MatrixSolver.cpp
         OndselSolver/MaximumIterationError.cpp
+        OndselSolver/MbdMath.cpp
         OndselSolver/NewtonRaphson.cpp
         OndselSolver/NewtonRaphsonError.cpp
         OndselSolver/NoRotationJoint.cpp
diff --git a/OndselSolver/Math.cpp b/OndselSolver/MbdMath.cpp
similarity index 96%
rename from OndselSolver/Math.cpp
rename to OndselSolver/MbdMath.cpp
index 057125b..993d98c 100644
--- a/OndselSolver/Math.cpp
+++ b/OndselSolver/MbdMath.cpp
@@ -6,4 +6,4 @@
  *   See LICENSE file for details about copyright.                         *
  ***************************************************************************/
  
-#include "Math.h"
+#include "MbdMath.h"
diff --git a/OndselSolver/Math.h b/OndselSolver/MbdMath.h
similarity index 97%
rename from OndselSolver/Math.h
rename to OndselSolver/MbdMath.h
index 0092758..fe2abce 100644
--- a/OndselSolver/Math.h
+++ b/OndselSolver/MbdMath.h
@@ -9,7 +9,7 @@
 #pragma once
 
 namespace MbD {
-	class Math
+	class MbdMath
 	{
 	};
 }
diff --git a/OndselSolver/Numeric.h b/OndselSolver/Numeric.h
index c1c4307..5f5686d 100644
--- a/OndselSolver/Numeric.h
+++ b/OndselSolver/Numeric.h
@@ -9,10 +9,10 @@
 #pragma once
 #include <vector>
 
-#include "Math.h"
+#include "MbdMath.h"
 
 namespace MbD {
-    class Numeric : public Math
+    class Numeric : public MbdMath
     {
         //
     public:
diff --git a/OndselSolver/OndselSolver.vcxproj b/OndselSolver/OndselSolver.vcxproj
index 0f24eca..7acc593 100644
--- a/OndselSolver/OndselSolver.vcxproj
+++ b/OndselSolver/OndselSolver.vcxproj
@@ -332,12 +332,12 @@
     <ClCompile Include="LinearMultiStepMethod.cpp" />
     <ClCompile Include="LineInPlaneJoint.cpp" />
     <ClCompile Include="MarkerFrame.cpp" />
-    <ClCompile Include="Math.cpp" />
     <ClCompile Include="MatrixDecomposition.cpp" />
     <ClCompile Include="MatrixGaussElimination.cpp" />
     <ClCompile Include="MatrixLDU.cpp" />
     <ClCompile Include="MatrixSolver.cpp" />
     <ClCompile Include="MaximumIterationError.cpp" />
+    <ClCompile Include="MbdMath.cpp" />
     <ClCompile Include="NewtonRaphson.cpp" />
     <ClCompile Include="NewtonRaphsonError.cpp" />
     <ClCompile Include="NoRotationJoint.cpp" />
@@ -619,12 +619,12 @@
     <ClInclude Include="LinearMultiStepMethod.h" />
     <ClInclude Include="LineInPlaneJoint.h" />
     <ClInclude Include="MarkerFrame.h" />
-    <ClInclude Include="Math.h" />
     <ClInclude Include="MatrixDecomposition.h" />
     <ClInclude Include="MatrixGaussElimination.h" />
     <ClInclude Include="MatrixLDU.h" />
     <ClInclude Include="MatrixSolver.h" />
     <ClInclude Include="MaximumIterationError.h" />
+    <ClInclude Include="MbdMath.h" />
     <ClInclude Include="NewtonRaphson.h" />
     <ClInclude Include="NewtonRaphsonError.h" />
     <ClInclude Include="NoRotationJoint.h" />
diff --git a/OndselSolver/OndselSolver.vcxproj.filters b/OndselSolver/OndselSolver.vcxproj.filters
index 27c4789..582eecd 100644
--- a/OndselSolver/OndselSolver.vcxproj.filters
+++ b/OndselSolver/OndselSolver.vcxproj.filters
@@ -507,7 +507,7 @@
     <ClCompile Include="OrbitAngleZIeqcJeqc.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Math.cpp">
+    <ClCompile Include="MbdMath.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Numeric.cpp">
@@ -1367,7 +1367,7 @@
     <ClInclude Include="OrbitAngleZIeqcJeqc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Math.h">
+    <ClInclude Include="MbdMath.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Numeric.h">
diff --git a/OndselSolver/Symbolic.h b/OndselSolver/Symbolic.h
index 9973bfd..7f08b1b 100644
--- a/OndselSolver/Symbolic.h
+++ b/OndselSolver/Symbolic.h
@@ -13,7 +13,7 @@
 #include <memory>
 #include <ostream>
 
-#include "Math.h"
+#include "MbdMath.h"
 #include "System.h"
 #include "Units.h"
 //#include "Constant.h"
@@ -23,7 +23,7 @@ namespace MbD {
 	class Symbolic;
 	using Symsptr = std::shared_ptr<Symbolic>;
 
-	class Symbolic : public Math
+	class Symbolic : public MbdMath
 	{
 	public:
 		Symbolic();