diff --git a/Base/Axis/Frame.h b/Base/Axis/Frame.h
index faccd4292c79de78cb47a4cfb57c993ae9a36e7f..a458b90cdc10ba25b3217f65f5011c49a9f053a7 100644
--- a/Base/Axis/Frame.h
+++ b/Base/Axis/Frame.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_BASE_AXIS_FRAME_H
 #define BORNAGAIN_BASE_AXIS_FRAME_H
 
-#include "Base/Types/CloneableVector.h"
+#include "Base/Type/CloneableVector.h"
 #include <string>
 
 using std::size_t;
diff --git a/Base/Types/CloneableVector.h b/Base/Type/CloneableVector.h
similarity index 91%
rename from Base/Types/CloneableVector.h
rename to Base/Type/CloneableVector.h
index a4373b75669b5c852516bd871ce1ee4665bfb75f..203d8e4b97e6efd452d109a758bec272458b723d 100644
--- a/Base/Types/CloneableVector.h
+++ b/Base/Type/CloneableVector.h
@@ -2,7 +2,7 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Types/CloneableVector.h
+//! @file      Base/Type/CloneableVector.h
 //! @brief     Defines and implements templated class CloneableVector.
 //!
 //! @homepage  http://www.bornagainproject.org
@@ -15,8 +15,8 @@
 #ifdef SWIG
 #error no need to expose this header to Swig
 #endif // SWIG
-#ifndef BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
-#define BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
+#ifndef BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
+#define BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
 
 #include "Base/Types/OwningVector.h"
 
@@ -58,4 +58,4 @@ public:
     CloneableVector& operator=(CloneableVector&& other) = default;
 };
 
-#endif // BORNAGAIN_BASE_TYPES_CLONEABLEVECTOR_H
+#endif // BORNAGAIN_BASE_TYPE_CLONEABLEVECTOR_H
diff --git a/Sample/Aggregate/ParticleLayout.h b/Sample/Aggregate/ParticleLayout.h
index d8ab2a7a2b40439b1d56031365a07b0064d4be83..2f723e6a8d8f5afc345e053aa9804b5a92bebee3 100644
--- a/Sample/Aggregate/ParticleLayout.h
+++ b/Sample/Aggregate/ParticleLayout.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_SAMPLE_AGGREGATE_PARTICLELAYOUT_H
 #define BORNAGAIN_SAMPLE_AGGREGATE_PARTICLELAYOUT_H
 
-#include "Base/Types/CloneableVector.h"
+#include "Base/Type/CloneableVector.h"
 #include "Sample/Scattering/ISampleNode.h"
 #include <memory>
 
diff --git a/Sim/Scan/BeamScan.h b/Sim/Scan/BeamScan.h
index 2a5cc1b72f2868f674c574f6f30a682c987c7bf0..2d776aaaf4bc380367283a5ac1e7ce35641a049a 100644
--- a/Sim/Scan/BeamScan.h
+++ b/Sim/Scan/BeamScan.h
@@ -16,7 +16,7 @@
 #define BORNAGAIN_SIM_SCAN_BEAMSCAN_H
 
 #include "Base/Const/Units.h"
-#include "Base/Types/CloneableVector.h"
+#include "Base/Type/CloneableVector.h"
 #include "Base/Types/ICloneable.h"
 #include "Device/Beam/Beam.h"
 #include "Param/Node/INode.h"