diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80e1f22b..73ed42ee 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,8 +44,8 @@ set(DOCKSLIBS_SRCS
     multisplitter/Item.cpp
     multisplitter/MultiSplitterLayout.cpp
     multisplitter/MultiSplitterLayout_p.h
-    multisplitter/MultiSplitterWidget.cpp
-    multisplitter/MultiSplitterWidget_p.h
+    multisplitter/MultiSplitter.cpp
+    multisplitter/MultiSplitter_p.h
     multisplitter/Separator.cpp
     # indicators/AnimatedIndicators.cpp
     indicators/ClassicIndicators.cpp
diff --git a/src/DropArea_p.h b/src/DropArea_p.h
index 5fb837e1..22afb170 100644
--- a/src/DropArea_p.h
+++ b/src/DropArea_p.h
@@ -31,7 +31,7 @@
 #include "docks_export.h"
 #include "Frame_p.h"
 #include "KDDockWidgets.h"
-#include "multisplitter/MultiSplitterWidget_p.h"
+#include "multisplitter/MultiSplitter_p.h"
 #include "multisplitter/MultiSplitterLayout_p.h"
 #include "DropIndicatorOverlayInterface_p.h"
 
@@ -45,7 +45,7 @@ class DropIndicatorOverlayInterface;
 struct WindowBeingDragged;
 
 /**
- * @brief A MultiSplitterWidget with support for drop indicators when hovering over.
+ * @brief A MultiSplitter with support for drop indicators when hovering over.
  */
 class DOCKS_EXPORT_FOR_UNIT_TESTS DropArea : public MultiSplitter
 {
diff --git a/src/LastPosition.cpp b/src/LastPosition.cpp
index c298d1dd..fa131d1f 100644
--- a/src/LastPosition.cpp
+++ b/src/LastPosition.cpp
@@ -27,7 +27,7 @@
 #include "LastPosition_p.h"
 #include "DockRegistry_p.h"
 #include "multisplitter/MultiSplitterLayout_p.h"
-#include "multisplitter/MultiSplitterWidget_p.h"
+#include "multisplitter/MultiSplitter_p.h"
 
 #include <algorithm>
 
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 45998979..87ee99b8 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -32,7 +32,7 @@
 #include "DockRegistry_p.h"
 #include "DropAreaWithCentralFrame_p.h"
 #include "multisplitter/MultiSplitterLayout_p.h"
-#include "multisplitter/MultiSplitterWidget_p.h"
+#include "multisplitter/MultiSplitter_p.h"
 
 #include <QApplication>
 #include <QDataStream>
diff --git a/src/multisplitter/Anchor.cpp b/src/multisplitter/Anchor.cpp
index e92848a7..cca98daa 100644
--- a/src/multisplitter/Anchor.cpp
+++ b/src/multisplitter/Anchor.cpp
@@ -20,7 +20,7 @@
 
 #include "Anchor_p.h"
 #include "MultiSplitterLayout_p.h"
-#include "MultiSplitterWidget_p.h"
+#include "MultiSplitter_p.h"
 #include "Logging_p.h"
 #include "LayoutSaver.h"
 #include "Config.h"
diff --git a/src/multisplitter/AnchorGroup.cpp b/src/multisplitter/AnchorGroup.cpp
index 4ba804e9..ebbf13a0 100644
--- a/src/multisplitter/AnchorGroup.cpp
+++ b/src/multisplitter/AnchorGroup.cpp
@@ -21,7 +21,7 @@
 #include "AnchorGroup_p.h"
 #include "Anchor_p.h"
 #include "MultiSplitterLayout_p.h"
-#include "MultiSplitterWidget_p.h"
+#include "MultiSplitter_p.h"
 #include "Logging_p.h"
 
 
@@ -424,7 +424,7 @@ void AnchorGroup::addItem(MultiSplitterLayout *sourceMultiSplitter)
     left->consume(sourceAnchorGroup.left);
     right->consume(sourceAnchorGroup.right);
 
-    delete sourceMultiSplitter->multiSplitter(); // Delete MultiSplitterWidget and MultiSplitterLayout
+    delete sourceMultiSplitter->multiSplitter(); // Delete MultiSplitter and MultiSplitterLayout
 }
 
 void AnchorGroup::removeItem(Item *item)
diff --git a/src/multisplitter/Item.cpp b/src/multisplitter/Item.cpp
index a1ff5b96..467f2307 100644
--- a/src/multisplitter/Item.cpp
+++ b/src/multisplitter/Item.cpp
@@ -20,7 +20,7 @@
 
 #include "Item_p.h"
 #include "MultiSplitterLayout_p.h"
-#include "MultiSplitterWidget_p.h"
+#include "MultiSplitter_p.h"
 #include "Logging_p.h"
 #include "AnchorGroup_p.h"
 #include "Frame_p.h"
diff --git a/src/multisplitter/MultiSplitterWidget.cpp b/src/multisplitter/MultiSplitter.cpp
similarity index 98%
rename from src/multisplitter/MultiSplitterWidget.cpp
rename to src/multisplitter/MultiSplitter.cpp
index 9032d783..072be674 100644
--- a/src/multisplitter/MultiSplitterWidget.cpp
+++ b/src/multisplitter/MultiSplitter.cpp
@@ -27,7 +27,7 @@
  */
 
 
-#include "MultiSplitterWidget_p.h"
+#include "MultiSplitter_p.h"
 #include "MultiSplitterLayout_p.h"
 #include "Logging_p.h"
 #include "MainWindow.h"
diff --git a/src/multisplitter/MultiSplitterLayout.cpp b/src/multisplitter/MultiSplitterLayout.cpp
index 3ca778a3..ac87c988 100644
--- a/src/multisplitter/MultiSplitterLayout.cpp
+++ b/src/multisplitter/MultiSplitterLayout.cpp
@@ -20,7 +20,7 @@
 
 #include "MultiSplitterLayout_p.h"
 #include "Logging_p.h"
-#include "MultiSplitterWidget_p.h"
+#include "MultiSplitter_p.h"
 #include "Frame_p.h"
 #include "FloatingWindow_p.h"
 #include "DockWidgetBase.h"
@@ -327,13 +327,13 @@ void MultiSplitterLayout::addWidget(QWidget *w, Location location, Frame *relati
         }
     }
 
-    auto sourceMultiSplitterWidget = qobject_cast<MultiSplitter *>(w);
-    auto sourceMultiSplitter = sourceMultiSplitterWidget ? sourceMultiSplitterWidget->multiSplitterLayout()
+    auto sourceMultiSplitter = qobject_cast<MultiSplitter *>(w);
+    auto sourceMultiSplitterLayout = sourceMultiSplitter ? sourceMultiSplitter->multiSplitterLayout()
                                                          : nullptr;
 
-    if (sourceMultiSplitter) {
-        auto items = sourceMultiSplitter->items();
-        targetAnchorGroup.addItem(sourceMultiSplitter);
+    if (sourceMultiSplitterLayout) {
+        auto items = sourceMultiSplitterLayout->items();
+        targetAnchorGroup.addItem(sourceMultiSplitterLayout);
         addItems_internal(items);
     } else {
         Q_ASSERT(frame);
diff --git a/src/multisplitter/MultiSplitterLayout_p.h b/src/multisplitter/MultiSplitterLayout_p.h
index d394068d..b4402fdd 100644
--- a/src/multisplitter/MultiSplitterLayout_p.h
+++ b/src/multisplitter/MultiSplitterLayout_p.h
@@ -114,7 +114,7 @@ class DOCKS_EXPORT_FOR_UNIT_TESTS MultiSplitterLayout : public QObject // clazy:
 public:
 
     /**
-     * @brief Constructor. MultiSplitterLayout is created by MultiSplitterWidget only.
+     * @brief Constructor. MultiSplitterLayout is created by MultiSplitter only.
      */
     explicit MultiSplitterLayout(MultiSplitter *parent);
     ~MultiSplitterLayout() override;
@@ -135,7 +135,7 @@ public:
     void addWidget(QWidget *widget, KDDockWidgets::Location location, Frame *relativeTo = nullptr, AddingOption option = {});
 
     /**
-     * Adds an entire MultiSplitterWidget into this layout. The donor MultiSplitterWidget will be deleted
+     * Adds an entire MultiSplitter into this layout. The donor MultiSplitter will be deleted
      * after all its Frames are stolen. All added Frames will preserve their original layout, so,
      * if widgetFoo was at the left of widgetBar when in the donor splitter, then it will still be at left
      * of widgetBar when the whole splitter is dropped into this one.
@@ -280,13 +280,13 @@ public:
 
     /**
      * @brief returns the contents width.
-     * Usually it's the same width as the respective parent MultiSplitterWidget.
+     * Usually it's the same width as the respective parent MultiSplitter.
      */
     int contentsWidth() const { return m_contentSize.width(); }
 
     /**
      * @brief returns the contents height.
-     * Usually it's the same height as the respective parent MultiSplitterWidget.
+     * Usually it's the same height as the respective parent MultiSplitter.
      */
     int contentsHeight() const { return m_contentSize.height(); }
 
diff --git a/src/multisplitter/MultiSplitterWidget_p.h b/src/multisplitter/MultiSplitter_p.h
similarity index 100%
rename from src/multisplitter/MultiSplitterWidget_p.h
rename to src/multisplitter/MultiSplitter_p.h
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index 913ed0a8..4ae546c8 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -32,7 +32,7 @@
 #include "Utils_p.h"
 #include "LayoutSaver.h"
 #include "TabWidget_p.h"
-#include "multisplitter/MultiSplitterWidget_p.h"
+#include "multisplitter/MultiSplitter_p.h"
 #include "LastPosition_p.h"
 #include "utils.h"