diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.cpp b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.cpp
similarity index 91%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.cpp
rename to GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.cpp
index b61822e8c747ebf066e1d5dfbc147f4d7731d271..d1e8df3b2f1c9719faa2f212d7e24797b8ab12f6 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.cpp
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.cpp
@@ -1,5 +1,5 @@
 
-#include "RealSpaceViewerDialog.h"
+#include "RealSpaceDialog.h"
 #include "RealSpaceWidget.h"
 
 #include "StyleUtils.h"
@@ -16,7 +16,7 @@ namespace
     const QSize default_dialog_size(500, 400);
 }
 
-RealSpaceViewerDialog::RealSpaceViewerDialog(SampleModel *sampleModel,
+RealSpaceDialog::RealSpaceDialog(SampleModel *sampleModel,
                                              QItemSelectionModel* selectionModel, QWidget *parent)
     : QDialog(parent)
     , m_sampleModel(sampleModel)
diff --git a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.h b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.h
similarity index 69%
rename from GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.h
rename to GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.h
index 7c9ebbc6574791c5239b9f10ad19e2284260f1b8..b04c2c6eead3b6fdc9bf5c04940bd2b81769a3e4 100644
--- a/GUI/coregui/Views/RealSpaceWidgets/RealSpaceViewerDialog.h
+++ b/GUI/coregui/Views/RealSpaceWidgets/RealSpaceDialog.h
@@ -1,5 +1,5 @@
-#ifndef REALSPACEVIEWERDIALOG_H
-#define REALSPACEVIEWERDIALOG_H
+#ifndef REALSPACEDIALOG_H
+#define REALSPACEDIALOG_H
 
 #include "WinDllMacros.h"
 #include <QDialog>
@@ -16,12 +16,12 @@ class QBoxLayout;
 
 //! Dialog to hold RealSpaceViewer.
 
-class BA_CORE_API_ RealSpaceViewerDialog : public QDialog
+class BA_CORE_API_ RealSpaceDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    RealSpaceViewerDialog(SampleModel* sampleModel = nullptr,
+    RealSpaceDialog(SampleModel* sampleModel = nullptr,
                           QItemSelectionModel* selectionModel = nullptr,
                           QWidget *parent = nullptr);
 
@@ -31,4 +31,4 @@ private:
 };
 
 
-#endif // REALSPACEVIEWERDIALOG_H
+#endif // REALSPACEDIALOG_H
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
index af36fab7c3b0b51dcc80ce12c199c84e6219616b..45807de1a75e08c93617ca7b5e3e2984ff37b303 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.cpp
@@ -24,7 +24,7 @@
 #include <QPushButton>
 #include <QToolButton>
 
-#include <RealSpaceViewerDialog.h>
+#include <RealSpaceDialog.h>
 
 //! main tool bar on top of SampleView window
 SampleToolBar::SampleToolBar(SampleModel *sampleModel, QItemSelectionModel* selectionModel,
@@ -166,7 +166,7 @@ void SampleToolBar::onRealSpaceViewerCall()
     if(!m_dialog_on)
     {
         m_dialog_on = true;
-        m_dialog = new RealSpaceViewerDialog(m_sampleModel, m_selectionModel, this);
+        m_dialog = new RealSpaceDialog(m_sampleModel, m_selectionModel, this);
         m_dialog->show();
 
         // undo the flag when the dialog is destroyed on close event
diff --git a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
index c6f1d3ed3ce2e8e0238f6bc62aae1f4bf4712ffd..fcb64b093d64b6bab9d8056e237e10ce92554286 100644
--- a/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
+++ b/GUI/coregui/Views/SampleDesigner/SampleToolBar.h
@@ -19,7 +19,7 @@
 
 #include "SampleModel.h"
 #include <QTreeView>
-#include "RealSpaceViewerDialog.h"
+#include "RealSpaceDialog.h"
 
 class QAction;
 class QToolButton;
@@ -68,7 +68,7 @@ private:
     QToolButton *m_RealSpaceViewerButton;
     SampleModel *m_sampleModel;
     QItemSelectionModel *m_selectionModel;
-    RealSpaceViewerDialog *m_dialog;
+    RealSpaceDialog *m_dialog;
 
     bool m_dialog_on;
 };