diff --git a/src/Algorithms/Matrix.h b/src/Algorithms/BoostMatrix.h
similarity index 86%
rename from src/Algorithms/Matrix.h
rename to src/Algorithms/BoostMatrix.h
index 9b8fee37b45e45099ed3ecef2daa1003c59c7d27..64d2ba178142402eb224305606492aaac8b8c2b5 100644
--- a/src/Algorithms/Matrix.h
+++ b/src/Algorithms/BoostMatrix.h
@@ -1,7 +1,7 @@
 //
-// This is header is made to facilitate boost's matrix and vector_t operations in OPAL.
+// This header file is made to facilitate boost's matrix and vector_t operations in OPAL.
 //
-// Copyright (c) 2023 - 2024, Mohsen Sadr, Paul Scherrer Institute, Villigen PSI, Switzerland
+// Copyright (c) 2023, Paul Scherrer Institute, Villigen PSI, Switzerland
 // All rights reserved
 //
 // This file is part of OPAL.
diff --git a/src/Algorithms/ParallelCyclotronTracker.cpp b/src/Algorithms/ParallelCyclotronTracker.cpp
index ba28c603e36f5e0b784d05c4ff9acd552354229a..3c7135b14824ef1eeee820cc13895bc48429878b 100644
--- a/src/Algorithms/ParallelCyclotronTracker.cpp
+++ b/src/Algorithms/ParallelCyclotronTracker.cpp
@@ -26,7 +26,7 @@
 // along with OPAL. If not, see <https://www.gnu.org/licenses/>.
 //
 #include "Algorithms/ParallelCyclotronTracker.h"
-#include "Algorithms/Matrix.h"
+#include "Algorithms/BoostMatrix.h"
 
 #include "AbsBeamline/CCollimator.h"
 #include "AbsBeamline/Corrector.h"
diff --git a/src/Classic/AbsBeamline/Bend2D.cpp b/src/Classic/AbsBeamline/Bend2D.cpp
index 0039a29aaf901af8d530995f1720014b8cffc082..f4bf2612fb57f488eeceae704458ed969974427e 100644
--- a/src/Classic/AbsBeamline/Bend2D.cpp
+++ b/src/Classic/AbsBeamline/Bend2D.cpp
@@ -21,13 +21,13 @@
 #include "AbsBeamline/Bend2D.h"
 #include "AbsBeamline/BeamlineVisitor.h"
 #include "AbstractObjects/OpalData.h"
+#include "Algorithms/BoostMatrix.h"
 #include "Algorithms/PartBunchBase.h"
 #include "Fields/Fieldmap.h"
 #include "Physics/Units.h"
 #include "Structure/MeshGenerator.h"
 #include "Utilities/Options.h"
 #include "Utilities/Util.h"
-#include "Algorithms/Matrix.h"
 
 #include "gsl/gsl_poly.h"
 
diff --git a/src/Classic/Algorithms/CoordinateSystemTrafo.h b/src/Classic/Algorithms/CoordinateSystemTrafo.h
index 99e30b1a0d257abc3a9c24307e52569f29ad72be..fee5c28cd3bad14cb86f15339b9fc1b34aa3469c 100644
--- a/src/Classic/Algorithms/CoordinateSystemTrafo.h
+++ b/src/Classic/Algorithms/CoordinateSystemTrafo.h
@@ -1,9 +1,9 @@
 #ifndef COORDINATESYSTEMTRAFO
 #define COORDINATESYSTEMTRAFO
 
+#include "Algorithms/BoostMatrix.h"
 #include "Algorithms/Vektor.h"
 #include "Algorithms/Quaternion.h"
-#include "Algorithms/Matrix.h"
 
 class CoordinateSystemTrafo {
 public:
diff --git a/src/Classic/Algorithms/Quaternion.cpp b/src/Classic/Algorithms/Quaternion.cpp
index 768c752ae9a5a7c93316b7c0853b1152e580e279..b522169bd6827dcbf3e76f8885ce1ab2338b80f4 100644
--- a/src/Classic/Algorithms/Quaternion.cpp
+++ b/src/Classic/Algorithms/Quaternion.cpp
@@ -1,8 +1,8 @@
+#include "Algorithms/BoostMatrix.h"
 #include "Algorithms/Quaternion.h"
 #include "Physics/Physics.h"
 #include "Utility/RandomNumberGen.h"
 #include "Utilities/GeneralClassicException.h"
-#include "Algorithms/Matrix.h"
 
 namespace {
     Vector_t normalize(const Vector_t & vec)
diff --git a/src/Classic/Algorithms/Quaternion.h b/src/Classic/Algorithms/Quaternion.h
index 171625377198ce8ed1f4f8fc4d05c3f18ce096d7..36fe9f5556559fbfb04362a4b63b82f53e77e6dd 100644
--- a/src/Classic/Algorithms/Quaternion.h
+++ b/src/Classic/Algorithms/Quaternion.h
@@ -2,8 +2,8 @@
 #define OPAL_QUATERNION_H
 
 #include "AppTypes/Vektor.h"
+#include "Algorithms/BoostMatrix.h"
 #include "Algorithms/Vektor.h"
-#include "Algorithms/Matrix.h"
 
 class Quaternion: public Vektor<double, 4> {
 public:
diff --git a/src/Classic/Utilities/MSLang/AffineTransformation.h b/src/Classic/Utilities/MSLang/AffineTransformation.h
index a429b7288c789a5dfaccbb02b46552a933357b19..bb930c74965bf1360f7e58940fd352c64ad320fc 100644
--- a/src/Classic/Utilities/MSLang/AffineTransformation.h
+++ b/src/Classic/Utilities/MSLang/AffineTransformation.h
@@ -1,8 +1,8 @@
 #ifndef MSLANG_AFFINETRANSFORMATION_H
 #define MSLANG_AFFINETRANSFORMATION_H
 
+#include "Algorithms/BoostMatrix.h"
 #include "Algorithms/Vektor.h"
-#include "Algorithms/Matrix.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/src/Distribution/Distribution.h b/src/Distribution/Distribution.h
index a6c90201c15081263d10ef3c34039a6444a89bc9..643df675bde14ca6b213eefa20c3122f6009e1c9 100644
--- a/src/Distribution/Distribution.h
+++ b/src/Distribution/Distribution.h
@@ -19,11 +19,11 @@
 #define OPAL_Distribution_HH
 
 #include "AbstractObjects/Definition.h"
+#include "Algorithms/BoostMatrix.h"
 #include "Algorithms/PartData.h"
 #include "Algorithms/Vektor.h"
 #include "Attributes/Attributes.h"
 #include "Distribution/SigmaGenerator.h"
-#include "Algorithms/Matrix.h"
 
 #include <gsl/gsl_histogram.h>
 #include <gsl/gsl_qrng.h>