diff --git a/GUI/Model/Type/SetWithModel.cpp b/GUI/Model/Type/SetWithModel.cpp
index ce80902bf4338e2b614b567481052c3431321247..36066d0e22f460305f909bbc6ead9530445a322b 100644
--- a/GUI/Model/Type/SetWithModel.cpp
+++ b/GUI/Model/Type/SetWithModel.cpp
@@ -3,7 +3,7 @@
 //  BornAgain: simulate and fit reflection and scattering
 //
 //! @file      GUI/Model/Type/SetWithModel.cpp
-//! @brief     Implements class SetBase, to enforce vtable generation.
+//! @brief     Implements class BaseSet, to enforce vtable generation.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
 
 #include "GUI/Model/Type/SetWithModel.h"
 
-SetBase::SetBase(QObject* parent)
+BaseSet::BaseSet(QObject* parent)
     : QObject(parent)
 {
 }
-SetBase::~SetBase() = default;
+BaseSet::~BaseSet() = default;
diff --git a/GUI/Model/Type/SetWithModel.h b/GUI/Model/Type/SetWithModel.h
index a598e4795087314125ec5e90cccfaf85bd8a59b3..9b1bef3b09e383cac20e515ac8569930bfc7b1e4 100644
--- a/GUI/Model/Type/SetWithModel.h
+++ b/GUI/Model/Type/SetWithModel.h
@@ -27,11 +27,11 @@
 
 //! Non-templated base class for SetWithModel, needed to support Qt signals.
 
-class SetBase : public QObject {
+class BaseSet : public QObject {
     Q_OBJECT
 public:
-    explicit SetBase(QObject* parent = nullptr);
-    virtual ~SetBase();
+    explicit BaseSet(QObject* parent = nullptr);
+    virtual ~BaseSet();
 
     virtual void setCurrentIndex(size_t i) = 0;
     virtual QAbstractListModel* model() = 0;
@@ -43,7 +43,7 @@ signals:
 
 //! A set of NamedItem%s that has a current item and a QListModel.
 
-template <class T> class SetWithModel : public SetBase {
+template <class T> class SetWithModel : public BaseSet {
 public:
     SetWithModel()
         : m_qmodel(std::make_unique<ModelForSet<T>>(this))
@@ -57,7 +57,7 @@ public:
         m_vec.clear();
         m_idx = -1;
         m_qmodel->endResetModel();
-        emit SetBase::setChanged();
+        emit BaseSet::setChanged();
     }
     void delete_current()
     {
@@ -66,7 +66,7 @@ public:
         m_vec.delete_at(m_idx);
         update_current();
         m_qmodel->endRemoveRows();
-        emit SetBase::setChanged();
+        emit BaseSet::setChanged();
     }
     void add_item(T* t)
     {
@@ -74,7 +74,7 @@ public:
         m_vec.push_back(t);
         m_idx = m_vec.size() - 1;
         m_qmodel->endInsertRows();
-        emit SetBase::setChanged();
+        emit BaseSet::setChanged();
     }
     void add_items(std::vector<T*> v)
     {
@@ -83,7 +83,7 @@ public:
             m_vec.push_back(t);
         m_idx = m_vec.size() - 1;
         m_qmodel->endInsertRows();
-        emit SetBase::setChanged();
+        emit BaseSet::setChanged();
     }
 
     void setCurrentIndex(size_t i) override
@@ -93,7 +93,7 @@ public:
         if (i != m_idx)
             m_idx = i;
         m_qmodel->endResetModel();
-        emit SetBase::setChanged();
+        emit BaseSet::setChanged();
     }
 
     size_t currentIndex() const { return m_idx; }
diff --git a/GUI/View/Data/DatafilesQListView.cpp b/GUI/View/Data/DatafilesQListView.cpp
index e940281e0a6f1434a624fd9d4bacf4366b5852c9..64f5243db96c75052aa62be492a8a7beeeef7205 100644
--- a/GUI/View/Data/DatafilesQListView.cpp
+++ b/GUI/View/Data/DatafilesQListView.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Type/SetWithModel.h"
 #include "GUI/View/Widget/ListItemDelegate.h"
 
-DatafilesQListView::DatafilesQListView(SetBase* set)
+DatafilesQListView::DatafilesQListView(BaseSet* set)
 {
     setMinimumWidth(200);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
diff --git a/GUI/View/Data/DatafilesQListView.h b/GUI/View/Data/DatafilesQListView.h
index b9fa5213c53944a2e12fe3b9907f918256664943..5c2cad41664ebec9c2eec09a18df360829841b6f 100644
--- a/GUI/View/Data/DatafilesQListView.h
+++ b/GUI/View/Data/DatafilesQListView.h
@@ -17,12 +17,12 @@
 
 #include <QListView>
 
-class SetBase;
+class BaseSet;
 
 //! List view to select one datafile (left side of layer-oriented datafile editor)
 class DatafilesQListView : public QListView {
 public:
-    DatafilesQListView(SetBase*);
+    DatafilesQListView(BaseSet*);
 };
 
 #endif // BORNAGAIN_GUI_VIEW_DATA_DATAFILESQLISTVIEW_H
diff --git a/GUI/View/List/InstrumentsQListView.cpp b/GUI/View/List/InstrumentsQListView.cpp
index 54784191e9a0b7aa076fb3038477e072ba5bbd72..58818bae2791c0b7eb01df08e384dbe6075f0ec4 100644
--- a/GUI/View/List/InstrumentsQListView.cpp
+++ b/GUI/View/List/InstrumentsQListView.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Type/SetWithModel.h"
 #include "GUI/View/Widget/ListItemDelegate.h"
 
-InstrumentsQListView::InstrumentsQListView(SetBase* set)
+InstrumentsQListView::InstrumentsQListView(BaseSet* set)
 {
     setMinimumWidth(200);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
diff --git a/GUI/View/List/InstrumentsQListView.h b/GUI/View/List/InstrumentsQListView.h
index d922a7a3bc94d6b8e69ceb507a0a0127d1b24db0..bed5f579bb755f764f0daa6951542c88482c7553 100644
--- a/GUI/View/List/InstrumentsQListView.h
+++ b/GUI/View/List/InstrumentsQListView.h
@@ -17,13 +17,13 @@
 
 #include <QListView>
 
-class SetBase;
+class BaseSet;
 
 //! Instrument selector on the left side of InstrumentView.
 
 class InstrumentsQListView : public QListView {
 public:
-    InstrumentsQListView(SetBase*);
+    InstrumentsQListView(BaseSet*);
 };
 
 #endif // BORNAGAIN_GUI_VIEW_LIST_INSTRUMENTSQLISTVIEW_H
diff --git a/GUI/View/List/SamplesQListView.cpp b/GUI/View/List/SamplesQListView.cpp
index 0948bc73b7f0ede035e206c490ec4c25a585bace..cb2014243fa032384b493c0fe3c38ed3d40156db 100644
--- a/GUI/View/List/SamplesQListView.cpp
+++ b/GUI/View/List/SamplesQListView.cpp
@@ -16,7 +16,7 @@
 #include "GUI/Model/Type/SetWithModel.h"
 #include "GUI/View/Widget/ListItemDelegate.h"
 
-SamplesQListView::SamplesQListView(SetBase* set)
+SamplesQListView::SamplesQListView(BaseSet* set)
 {
     setMinimumWidth(200);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
diff --git a/GUI/View/List/SamplesQListView.h b/GUI/View/List/SamplesQListView.h
index 4d6930efd8d82b7d918d3c686f002c5675bb6630..6428181fb5d14a6c9411cdabc2f023495523fc22 100644
--- a/GUI/View/List/SamplesQListView.h
+++ b/GUI/View/List/SamplesQListView.h
@@ -17,12 +17,12 @@
 
 #include <QListView>
 
-class SetBase;
+class BaseSet;
 
 //! List view to select one sample (left side of layer-oriented sample editor)
 class SamplesQListView : public QListView {
 public:
-    SamplesQListView(SetBase*);
+    SamplesQListView(BaseSet*);
 };
 
 #endif // BORNAGAIN_GUI_VIEW_LIST_SAMPLESQLISTVIEW_H
diff --git a/Wrap/Swig/numpy.i b/Wrap/Swig/numpy.i
index 3095efbe32a4bf310c397b287dbe637c5551342b..0e0c821c20fc7546ab5a146b98f67fc39a917943 100644
--- a/Wrap/Swig/numpy.i
+++ b/Wrap/Swig/numpy.i
@@ -2471,7 +2471,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2505,7 +2505,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2540,7 +2540,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2575,7 +2575,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2610,7 +2610,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2645,7 +2645,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2682,7 +2682,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2719,7 +2719,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2756,7 +2756,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2793,7 +2793,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2831,7 +2831,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2869,7 +2869,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2907,7 +2907,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2945,7 +2945,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -2983,7 +2983,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -3021,7 +3021,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -3059,7 +3059,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);
@@ -3097,7 +3097,7 @@
 %#if NPY_API_VERSION < 0x00000007
   PyArray_BASE(array) = cap;
 %#else
-  PyArray_SetBaseObject(array,cap);
+  PyArray_BaseSetObject(array,cap);
 %#endif
 
   $result = SWIG_Python_AppendOutput($result,obj);