diff --git a/Base/Math/FourierTransform.h b/Base/Math/FourierTransform.h
index d4db52666789f68a1d23e99cc6421e8bdc78151a..7e4ef0750515aa86196e686703baaa4072617c5c 100644
--- a/Base/Math/FourierTransform.h
+++ b/Base/Math/FourierTransform.h
@@ -18,7 +18,7 @@
 #ifndef BORNAGAIN_BASE_MATH_FOURIERTRANSFORM_H
 #define BORNAGAIN_BASE_MATH_FOURIERTRANSFORM_H
 
-#include "Base/Type/Vector.h"
+#include "Base/Type/Field2D.h"
 #include <fftw3.h>
 
 //! Fourier transform of vectors (in 1D or 2D) using Fast Fourier Transform (fftw package).
diff --git a/Base/Type/Vector.h b/Base/Type/Field2D.h
similarity index 76%
rename from Base/Type/Vector.h
rename to Base/Type/Field2D.h
index 5efe90e09e77a4cea9f97d8c43037d9f7940ee4a..d92ed1e1ff60fe129f05f10c06833e8f54b4645e 100644
--- a/Base/Type/Vector.h
+++ b/Base/Type/Field2D.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      Base/Type/Vector.h
-//! @brief     Defines vector types.
+//! @file      Base/Type/Field2D.h
+//! @brief     Defines two-dimensional data arrays.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_BASE_TYPE_VECTOR_H
-#define BORNAGAIN_BASE_TYPE_VECTOR_H
+#ifndef BORNAGAIN_BASE_TYPE_FIELD2D_H
+#define BORNAGAIN_BASE_TYPE_FIELD2D_H
 
 #include <heinz/Complex.h>
 #include <vector>
@@ -21,4 +21,4 @@
 using double2d_t = std::vector<std::vector<double>>;
 using complex2d_t = std::vector<std::vector<complex_t>>;
 
-#endif // BORNAGAIN_BASE_TYPE_VECTOR_H
+#endif // BORNAGAIN_BASE_TYPE_FIELD2D_H
diff --git a/Device/Resolution/Convolve.h b/Device/Resolution/Convolve.h
index aecb9d17896a02e06128142b82b5b44d187287e6..cd77a87ed471f5068b6fac36d34e3b188842a4ff 100644
--- a/Device/Resolution/Convolve.h
+++ b/Device/Resolution/Convolve.h
@@ -18,7 +18,7 @@
 #ifndef BORNAGAIN_DEVICE_RESOLUTION_CONVOLVE_H
 #define BORNAGAIN_DEVICE_RESOLUTION_CONVOLVE_H
 
-#include "Base/Type/Vector.h"
+#include "Base/Type/Field2D.h"
 #include <fftw3.h>
 
 //! Convolution of two real vectors (in 1D or 2D) using Fast Fourier Transform.
diff --git a/Img3D/Model/Geometry.h b/Img3D/Model/Geometry.h
index 4adf50aa1f0bbcaa9001967ee798de34145c5f43..0d0b4c7de84b8e4ef8464df7c52dd636e2631839 100644
--- a/Img3D/Model/Geometry.h
+++ b/Img3D/Model/Geometry.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_IMG3D_MODEL_GEOMETRY_H
 #define BORNAGAIN_IMG3D_MODEL_GEOMETRY_H
 
-#include "Base/Type/Vector.h"
+#include "Base/Type/Field2D.h"
 #include "Img3D/Model/Geometry_inc.h"
 #include <QVector>
 
diff --git a/Img3D/Model/PlottableBody.h b/Img3D/Model/PlottableBody.h
index 69086a8c0167b66e62356dcc25d1cd114d59ebdd..5cd1faf44789fa433f1ff7177f42103aad220921 100644
--- a/Img3D/Model/PlottableBody.h
+++ b/Img3D/Model/PlottableBody.h
@@ -15,7 +15,7 @@
 #ifndef BORNAGAIN_IMG3D_MODEL_PLOTTABLEBODY_H
 #define BORNAGAIN_IMG3D_MODEL_PLOTTABLEBODY_H
 
-#include "Base/Type/Vector.h"
+#include "Base/Type/Field2D.h"
 #include "Img3D/Model/Geometry_inc.h"
 #include "Img3D/Type/FloatVector3D.h"
 #include <QColor>