diff --git a/gui/include/DragAndDrop/DragDropHelper.h b/gui/include/DragAndDrop/DragDropGuiController.h
similarity index 85%
rename from gui/include/DragAndDrop/DragDropHelper.h
rename to gui/include/DragAndDrop/DragDropGuiController.h
index 7274376..9d223b4 100644
--- a/gui/include/DragAndDrop/DragDropHelper.h
+++ b/gui/include/DragAndDrop/DragDropGuiController.h
@@ -1,5 +1,5 @@
-#ifndef SCIQLOP_DRAGDROPHELPER_H
-#define SCIQLOP_DRAGDROPHELPER_H
+#ifndef SCIQLOP_DRAGDROPGUICONTROLLER_H
+#define SCIQLOP_DRAGDROPGUICONTROLLER_H
 
 #include <Common/spimpl.h>
 #include <QLoggingCategory>
@@ -12,7 +12,7 @@ class VisualizationDragWidget;
 class VisualizationDragDropContainer;
 class QMimeData;
 
-Q_DECLARE_LOGGING_CATEGORY(LOG_DragDropHelper)
+Q_DECLARE_LOGGING_CATEGORY(LOG_DragDropGuiController)
 
 /**
  * @brief Helper class for drag&drop operations.
@@ -21,15 +21,15 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_DragDropHelper)
  * can interect with the gui.
  * @see SqpApplication
  */
-class DragDropHelper {
+class DragDropGuiController {
 public:
     static const QString MIME_TYPE_GRAPH;
     static const QString MIME_TYPE_ZONE;
 
     enum class PlaceHolderType { Default, Graph, Zone };
 
-    DragDropHelper();
-    virtual ~DragDropHelper();
+    DragDropGuiController();
+    virtual ~DragDropGuiController();
 
     /// Resets some internal variables. Must be called before any new drag&drop operation.
     void resetDragAndDrop();
@@ -68,8 +68,8 @@ public:
     void doCloseWidgets();
 
 private:
-    class DragDropHelperPrivate;
-    spimpl::unique_impl_ptr<DragDropHelperPrivate> impl;
+    class DragDropGuiControllerPrivate;
+    spimpl::unique_impl_ptr<DragDropGuiControllerPrivate> impl;
 };
 
-#endif // SCIQLOP_DRAGDROPHELPER_H
+#endif // SCIQLOP_DRAGDROPGUICONTROLLER_H
diff --git a/gui/include/SqpApplication.h b/gui/include/SqpApplication.h
index c9d37a2..5e2d6b9 100644
--- a/gui/include/SqpApplication.h
+++ b/gui/include/SqpApplication.h
@@ -20,7 +20,7 @@ class NetworkController;
 class TimeController;
 class VariableController;
 class VisualizationController;
-class DragDropHelper;
+class DragDropGuiController;
 
 /**
  * @brief The SqpApplication class aims to make the link between SciQlop
@@ -47,7 +47,7 @@ public:
 
     /// Accessors for the differents sciqlop helpers, these helpers classes are like controllers but
     /// doesn't live in a thread and access gui
-    DragDropHelper &dragDropHelper() noexcept;
+    DragDropGuiController &dragDropGuiController() noexcept;
 
     enum class PlotsInteractionMode { None, ZoomBox, DragAndDrop, SelectionZones };
 
diff --git a/gui/include/Visualization/VisualizationDragDropContainer.h b/gui/include/Visualization/VisualizationDragDropContainer.h
index 25150ae..b3e6436 100644
--- a/gui/include/Visualization/VisualizationDragDropContainer.h
+++ b/gui/include/Visualization/VisualizationDragDropContainer.h
@@ -9,7 +9,7 @@
 
 #include <functional>
 
-#include <DragAndDrop/DragDropHelper.h>
+#include <DragAndDrop/DragDropGuiController.h>
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationDragDropContainer)
 
@@ -41,7 +41,7 @@ public:
 
     void setAcceptDragWidgetFunction(AcceptDragWidgetFunction fun);
 
-    void setPlaceHolderType(DragDropHelper::PlaceHolderType type,
+    void setPlaceHolderType(DragDropGuiController::PlaceHolderType type,
                             const QString &placeHolderText = QString());
 
 protected:
diff --git a/gui/src/DataSource/DataSourceTreeWidget.cpp b/gui/src/DataSource/DataSourceTreeWidget.cpp
index d8bc863..c95ebcd 100644
--- a/gui/src/DataSource/DataSourceTreeWidget.cpp
+++ b/gui/src/DataSource/DataSourceTreeWidget.cpp
@@ -4,7 +4,7 @@
 #include "DataSource/DataSourceItem.h"
 #include "DataSource/DataSourceTreeWidgetItem.h"
 
-#include "DragAndDrop/DragDropHelper.h"
+#include "DragAndDrop/DragDropGuiController.h"
 #include "SqpApplication.h"
 
 #include <QMimeData>
@@ -42,6 +42,6 @@ QMimeData *DataSourceTreeWidget::mimeData(const QList<QTreeWidgetItem *> items) 
 void DataSourceTreeWidget::startDrag(Qt::DropActions supportedActions)
 {
     // Resets the drag&drop operations before it's starting
-    sqpApp->dragDropHelper().resetDragAndDrop();
+    sqpApp->dragDropGuiController().resetDragAndDrop();
     QTreeWidget::startDrag(supportedActions);
 }
diff --git a/gui/src/DragAndDrop/DragDropHelper.cpp b/gui/src/DragAndDrop/DragDropGuiController.cpp
similarity index 77%
rename from gui/src/DragAndDrop/DragDropHelper.cpp
rename to gui/src/DragAndDrop/DragDropGuiController.cpp
index 88a6756..1546c22 100644
--- a/gui/src/DragAndDrop/DragDropHelper.cpp
+++ b/gui/src/DragAndDrop/DragDropGuiController.cpp
@@ -1,4 +1,4 @@
-#include "DragAndDrop/DragDropHelper.h"
+#include "DragAndDrop/DragDropGuiController.h"
 #include "DragAndDrop/DragDropScroller.h"
 #include "DragAndDrop/DragDropTabSwitcher.h"
 #include "SqpApplication.h"
@@ -19,10 +19,10 @@
 #include <QVBoxLayout>
 
 
-Q_LOGGING_CATEGORY(LOG_DragDropHelper, "DragDropHelper")
+Q_LOGGING_CATEGORY(LOG_DragDropGuiController, "DragDropGuiController")
 
 
-struct DragDropHelper::DragDropHelperPrivate {
+struct DragDropGuiController::DragDropGuiControllerPrivate {
 
     VisualizationDragWidget *m_CurrentDragWidget = nullptr;
     std::unique_ptr<QWidget> m_PlaceHolder = nullptr;
@@ -40,7 +40,7 @@ struct DragDropHelper::DragDropHelperPrivate {
 
     QList<QWidget *> m_WidgetToClose;
 
-    explicit DragDropHelperPrivate()
+    explicit DragDropGuiControllerPrivate()
             : m_PlaceHolder{std::make_unique<QWidget>()},
               m_DragDropScroller{std::make_unique<DragDropScroller>()},
               m_DragDropTabSwitcher{std::make_unique<DragDropTabSwitcher>()}
@@ -64,7 +64,8 @@ struct DragDropHelper::DragDropHelperPrivate {
         m_ImageTempUrl = QDir::temp().absoluteFilePath("Sciqlop_graph.png");
     }
 
-    void preparePlaceHolder(DragDropHelper::PlaceHolderType type, const QString &topLabelText) const
+    void preparePlaceHolder(DragDropGuiController::PlaceHolderType type,
+                            const QString &topLabelText) const
     {
         if (m_CurrentDragWidget) {
             m_PlaceHolder->setMinimumSize(m_CurrentDragWidget->size());
@@ -79,12 +80,12 @@ struct DragDropHelper::DragDropHelperPrivate {
         }
 
         switch (type) {
-            case DragDropHelper::PlaceHolderType::Graph:
+            case DragDropGuiController::PlaceHolderType::Graph:
                 m_PlaceBackground->setStyleSheet(
                     "background-color: #BBD5EE; border: 1px solid #2A7FD4");
                 break;
-            case DragDropHelper::PlaceHolderType::Zone:
-            case DragDropHelper::PlaceHolderType::Default:
+            case DragDropGuiController::PlaceHolderType::Zone:
+            case DragDropGuiController::PlaceHolderType::Default:
                 m_PlaceBackground->setStyleSheet(
                     "background-color: #BBD5EE; border: 2px solid #2A7FD4");
                 m_PlaceHolderLabel->setStyleSheet("color: #2A7FD4");
@@ -97,22 +98,23 @@ struct DragDropHelper::DragDropHelperPrivate {
 };
 
 
-DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()}
+DragDropGuiController::DragDropGuiController()
+        : impl{spimpl::make_unique_impl<DragDropGuiControllerPrivate>()}
 {
 }
 
-DragDropHelper::~DragDropHelper()
+DragDropGuiController::~DragDropGuiController()
 {
     QFile::remove(impl->m_ImageTempUrl);
 }
 
-void DragDropHelper::resetDragAndDrop()
+void DragDropGuiController::resetDragAndDrop()
 {
     setCurrentDragWidget(nullptr);
     impl->m_HighlightedDragWidget = nullptr;
 }
 
-void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget)
+void DragDropGuiController::setCurrentDragWidget(VisualizationDragWidget *dragWidget)
 {
     if (impl->m_CurrentDragWidget) {
 
@@ -129,18 +131,18 @@ void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget)
     impl->m_CurrentDragWidget = dragWidget;
 }
 
-VisualizationDragWidget *DragDropHelper::getCurrentDragWidget() const
+VisualizationDragWidget *DragDropGuiController::getCurrentDragWidget() const
 {
     return impl->m_CurrentDragWidget;
 }
 
-QWidget &DragDropHelper::placeHolder() const
+QWidget &DragDropGuiController::placeHolder() const
 {
     return *impl->m_PlaceHolder;
 }
 
-void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index, PlaceHolderType type,
-                                       const QString &topLabelText)
+void DragDropGuiController::insertPlaceHolder(QVBoxLayout *layout, int index, PlaceHolderType type,
+                                              const QString &topLabelText)
 {
     removePlaceHolder();
     impl->preparePlaceHolder(type, topLabelText);
@@ -148,7 +150,7 @@ void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index, PlaceHold
     impl->m_PlaceHolder->show();
 }
 
-void DragDropHelper::removePlaceHolder()
+void DragDropGuiController::removePlaceHolder()
 {
     auto parentWidget = impl->m_PlaceHolder->parentWidget();
     if (parentWidget) {
@@ -158,38 +160,38 @@ void DragDropHelper::removePlaceHolder()
     }
 }
 
-bool DragDropHelper::isPlaceHolderSet() const
+bool DragDropGuiController::isPlaceHolderSet() const
 {
     return impl->m_PlaceHolder->parentWidget();
 }
 
-void DragDropHelper::addDragDropScrollArea(QScrollArea *scrollArea)
+void DragDropGuiController::addDragDropScrollArea(QScrollArea *scrollArea)
 {
     impl->m_DragDropScroller->addScrollArea(scrollArea);
 }
 
-void DragDropHelper::removeDragDropScrollArea(QScrollArea *scrollArea)
+void DragDropGuiController::removeDragDropScrollArea(QScrollArea *scrollArea)
 {
     impl->m_DragDropScroller->removeScrollArea(scrollArea);
 }
 
-void DragDropHelper::addDragDropTabBar(QTabBar *tabBar)
+void DragDropGuiController::addDragDropTabBar(QTabBar *tabBar)
 {
     impl->m_DragDropTabSwitcher->addTabBar(tabBar);
 }
 
-void DragDropHelper::removeDragDropTabBar(QTabBar *tabBar)
+void DragDropGuiController::removeDragDropTabBar(QTabBar *tabBar)
 {
     impl->m_DragDropTabSwitcher->removeTabBar(tabBar);
 }
 
-QUrl DragDropHelper::imageTemporaryUrl(const QImage &image) const
+QUrl DragDropGuiController::imageTemporaryUrl(const QImage &image) const
 {
     image.save(impl->m_ImageTempUrl);
     return QUrl::fromLocalFile(impl->m_ImageTempUrl);
 }
 
-void DragDropHelper::setHightlightedDragWidget(VisualizationDragWidget *dragWidget)
+void DragDropGuiController::setHightlightedDragWidget(VisualizationDragWidget *dragWidget)
 {
     if (impl->m_HighlightedDragWidget) {
         impl->m_HighlightedDragWidget->highlightForMerge(false);
@@ -208,18 +210,18 @@ void DragDropHelper::setHightlightedDragWidget(VisualizationDragWidget *dragWidg
     impl->m_HighlightedDragWidget = dragWidget;
 }
 
-VisualizationDragWidget *DragDropHelper::getHightlightedDragWidget() const
+VisualizationDragWidget *DragDropGuiController::getHightlightedDragWidget() const
 {
     return impl->m_HighlightedDragWidget;
 }
 
-void DragDropHelper::delayedCloseWidget(QWidget *widget)
+void DragDropGuiController::delayedCloseWidget(QWidget *widget)
 {
     widget->hide();
     impl->m_WidgetToClose << widget;
 }
 
-void DragDropHelper::doCloseWidgets()
+void DragDropGuiController::doCloseWidgets()
 {
     for (auto widget : impl->m_WidgetToClose) {
         widget->close();
@@ -228,12 +230,12 @@ void DragDropHelper::doCloseWidgets()
     impl->m_WidgetToClose.clear();
 }
 
-bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
-                                                   VisualizationDragDropContainer *dropContainer)
+bool DragDropGuiController::checkMimeDataForVisualization(
+    const QMimeData *mimeData, VisualizationDragDropContainer *dropContainer)
 {
     if (!mimeData || !dropContainer) {
-        qCWarning(LOG_DragDropHelper()) << QObject::tr(
-            "DragDropHelper::checkMimeDataForVisualization, invalid input parameters.");
+        qCWarning(LOG_DragDropGuiController()) << QObject::tr(
+            "DragDropGuiController::checkMimeDataForVisualization, invalid input parameters.");
         Q_ASSERT(false);
         return false;
     }
@@ -270,8 +272,8 @@ bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
                     }
                 }
                 else {
-                    qCWarning(LOG_DragDropHelper()) << QObject::tr(
-                        "DragDropHelper::checkMimeDataForVisualization, the parent "
+                    qCWarning(LOG_DragDropGuiController()) << QObject::tr(
+                        "DragDropGuiController::checkMimeDataForVisualization, the parent "
                         "VisualizationWidget cannot be found. Cannot check if the variable is "
                         "already used or not.");
                 }
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index 4e676ed..e2f1f43 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -3,7 +3,7 @@
 #include <Catalogue/CatalogueController.h>
 #include <Data/IDataProvider.h>
 #include <DataSource/DataSourceController.h>
-#include <DragAndDrop/DragDropHelper.h>
+#include <DragAndDrop/DragDropGuiController.h>
 #include <Network/NetworkController.h>
 #include <QThread>
 #include <Time/TimeController.h>
@@ -22,7 +22,7 @@ public:
               m_TimeController{std::make_unique<TimeController>()},
               m_NetworkController{std::make_unique<NetworkController>()},
               m_VisualizationController{std::make_unique<VisualizationController>()},
-              m_DragDropHelper{std::make_unique<DragDropHelper>()},
+              m_DragDropGuiController{std::make_unique<DragDropGuiController>()},
               m_CatalogueController{std::make_unique<CatalogueController>()},
               m_PlotInterractionMode(SqpApplication::PlotsInteractionMode::None),
               m_PlotCursorMode(SqpApplication::PlotsCursorMode::NoCursor)
@@ -100,7 +100,7 @@ public:
     QThread m_VisualizationControllerThread;
     QThread m_CatalogueControllerThread;
 
-    std::unique_ptr<DragDropHelper> m_DragDropHelper;
+    std::unique_ptr<DragDropGuiController> m_DragDropGuiController;
 
     SqpApplication::PlotsInteractionMode m_PlotInterractionMode;
     SqpApplication::PlotsCursorMode m_PlotCursorMode;
@@ -177,9 +177,9 @@ VisualizationController &SqpApplication::visualizationController() noexcept
     return *impl->m_VisualizationController;
 }
 
-DragDropHelper &SqpApplication::dragDropHelper() noexcept
+DragDropGuiController &SqpApplication::dragDropGuiController() noexcept
 {
-    return *impl->m_DragDropHelper;
+    return *impl->m_DragDropGuiController;
 }
 
 SqpApplication::PlotsInteractionMode SqpApplication::plotsInteractionMode() const
diff --git a/gui/src/TimeWidget/TimeWidget.cpp b/gui/src/TimeWidget/TimeWidget.cpp
index d3939b0..06a19b9 100644
--- a/gui/src/TimeWidget/TimeWidget.cpp
+++ b/gui/src/TimeWidget/TimeWidget.cpp
@@ -4,7 +4,7 @@
 #include <Common/DateUtils.h>
 #include <Common/MimeTypesDef.h>
 
-#include <DragAndDrop/DragDropHelper.h>
+#include <DragAndDrop/DragDropGuiController.h>
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
 
@@ -145,7 +145,7 @@ void TimeWidget::mouseMoveEvent(QMouseEvent *event)
     auto pixmap = QPixmap{":/icones/time.png"};
     drag->setPixmap(pixmap.scaledToWidth(22));
 
-    sqpApp->dragDropHelper().resetDragAndDrop();
+    sqpApp->dragDropGuiController().resetDragAndDrop();
 
     // Note: The exec() is blocking on windows but not on linux and macOS
     drag->exec(Qt::MoveAction | Qt::CopyAction);
diff --git a/gui/src/Variable/VariableInspectorTableView.cpp b/gui/src/Variable/VariableInspectorTableView.cpp
index 29352d3..8d3b1ba 100644
--- a/gui/src/Variable/VariableInspectorTableView.cpp
+++ b/gui/src/Variable/VariableInspectorTableView.cpp
@@ -1,6 +1,6 @@
 #include "Variable/VariableInspectorTableView.h"
 
-#include "DragAndDrop/DragDropHelper.h"
+#include "DragAndDrop/DragDropGuiController.h"
 #include "SqpApplication.h"
 
 VariableInspectorTableView::VariableInspectorTableView(QWidget *parent) : QTableView(parent)
@@ -10,6 +10,6 @@ VariableInspectorTableView::VariableInspectorTableView(QWidget *parent) : QTable
 void VariableInspectorTableView::startDrag(Qt::DropActions supportedActions)
 {
     // Resets the drag&drop operations before it's starting
-    sqpApp->dragDropHelper().resetDragAndDrop();
+    sqpApp->dragDropGuiController().resetDragAndDrop();
     QTableView::startDrag(supportedActions);
 }
diff --git a/gui/src/Variable/VariableInspectorWidget.cpp b/gui/src/Variable/VariableInspectorWidget.cpp
index 849bec7..101ceb6 100644
--- a/gui/src/Variable/VariableInspectorWidget.cpp
+++ b/gui/src/Variable/VariableInspectorWidget.cpp
@@ -12,7 +12,7 @@
 #include <QStyledItemDelegate>
 #include <QWidgetAction>
 
-#include <DragAndDrop/DragDropHelper.h>
+#include <DragAndDrop/DragDropGuiController.h>
 #include <SqpApplication.h>
 
 Q_LOGGING_CATEGORY(LOG_VariableInspectorWidget, "VariableInspectorWidget")
diff --git a/gui/src/Visualization/VisualizationDragDropContainer.cpp b/gui/src/Visualization/VisualizationDragDropContainer.cpp
index 83da700..bd3d70c 100644
--- a/gui/src/Visualization/VisualizationDragDropContainer.cpp
+++ b/gui/src/Visualization/VisualizationDragDropContainer.cpp
@@ -1,5 +1,5 @@
 #include "Visualization/VisualizationDragDropContainer.h"
-#include "DragAndDrop/DragDropHelper.h"
+#include "DragAndDrop/DragDropGuiController.h"
 #include "SqpApplication.h"
 #include "Visualization/VisualizationDragWidget.h"
 
@@ -21,7 +21,7 @@ struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
     QVBoxLayout *m_Layout;
     QHash<QString, VisualizationDragDropContainer::DropBehavior> m_AcceptedMimeTypes;
     QString m_PlaceHolderText;
-    DragDropHelper::PlaceHolderType m_PlaceHolderType;
+    DragDropGuiController::PlaceHolderType m_PlaceHolderType;
 
     VisualizationDragDropContainer::AcceptMimeDataFunction m_AcceptMimeDataFun
         = [](auto mimeData) { return true; };
@@ -31,7 +31,7 @@ struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
     int m_MinContainerHeight = 0;
 
     explicit VisualizationDragDropContainerPrivate(QWidget *widget)
-            : m_PlaceHolderType(DragDropHelper::PlaceHolderType::Graph)
+            : m_PlaceHolderType(DragDropGuiController::PlaceHolderType::Graph)
     {
         m_Layout = new QVBoxLayout(widget);
         m_Layout->setContentsMargins(0, 0, 0, 0);
@@ -104,7 +104,8 @@ struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
 
     bool hasPlaceHolder() const
     {
-        return sqpApp->dragDropHelper().placeHolder().parentWidget() == m_Layout->parentWidget();
+        return sqpApp->dragDropGuiController().placeHolder().parentWidget()
+               == m_Layout->parentWidget();
     }
 
     VisualizationDragWidget *getChildDragWidgetAt(const QWidget *parent, const QPoint &pos) const
@@ -128,7 +129,7 @@ struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
     {
         auto widgetUnderMouse = sqpApp->widgetAt(QCursor::pos());
         return container->isAncestorOf(widgetUnderMouse) && widgetUnderMouse != container
-               && sqpApp->dragDropHelper().placeHolder().isAncestorOf(widgetUnderMouse);
+               && sqpApp->dragDropGuiController().placeHolder().isAncestorOf(widgetUnderMouse);
     }
 
     int countDragWidget(const QWidget *parent, bool onlyVisible = false) const
@@ -196,7 +197,7 @@ void VisualizationDragDropContainer::setAcceptDragWidgetFunction(
     impl->m_AcceptDragWidgetFun = fun;
 }
 
-void VisualizationDragDropContainer::setPlaceHolderType(DragDropHelper::PlaceHolderType type,
+void VisualizationDragDropContainer::setPlaceHolderType(DragDropGuiController::PlaceHolderType type,
                                                         const QString &placeHolderText)
 {
     impl->m_PlaceHolderType = type;
@@ -206,7 +207,7 @@ void VisualizationDragDropContainer::setPlaceHolderType(DragDropHelper::PlaceHol
 void VisualizationDragDropContainer::startDrag(VisualizationDragWidget *dragWidget,
                                                const QPoint &dragPosition)
 {
-    auto &helper = sqpApp->dragDropHelper();
+    auto &helper = sqpApp->dragDropGuiController();
     helper.resetDragAndDrop();
 
     // Note: The management of the drag object is done by Qt
@@ -261,7 +262,7 @@ void VisualizationDragDropContainer::dragEnterEvent(QDragEnterEvent *event)
     if (impl->acceptMimeData(event->mimeData())) {
         event->acceptProposedAction();
 
-        auto &helper = sqpApp->dragDropHelper();
+        auto &helper = sqpApp->dragDropGuiController();
 
         if (!impl->hasPlaceHolder()) {
             auto dragWidget = helper.getCurrentDragWidget();
@@ -298,7 +299,7 @@ void VisualizationDragDropContainer::dragLeaveEvent(QDragLeaveEvent *event)
 {
     Q_UNUSED(event);
 
-    auto &helper = sqpApp->dragDropHelper();
+    auto &helper = sqpApp->dragDropGuiController();
 
     if (!impl->cursorIsInContainer(this)) {
         helper.removePlaceHolder();
@@ -342,7 +343,7 @@ void VisualizationDragDropContainer::dragMoveEvent(QDragMoveEvent *event)
 
 void VisualizationDragDropContainer::dropEvent(QDropEvent *event)
 {
-    auto &helper = sqpApp->dragDropHelper();
+    auto &helper = sqpApp->dragDropGuiController();
 
     if (impl->acceptMimeData(event->mimeData())) {
         auto dragWidget = helper.getCurrentDragWidget();
@@ -398,7 +399,7 @@ void VisualizationDragDropContainer::dropEvent(QDropEvent *event)
         event->ignore();
     }
 
-    sqpApp->dragDropHelper().setHightlightedDragWidget(nullptr);
+    sqpApp->dragDropGuiController().setHightlightedDragWidget(nullptr);
     impl->m_MinContainerHeight = 0;
 
     QWidget::dropEvent(event);
@@ -409,7 +410,7 @@ bool VisualizationDragDropContainer::VisualizationDragDropContainerPrivate::find
     const QPoint &pos, const QMimeData *mimeData, bool canInsert, bool canMerge,
     const VisualizationDragDropContainer *container)
 {
-    auto &helper = sqpApp->dragDropHelper();
+    auto &helper = sqpApp->dragDropGuiController();
 
     auto absPos = container->mapToGlobal(pos);
     auto isOnPlaceHolder = helper.placeHolder().isAncestorOf(sqpApp->widgetAt(absPos));
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index 4e0c6d9..e74b417 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -14,7 +14,7 @@
 #include <Data/ArrayData.h>
 #include <Data/IDataSeries.h>
 #include <Data/SpectrogramSeries.h>
-#include <DragAndDrop/DragDropHelper.h>
+#include <DragAndDrop/DragDropGuiController.h>
 #include <Settings/SqpSettingsDefs.h>
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
diff --git a/gui/src/Visualization/VisualizationTabWidget.cpp b/gui/src/Visualization/VisualizationTabWidget.cpp
index ff28657..ff81937 100644
--- a/gui/src/Visualization/VisualizationTabWidget.cpp
+++ b/gui/src/Visualization/VisualizationTabWidget.cpp
@@ -11,7 +11,7 @@
 
 #include "Common/MimeTypesDef.h"
 
-#include "DragAndDrop/DragDropHelper.h"
+#include "DragAndDrop/DragDropGuiController.h"
 #include "SqpApplication.h"
 
 Q_LOGGING_CATEGORY(LOG_VisualizationTabWidget, "VisualizationTabWidget")
@@ -78,7 +78,7 @@ VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *par
     impl->m_MacScrollBarStyle->selfInstallOn(ui->scrollArea, true);
 #endif
 
-    ui->dragDropContainer->setPlaceHolderType(DragDropHelper::PlaceHolderType::Zone, "Zone");
+    ui->dragDropContainer->setPlaceHolderType(DragDropGuiController::PlaceHolderType::Zone, "Zone");
     ui->dragDropContainer->layout()->setContentsMargins(0, 0, 0, 12);
     ui->dragDropContainer->layout()->setSpacing(0);
     ui->dragDropContainer->setMimeType(MIME_TYPE_GRAPH,
@@ -89,14 +89,14 @@ VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *par
                                        VisualizationDragDropContainer::DropBehavior::Inserted);
 
     ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
-        return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,
-                                                                      ui->dragDropContainer);
+        return sqpApp->dragDropGuiController().checkMimeDataForVisualization(mimeData,
+                                                                             ui->dragDropContainer);
     });
 
     connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredInContainer, this,
             &VisualizationTabWidget::dropMimeData);
 
-    sqpApp->dragDropHelper().addDragDropScrollArea(ui->scrollArea);
+    sqpApp->dragDropGuiController().addDragDropScrollArea(ui->scrollArea);
 
     // Widget is deleted when closed
     setAttribute(Qt::WA_DeleteOnClose);
@@ -104,7 +104,7 @@ VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *par
 
 VisualizationTabWidget::~VisualizationTabWidget()
 {
-    sqpApp->dragDropHelper().removeDragDropScrollArea(ui->scrollArea);
+    sqpApp->dragDropGuiController().removeDragDropScrollArea(ui->scrollArea);
     delete ui;
 }
 
@@ -213,7 +213,7 @@ void VisualizationTabWidget::dropMimeData(int index, const QMimeData *mimeData)
 void VisualizationTabWidget::VisualizationTabWidgetPrivate::dropGraph(
     int index, VisualizationTabWidget *tabWidget)
 {
-    auto &helper = sqpApp->dragDropHelper();
+    auto &helper = sqpApp->dragDropGuiController();
 
     auto graphWidget = qobject_cast<VisualizationGraphWidget *>(helper.getCurrentDragWidget());
     if (!graphWidget) {
@@ -286,7 +286,7 @@ void VisualizationTabWidget::VisualizationTabWidgetPrivate::dropGraph(
 void VisualizationTabWidget::VisualizationTabWidgetPrivate::dropZone(
     int index, VisualizationTabWidget *tabWidget)
 {
-    auto &helper = sqpApp->dragDropHelper();
+    auto &helper = sqpApp->dragDropGuiController();
 
     auto zoneWidget = qobject_cast<VisualizationZoneWidget *>(helper.getCurrentDragWidget());
     if (!zoneWidget) {
diff --git a/gui/src/Visualization/VisualizationWidget.cpp b/gui/src/Visualization/VisualizationWidget.cpp
index 91d1ce7..0905d1d 100644
--- a/gui/src/Visualization/VisualizationWidget.cpp
+++ b/gui/src/Visualization/VisualizationWidget.cpp
@@ -12,7 +12,7 @@
 
 #include "ui_VisualizationWidget.h"
 
-#include "DragAndDrop/DragDropHelper.h"
+#include "DragAndDrop/DragDropGuiController.h"
 #include "SqpApplication.h"
 
 #include <QToolButton>
@@ -84,7 +84,7 @@ VisualizationWidget::VisualizationWidget(QWidget *parent)
     connect(addTabViewButton, &QToolButton::clicked, addTabView);
     connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
 
-    sqpApp->dragDropHelper().addDragDropTabBar(ui->tabWidget->tabBar());
+    sqpApp->dragDropGuiController().addDragDropTabBar(ui->tabWidget->tabBar());
 
     // Adds default tab
     addTabView();
@@ -92,7 +92,7 @@ VisualizationWidget::VisualizationWidget(QWidget *parent)
 
 VisualizationWidget::~VisualizationWidget()
 {
-    sqpApp->dragDropHelper().removeDragDropTabBar(ui->tabWidget->tabBar());
+    sqpApp->dragDropGuiController().removeDragDropTabBar(ui->tabWidget->tabBar());
     delete ui;
 }
 
diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp
index 6c93f50..64f7413 100644
--- a/gui/src/Visualization/VisualizationZoneWidget.cpp
+++ b/gui/src/Visualization/VisualizationZoneWidget.cpp
@@ -16,7 +16,7 @@
 
 #include <Visualization/operations/FindVariableOperation.h>
 
-#include <DragAndDrop/DragDropHelper.h>
+#include <DragAndDrop/DragDropGuiController.h>
 #include <QUuid>
 #include <SqpApplication.h>
 #include <cmath>
@@ -86,7 +86,7 @@ VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *p
 
     ui->zoneNameLabel->setText(name);
 
-    ui->dragDropContainer->setPlaceHolderType(DragDropHelper::PlaceHolderType::Graph);
+    ui->dragDropContainer->setPlaceHolderType(DragDropGuiController::PlaceHolderType::Graph);
     ui->dragDropContainer->setMimeType(MIME_TYPE_GRAPH,
                                        VisualizationDragDropContainer::DropBehavior::Inserted);
     ui->dragDropContainer->setMimeType(
@@ -98,8 +98,8 @@ VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *p
     ui->dragDropContainer->setMimeType(MIME_TYPE_SELECTION_ZONE,
                                        VisualizationDragDropContainer::DropBehavior::Forbidden);
     ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
-        return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,
-                                                                      ui->dragDropContainer);
+        return sqpApp->dragDropGuiController().checkMimeDataForVisualization(mimeData,
+                                                                             ui->dragDropContainer);
     });
 
     auto acceptDragWidgetFun = [](auto dragWidget, auto mimeData) {
@@ -501,7 +501,7 @@ void VisualizationZoneWidget::dropMimeDataOnGraph(VisualizationDragWidget *dragW
 void VisualizationZoneWidget::VisualizationZoneWidgetPrivate::dropGraph(
     int index, VisualizationZoneWidget *zoneWidget)
 {
-    auto &helper = sqpApp->dragDropHelper();
+    auto &helper = sqpApp->dragDropGuiController();
 
     auto graphWidget = qobject_cast<VisualizationGraphWidget *>(helper.getCurrentDragWidget());
     if (!graphWidget) {