diff --git a/GUI/View/Instrument/GISASInstrumentEditor.cpp b/GUI/View/Instrument/Scatter2DInstrumentEditor.cpp
similarity index 87%
rename from GUI/View/Instrument/GISASInstrumentEditor.cpp
rename to GUI/View/Instrument/Scatter2DInstrumentEditor.cpp
index 3ea79b2f8d5d0d9376c350c18b9fc2395a39d6e6..3fff673accd90a60430307169ce31cfaf5dbcea5 100644
--- a/GUI/View/Instrument/GISASInstrumentEditor.cpp
+++ b/GUI/View/Instrument/Scatter2DInstrumentEditor.cpp
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/GISASInstrumentEditor.cpp
-//! @brief     Implements class GISASInstrumentEditor.
+//! @file      GUI/View/Instrument/Scatter2DInstrumentEditor.cpp
+//! @brief     Implements class Scatter2DInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,7 +12,7 @@
 //
 //  ************************************************************************************************
 
-#include "GUI/View/Instrument/GISASInstrumentEditor.h"
+#include "GUI/View/Instrument/Scatter2DInstrumentEditor.h"
 #include "Base/Util/Assert.h"
 #include "GUI/Model/Device/InstrumentItems.h"
 #include "GUI/View/Device/BackgroundForm.h"
@@ -20,7 +20,7 @@
 #include "GUI/View/Device/GISASBeamEditor.h"
 #include "GUI/View/Device/PolarizationAnalysisEditor.h"
 
-GISASInstrumentEditor::GISASInstrumentEditor(GISASInstrumentItem* instrument)
+Scatter2DInstrumentEditor::Scatter2DInstrumentEditor(GISASInstrumentItem* instrument)
 {
     ASSERT(instrument);
     auto* layout = new QVBoxLayout(this);
diff --git a/GUI/View/Instrument/GISASInstrumentEditor.h b/GUI/View/Instrument/Scatter2DInstrumentEditor.h
similarity index 61%
rename from GUI/View/Instrument/GISASInstrumentEditor.h
rename to GUI/View/Instrument/Scatter2DInstrumentEditor.h
index e9797f949eda4700e9aa0da11019a813425a12de..6141d02b8cb6a825c6b37a7b61fcd4fb6a5f6006 100644
--- a/GUI/View/Instrument/GISASInstrumentEditor.h
+++ b/GUI/View/Instrument/Scatter2DInstrumentEditor.h
@@ -2,8 +2,8 @@
 //
 //  BornAgain: simulate and fit reflection and scattering
 //
-//! @file      GUI/View/Instrument/GISASInstrumentEditor.h
-//! @brief     Defines class GISASInstrumentEditor.
+//! @file      GUI/View/Instrument/Scatter2DInstrumentEditor.h
+//! @brief     Defines class Scatter2DInstrumentEditor.
 //!
 //! @homepage  http://www.bornagainproject.org
 //! @license   GNU General Public License v3 or higher (see COPYING)
@@ -12,8 +12,8 @@
 //
 //  ************************************************************************************************
 
-#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASINSTRUMENTEDITOR_H
-#define BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASINSTRUMENTEDITOR_H
+#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_SCATTER2DINSTRUMENTEDITOR_H
+#define BORNAGAIN_GUI_VIEW_INSTRUMENT_SCATTER2DINSTRUMENTEDITOR_H
 
 #include "GUI/View/Widget/IComponentEditor.h"
 
@@ -21,10 +21,10 @@ class GISASInstrumentItem;
 
 //! Editor for GISAS instruments, for use in main scroll area of InstrumentView.
 
-class GISASInstrumentEditor : public IComponentEditor {
+class Scatter2DInstrumentEditor : public IComponentEditor {
     Q_OBJECT
 public:
-    GISASInstrumentEditor(GISASInstrumentItem* instrument);
+    Scatter2DInstrumentEditor(GISASInstrumentItem* instrument);
 };
 
-#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_GISASINSTRUMENTEDITOR_H
+#endif // BORNAGAIN_GUI_VIEW_INSTRUMENT_SCATTER2DINSTRUMENTEDITOR_H
diff --git a/GUI/View/Views/InstrumentView.cpp b/GUI/View/Views/InstrumentView.cpp
index 884499216092b495692b01e92c179ece4380f243..03dbc6bf842976080699d5e0bec92148a1e5cf68 100644
--- a/GUI/View/Views/InstrumentView.cpp
+++ b/GUI/View/Views/InstrumentView.cpp
@@ -18,8 +18,8 @@
 #include "GUI/Model/Device/InstrumentsSet.h"
 #include "GUI/Model/Project/ProjectDocument.h"
 #include "GUI/View/Instrument/DepthprobeInstrumentEditor.h"
-#include "GUI/View/Instrument/GISASInstrumentEditor.h"
 #include "GUI/View/Instrument/OffspecInstrumentEditor.h"
+#include "GUI/View/Instrument/Scatter2DInstrumentEditor.h"
 #include "GUI/View/Instrument/SpecularInstrumentEditor.h"
 #include "GUI/View/Layout/ApplicationSettings.h"
 #include "GUI/View/List/InstrumentsQListView.h"
@@ -120,7 +120,7 @@ void InstrumentView::createWidgetsForCurrentInstrument()
     else if (auto* ii = dynamic_cast<OffspecInstrumentItem*>(currentInstrument))
         editor = new OffspecInstrumentEditor(ii);
     else if (auto* ii = dynamic_cast<GISASInstrumentItem*>(currentInstrument))
-        editor = new GISASInstrumentEditor(ii);
+        editor = new Scatter2DInstrumentEditor(ii);
     else if (auto* ii = dynamic_cast<DepthprobeInstrumentItem*>(currentInstrument))
         editor = new DepthprobeInstrumentEditor(ii);
     else