diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4707c02..8c440fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -215,7 +215,7 @@ set(ONDSELSOLVER_SRC
         OndselSolver/MatrixLDU.cpp
         OndselSolver/MatrixSolver.cpp
         OndselSolver/MaximumIterationError.cpp
-        OndselSolver/MbdMath.cpp
+        OndselSolver/MbDMath.cpp
         OndselSolver/MBDynBlock.cpp
         OndselSolver/MBDynBody.cpp
         OndselSolver/MBDynControlData.cpp
@@ -236,9 +236,9 @@ set(ONDSELSOLVER_SRC
         OndselSolver/NoRotationJoint.cpp
         OndselSolver/NotKinematicError.cpp
         OndselSolver/Numeric.cpp
-        OndselSolver/OrbitAnglezIecJec.cpp
-        OndselSolver/OrbitAnglezIeqcJec.cpp
-        OndselSolver/OrbitAnglezIeqcJeqc.cpp
+        OndselSolver/OrbitAngleZIecJec.cpp
+        OndselSolver/OrbitAngleZIeqcJec.cpp
+        OndselSolver/OrbitAngleZIeqcJeqc.cpp
         OndselSolver/Orientation.cpp
         OndselSolver/ParallelAxesJoint.cpp
         OndselSolver/Part.cpp
@@ -505,7 +505,7 @@ set(ONDSELSOLVER_HEADERS
         OndselSolver/MatrixLDU.h
         OndselSolver/MatrixSolver.h
         OndselSolver/MaximumIterationError.h
-        OndselSolver/MbdMath.h
+        OndselSolver/MbDMath.h
         OndselSolver/MBDynBlock.h
         OndselSolver/MBDynBody.h
         OndselSolver/MBDynControlData.h
@@ -526,9 +526,9 @@ set(ONDSELSOLVER_HEADERS
         OndselSolver/NoRotationJoint.h
         OndselSolver/NotKinematicError.h
         OndselSolver/Numeric.h
-        OndselSolver/OrbitAnglezIecJec.h
-        OndselSolver/OrbitAnglezIeqcJec.h
-        OndselSolver/OrbitAnglezIeqcJeqc.h
+        OndselSolver/OrbitAngleZIecJec.h
+        OndselSolver/OrbitAngleZIeqcJec.h
+        OndselSolver/OrbitAngleZIeqcJeqc.h
         OndselSolver/Orientation.h
         OndselSolver/ParallelAxesJoint.h
         OndselSolver/Part.h
diff --git a/OndselSolver/ASMTAssembly.h b/OndselSolver/ASMTAssembly.h
index 061b6a9..0bfd43f 100644
--- a/OndselSolver/ASMTAssembly.h
+++ b/OndselSolver/ASMTAssembly.h
@@ -15,6 +15,8 @@
 #include "MBDynSystem.h"
 #include "ASMTTime.h"
 #include "ASMTConstantGravity.h"
+#include "ASMTSimulationParameters.h"
+#include "ASMTAnimationParameters.h"
 
 namespace MbD {
 	class ASMTRefPoint;
@@ -25,8 +27,8 @@ namespace MbD {
 	class ASMTConstraintSet;
 	class ASMTForceTorque;
 	class ASMTConstantGravity;
-	class ASMTSimulationParameters;
-	class ASMTAnimationParameters;
+	// class ASMTSimulationParameters;
+	// class ASMTAnimationParameters;
 	class ASMTJoint;
 	class ASMTMotion;
 	class Units;
diff --git a/OndselSolver/MbdMath.cpp b/OndselSolver/MbDMath.cpp
similarity index 100%
rename from OndselSolver/MbdMath.cpp
rename to OndselSolver/MbDMath.cpp
diff --git a/OndselSolver/MbdMath.h b/OndselSolver/MbDMath.h
similarity index 100%
rename from OndselSolver/MbdMath.h
rename to OndselSolver/MbDMath.h
diff --git a/OndselSolver/OrbitAnglezIecJec.cpp b/OndselSolver/OrbitAngleZIecJec.cpp
similarity index 100%
rename from OndselSolver/OrbitAnglezIecJec.cpp
rename to OndselSolver/OrbitAngleZIecJec.cpp
diff --git a/OndselSolver/OrbitAnglezIecJec.h b/OndselSolver/OrbitAngleZIecJec.h
similarity index 100%
rename from OndselSolver/OrbitAnglezIecJec.h
rename to OndselSolver/OrbitAngleZIecJec.h
diff --git a/OndselSolver/OrbitAnglezIeqcJec.cpp b/OndselSolver/OrbitAngleZIeqcJec.cpp
similarity index 100%
rename from OndselSolver/OrbitAnglezIeqcJec.cpp
rename to OndselSolver/OrbitAngleZIeqcJec.cpp
diff --git a/OndselSolver/OrbitAnglezIeqcJec.h b/OndselSolver/OrbitAngleZIeqcJec.h
similarity index 100%
rename from OndselSolver/OrbitAnglezIeqcJec.h
rename to OndselSolver/OrbitAngleZIeqcJec.h
diff --git a/OndselSolver/OrbitAnglezIeqcJeqc.cpp b/OndselSolver/OrbitAngleZIeqcJeqc.cpp
similarity index 100%
rename from OndselSolver/OrbitAnglezIeqcJeqc.cpp
rename to OndselSolver/OrbitAngleZIeqcJeqc.cpp
diff --git a/OndselSolver/OrbitAnglezIeqcJeqc.h b/OndselSolver/OrbitAngleZIeqcJeqc.h
similarity index 100%
rename from OndselSolver/OrbitAnglezIeqcJeqc.h
rename to OndselSolver/OrbitAngleZIeqcJeqc.h