diff --git a/src/Config.h b/src/Config.h
index efc3313e..0fd9501b 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -35,11 +35,11 @@ namespace Controllers {
 class DockWidgetBase;
 }
 
-class MainWindowBase;
+class MainWindow;
 class FrameworkWidgetFactory;
 
 typedef KDDockWidgets::Controllers::DockWidgetBase *(*DockWidgetFactoryFunc)(const QString &name);
-typedef KDDockWidgets::MainWindowBase *(*MainWindowFactoryFunc)(const QString &name);
+typedef KDDockWidgets::MainWindow *(*MainWindowFactoryFunc)(const QString &name);
 
 /// @brief Function to allow more granularity to disallow where widgets are dropped
 ///
diff --git a/src/FrameworkWidgetFactory.cpp b/src/FrameworkWidgetFactory.cpp
index 3b54993e..d134d847 100644
--- a/src/FrameworkWidgetFactory.cpp
+++ b/src/FrameworkWidgetFactory.cpp
@@ -88,7 +88,7 @@ View *DefaultWidgetFactory::createSeparator(Controllers::Separator *controller,
     return new Views::Separator_qtwidgets(controller, parent ? static_cast<Views::View_qtwidgets<QWidget> *>(parent) : nullptr);
 }
 
-View *DefaultWidgetFactory::createFloatingWindow(Controllers::FloatingWindow *controller, MainWindowBase *parent, Qt::WindowFlags windowFlags) const
+View *DefaultWidgetFactory::createFloatingWindow(Controllers::FloatingWindow *controller, MainWindow *parent, Qt::WindowFlags windowFlags) const
 {
     return new Views::FloatingWindow_qtwidgets(controller, parent, windowFlags);
 }
@@ -117,7 +117,7 @@ QWidgetOrQuick *DefaultWidgetFactory::createRubberBand(QWidgetOrQuick *parent) c
     return new QRubberBand(QRubberBand::Rectangle, parent);
 }
 
-View *DefaultWidgetFactory::createSideBar(Controllers::SideBar *controller, MainWindowBase *parent) const
+View *DefaultWidgetFactory::createSideBar(Controllers::SideBar *controller, MainWindow *parent) const
 {
     return new Views::SideBar_qtwidgets(controller, parent);
 }
diff --git a/src/FrameworkWidgetFactory.h b/src/FrameworkWidgetFactory.h
index e847898c..c5ecdfa9 100644
--- a/src/FrameworkWidgetFactory.h
+++ b/src/FrameworkWidgetFactory.h
@@ -37,7 +37,7 @@ class Widget;
 
 namespace KDDockWidgets {
 
-class MainWindowBase;
+class MainWindow;
 class DropIndicatorOverlayInterface;
 class TabWidget;
 class DropArea;
@@ -126,7 +126,7 @@ public:
     ///       you also need to override the overloads below.
     ///@param parent Just forward to FloatingWindow's constructor.
     virtual View *createFloatingWindow(Controllers::FloatingWindow *controller,
-                                       MainWindowBase *parent = nullptr,
+                                       MainWindow *parent = nullptr,
                                        Qt::WindowFlags windowFlags = {}) const = 0;
 
     ///@brief Called internally by the framework to create a DropIndicatorOverlayInterface
@@ -141,7 +141,7 @@ public:
     ///@brief Called internally by the framework to create a SideBar
     ///@param loc The side-bar location without the main window. Just forward into your SideBar sub-class ctor.
     ///@param parent The MainWindow. Just forward into your SideBar sub-class ctor.
-    virtual View *createSideBar(Controllers::SideBar *, MainWindowBase *parent) const = 0;
+    virtual View *createSideBar(Controllers::SideBar *, MainWindow *parent) const = 0;
 
 #ifdef KDDOCKWIDGETS_QTWIDGETS
     ///@brief Called internally by the framework to create a title bar button
@@ -177,11 +177,11 @@ public:
     View *createTabBar(Controllers::TabBar *tabBar, View *parent) const override;
     View *createSeparator(Controllers::Separator *, View *parent = nullptr) const override;
     View *createFloatingWindow(Controllers::FloatingWindow *,
-                               MainWindowBase *parent = nullptr,
+                               MainWindow *parent = nullptr,
                                Qt::WindowFlags windowFlags = {}) const override;
     DropIndicatorOverlayInterface *createDropIndicatorOverlay(DropArea *) const override;
     QWidgetOrQuick *createRubberBand(QWidgetOrQuick *parent) const override;
-    View *createSideBar(Controllers::SideBar *, MainWindowBase *parent) const override;
+    View *createSideBar(Controllers::SideBar *, MainWindow *parent) const override;
 
 #ifdef KDDOCKWIDGETS_QTWIDGETS
     QAbstractButton *createTitleBarButton(QWidget *parent, TitleBarButtonType) const override;
diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp
index cc9ecc42..89229b05 100644
--- a/src/LayoutSaver.cpp
+++ b/src/LayoutSaver.cpp
@@ -150,9 +150,9 @@ QByteArray LayoutSaver::serializeLayout() const
     // Just a simplification. One less type of windows to handle.
     d->m_dockRegistry->ensureAllFloatingWidgetsAreMorphed();
 
-    const MainWindowBase::List mainWindows = d->m_dockRegistry->mainwindows();
+    const auto mainWindows = d->m_dockRegistry->mainwindows();
     layout.mainWindows.reserve(mainWindows.size());
-    for (MainWindowBase *mainWindow : mainWindows) {
+    for (auto mainWindow : mainWindows) {
         if (d->matchesAffinity(mainWindow->affinities()))
             layout.mainWindows.push_back(mainWindow->serialize());
     }
@@ -236,7 +236,7 @@ bool LayoutSaver::restoreLayout(const QByteArray &data)
 
     // 1. Restore main windows
     for (const LayoutSaver::MainWindow &mw : qAsConst(layout.mainWindows)) {
-        MainWindowBase *mainWindow = d->m_dockRegistry->mainWindowByName(mw.uniqueName);
+        auto mainWindow = d->m_dockRegistry->mainWindowByName(mw.uniqueName);
         if (!mainWindow) {
             if (auto mwFunc = Config::self().mainWindowFactoryFunc()) {
                 mainWindow = mwFunc(mw.uniqueName);
@@ -267,8 +267,8 @@ bool LayoutSaver::restoreLayout(const QByteArray &data)
         if (!d->matchesAffinity(fw.affinities) || fw.skipsRestore())
             continue;
 
-        MainWindowBase *parent = fw.parentIndex == -1 ? nullptr
-                                                      : DockRegistry::self()->mainwindows().at(fw.parentIndex);
+        auto parent = fw.parentIndex == -1 ? nullptr
+                                           : DockRegistry::self()->mainwindows().at(fw.parentIndex);
 
         auto floatingWindow = new Controllers::FloatingWindow({}, parent);
         fw.floatingWindowInstance = floatingWindow;
@@ -380,7 +380,7 @@ void LayoutSaver::Private::floatWidgetsWhichSkipRestore(const QStringList &mainW
     // If they were previously docked we need to float them, as the main window they were on will
     // be loading a new layout.
 
-    for (MainWindowBase *mw : DockRegistry::self()->mainWindows(mainWindowNames)) {
+    for (auto mw : DockRegistry::self()->mainWindows(mainWindowNames)) {
         const Controllers::DockWidgetBase::List docks = mw->layoutWidget()->dockWidgets();
         for (auto dw : docks) {
             if (dw->skipsRestore()) {
@@ -396,7 +396,7 @@ void LayoutSaver::Private::floatUnknownWidgets(const LayoutSaver::Layout &layout
     // When restoring such a file, we need to float any visible dock widgets which it doesn't know about
     // so we can restore the MainWindow layout properly
 
-    for (MainWindowBase *mw : DockRegistry::self()->mainWindows(layout.mainWindowNames())) {
+    for (auto mw : DockRegistry::self()->mainWindows(layout.mainWindowNames())) {
         const Controllers::DockWidgetBase::List docks = mw->layoutWidget()->dockWidgets();
         for (DockWidgetBase *dw : docks) {
             if (!layout.containsDockWidget(dw->uniqueName())) {
@@ -1028,7 +1028,7 @@ void LayoutSaver::Placeholder::fromVariantMap(const QVariantMap &map)
     mainWindowUniqueName = map.value(QStringLiteral("mainWindowUniqueName")).toString();
 }
 
-static QScreen *screenForMainWindow(MainWindowBase *mw)
+static QScreen *screenForMainWindow(MainWindow *mw)
 {
     // Workaround for 5.12 which doesn't have QWidget::screen().
 
diff --git a/src/controllers/DockWidget.cpp b/src/controllers/DockWidget.cpp
index 05e1aedc..564ee36a 100644
--- a/src/controllers/DockWidget.cpp
+++ b/src/controllers/DockWidget.cpp
@@ -122,7 +122,7 @@ void DockWidgetBase::addDockWidgetToContainingWindow(DockWidgetBase *other,
                                                      DockWidgetBase *relativeTo,
                                                      InitialOption initialOption)
 {
-    if (auto mainWindow = qobject_cast<MainWindowBase *>(view()->asQWidget()->window())) {
+    if (auto mainWindow = qobject_cast<MainWindow *>(view()->asQWidget()->window())) {
         // It's inside a main window. Simply use the main window API.
         mainWindow->addDockWidget(other, location, relativeTo, initialOption);
         return;
@@ -412,7 +412,7 @@ void DockWidgetBase::raise()
 
 bool DockWidgetBase::isMainWindow() const
 {
-    return qobject_cast<MainWindowBase *>(widget());
+    return qobject_cast<MainWindow *>(widget());
 }
 
 bool DockWidgetBase::isInMainWindow() const
@@ -420,7 +420,7 @@ bool DockWidgetBase::isInMainWindow() const
     return d->mainWindow() != nullptr;
 }
 
-MainWindowBase *DockWidgetBase::mainWindow() const
+MainWindow *DockWidgetBase::mainWindow() const
 {
     return d->mainWindow();
 }
@@ -456,13 +456,13 @@ void DockWidgetBase::setAffinities(const QStringList &affinityNames)
 
 void DockWidgetBase::moveToSideBar()
 {
-    if (MainWindowBase *m = mainWindow())
+    if (MainWindow *m = mainWindow())
         m->moveToSideBar(this);
 }
 
 bool DockWidgetBase::isOverlayed() const
 {
-    if (MainWindowBase *m = mainWindow())
+    if (MainWindow *m = mainWindow())
         return m->overlayedDockWidget() == this;
 
     return false;
@@ -633,9 +633,9 @@ DockWidgetBase::Private *DockWidgetBase::dptr() const
 
 QPoint DockWidgetBase::Private::defaultCenterPosForFloating()
 {
-    MainWindowBase::List mainWindows = DockRegistry::self()->mainwindows();
+    MainWindow::List mainWindows = DockRegistry::self()->mainwindows();
     // We don't care about multiple mainwindows yet. Or, let's just say that the first one is more main than the others
-    MainWindowBase *mw = mainWindows.isEmpty() ? nullptr : mainWindows.constFirst();
+    MainWindow *mw = mainWindows.isEmpty() ? nullptr : mainWindows.constFirst();
     if (!mw || !q->isFloating())
         return {};
 
diff --git a/src/controllers/DockWidget.h b/src/controllers/DockWidget.h
index 52da2a62..759f9127 100644
--- a/src/controllers/DockWidget.h
+++ b/src/controllers/DockWidget.h
@@ -38,7 +38,7 @@ using DockWidgetBase = KDDockWidgets::Controllers::DockWidgetBase;
 class DragController;
 class DockRegistry;
 class LayoutSaver;
-class MainWindowBase;
+class MainWindow;
 class StateDragging;
 class FrameQuick;
 class DockWidgetQuick;
@@ -375,7 +375,7 @@ public:
 
     /// @brief Returns the main window this dock widget is in. nullptr if it's not inside a main window
     /// Also returns nullptr if it's minimized to a sidebar
-    MainWindowBase *mainWindow() const;
+    MainWindow *mainWindow() const;
 
     ///@brief Returns whether This or any child of this dock widget is focused
     /// Not to be confused with QWidget::hasFocus(), which just refers to 1 widget. This includes
@@ -540,7 +540,7 @@ private:
     friend class KDDockWidgets::DragController;
     friend class KDDockWidgets::DockRegistry;
     friend class KDDockWidgets::LayoutSaver;
-    friend class KDDockWidgets::MainWindowBase;
+    friend class KDDockWidgets::MainWindow;
     friend class KDDockWidgets::FrameQuick;
     friend class KDDockWidgets::DockWidgetQuick;
 
diff --git a/src/controllers/DockWidget_p.h b/src/controllers/DockWidget_p.h
index 7643ad94..72df0da5 100644
--- a/src/controllers/DockWidget_p.h
+++ b/src/controllers/DockWidget_p.h
@@ -56,7 +56,7 @@ public:
         return view ? view->floatingWindow() : nullptr;
     }
 
-    MainWindowBase *mainWindow() const
+    MainWindow *mainWindow() const
     {
         if (q->view()->isWindow())
             return nullptr;
@@ -64,7 +64,7 @@ public:
         // Note: Don't simply use window(), as the MainWindow might be embedded into something else
         QWidgetOrQuick *p = q->view()->asQWidget()->parentWidget();
         while (p) {
-            if (auto window = qobject_cast<MainWindowBase *>(p))
+            if (auto window = qobject_cast<MainWindow *>(p))
                 return window;
 
             if (p->isWindow())
diff --git a/src/controllers/FloatingWindow.cpp b/src/controllers/FloatingWindow.cpp
index b967cb1f..41a4fb48 100644
--- a/src/controllers/FloatingWindow.cpp
+++ b/src/controllers/FloatingWindow.cpp
@@ -54,7 +54,7 @@ static Qt::WindowFlags windowFlagsToUse()
     return Qt::Tool;
 }
 
-static MainWindowBase *hackFindParentHarder(Controllers::Frame *frame, MainWindowBase *candidateParent)
+static MainWindow *hackFindParentHarder(Controllers::Frame *frame, MainWindow *candidateParent)
 {
     if (Config::self().internalFlags() & Config::InternalFlag_DontUseParentForFloatingWindows) {
         return nullptr;
@@ -68,7 +68,7 @@ static MainWindowBase *hackFindParentHarder(Controllers::Frame *frame, MainWindo
     if (candidateParent)
         return candidateParent;
 
-    const MainWindowBase::List windows = DockRegistry::self()->mainwindows();
+    const MainWindow::List windows = DockRegistry::self()->mainwindows();
 
     if (windows.isEmpty())
         return nullptr;
@@ -77,7 +77,7 @@ static MainWindowBase *hackFindParentHarder(Controllers::Frame *frame, MainWindo
         return windows.first();
     } else {
         const QStringList affinities = frame ? frame->affinities() : QStringList();
-        const MainWindowBase::List mainWindows = DockRegistry::self()->mainWindowsWithAffinity(affinities);
+        const MainWindow::List mainWindows = DockRegistry::self()->mainWindowsWithAffinity(affinities);
 
         if (mainWindows.isEmpty()) {
             qWarning() << Q_FUNC_INFO << "No window with affinity" << affinities << "found";
@@ -88,14 +88,14 @@ static MainWindowBase *hackFindParentHarder(Controllers::Frame *frame, MainWindo
     }
 }
 
-MainWindowBase *actualParent(MainWindowBase *candidate)
+MainWindow *actualParent(MainWindow *candidate)
 {
     return (Config::self().internalFlags() & Config::InternalFlag_DontUseParentForFloatingWindows)
         ? nullptr
         : candidate;
 }
 
-FloatingWindow::FloatingWindow(QRect suggestedGeometry, MainWindowBase *parent)
+FloatingWindow::FloatingWindow(QRect suggestedGeometry, MainWindow *parent)
     : Controller(Config::self().frameworkWidgetFactory()->createFloatingWindow(this, actualParent(parent), windowFlagsToUse()))
     , Draggable(view()->asQWidget(), KDDockWidgets::usesNativeDraggingAndResizing()) // FloatingWindow is only draggable when using a native title bar. Otherwise the KDDockWidgets::TitleBar is the draggable
     , m_dropArea(new DropArea(view()->asQWidget()))
@@ -137,7 +137,7 @@ FloatingWindow::FloatingWindow(QRect suggestedGeometry, MainWindowBase *parent)
     m_layoutDestroyedConnection = connect(m_dropArea, &QObject::destroyed, this, &FloatingWindow::scheduleDeleteLater);
 }
 
-FloatingWindow::FloatingWindow(Controllers::Frame *frame, QRect suggestedGeometry, MainWindowBase *parent)
+FloatingWindow::FloatingWindow(Controllers::Frame *frame, QRect suggestedGeometry, MainWindow *parent)
     : FloatingWindow(suggestedGeometry, hackFindParentHarder(frame, parent))
 {
     QScopedValueRollback<bool> guard(m_disableSetVisible, true);
@@ -530,7 +530,7 @@ LayoutSaver::FloatingWindow FloatingWindow::serialize() const
     fw.affinities = affinities();
     fw.windowState = windowStateOverride();
 
-    auto mainWindow = qobject_cast<MainWindowBase *>(view()->asQWidget()->parentWidget());
+    auto mainWindow = qobject_cast<MainWindow *>(view()->asQWidget()->parentWidget());
     fw.parentIndex = mainWindow ? DockRegistry::self()->mainwindows().indexOf(mainWindow)
                                 : -1;
 
@@ -600,9 +600,9 @@ bool FloatingWindow::isWindow() const
     return true;
 }
 
-MainWindowBase *FloatingWindow::mainWindow() const
+MainWindow *FloatingWindow::mainWindow() const
 {
-    return qobject_cast<MainWindowBase *>(parent());
+    return qobject_cast<MainWindow *>(parent());
 }
 
 QMargins FloatingWindow::contentMargins() const
diff --git a/src/controllers/FloatingWindow.h b/src/controllers/FloatingWindow.h
index c5c8e181..c196df70 100644
--- a/src/controllers/FloatingWindow.h
+++ b/src/controllers/FloatingWindow.h
@@ -22,7 +22,7 @@
 #include "kddockwidgets/docks_export.h"
 
 namespace KDDockWidgets {
-class MainWindowBase;
+class MainWindow;
 class DropArea;
 class MultiSplitter;
 class LayoutWidget;
@@ -37,8 +37,8 @@ class DOCKS_EXPORT FloatingWindow : public Controller, public Draggable
 {
     Q_OBJECT
 public:
-    explicit FloatingWindow(QRect suggestedGeometry, MainWindowBase *parent = nullptr);
-    explicit FloatingWindow(Controllers::Frame *frame, QRect suggestedGeometry, MainWindowBase *parent = nullptr);
+    explicit FloatingWindow(QRect suggestedGeometry, MainWindow *parent = nullptr);
+    explicit FloatingWindow(Controllers::Frame *frame, QRect suggestedGeometry, MainWindow *parent = nullptr);
     virtual ~FloatingWindow() override;
 
     bool deserialize(const LayoutSaver::FloatingWindow &);
@@ -169,7 +169,7 @@ public:
     /// @brief Returns the MainWindow which is the transient parent of this FloatingWindow
     /// Can be nullptr if you create dock widgets before the main window. Can also be some
     /// arbitrary value if you have more than one main window.
-    MainWindowBase *mainWindow() const;
+    MainWindow *mainWindow() const;
 
     ///@brief Returns the contents margins
     QMargins contentMargins() const;
diff --git a/src/controllers/Frame.cpp b/src/controllers/Frame.cpp
index cb0c6e8e..128fb77c 100644
--- a/src/controllers/Frame.cpp
+++ b/src/controllers/Frame.cpp
@@ -560,7 +560,7 @@ FloatingWindow *Frame::floatingWindow() const
 
     auto p = view()->asQWidget()->parentWidget();
     while (p) {
-        if (qobject_cast<KDDockWidgets::MainWindowBase *>(p))
+        if (qobject_cast<KDDockWidgets::MainWindow *>(p))
             return nullptr;
 
         if (auto fwView = qobject_cast<Views::FloatingWindow_qtwidgets *>(p))
@@ -751,7 +751,7 @@ Frame *Frame::deserialize(const LayoutSaver::Frame &f)
             qWarning() << Q_FUNC_INFO << "Frame is the persistent central frame but doesn't have"
                        << "an associated window name";
         } else {
-            if (MainWindowBase *mw = DockRegistry::self()->mainWindowByName(f.mainWindowUniqueName)) {
+            if (MainWindow *mw = DockRegistry::self()->mainWindowByName(f.mainWindowUniqueName)) {
                 frame = mw->dropArea()->m_centralFrame;
                 if (!frame) {
                     // Doesn't happen...
@@ -795,7 +795,7 @@ LayoutSaver::Frame Frame::serialize() const
     frame.currentTabIndex = currentTabIndex();
     frame.id = view()->id(); // for coorelation purposes
 
-    if (MainWindowBase *mw = mainWindow())
+    if (MainWindow *mw = mainWindow())
         frame.mainWindowUniqueName = mw->uniqueName();
 
     for (DockWidgetBase *dock : docks)
@@ -861,7 +861,7 @@ QRect Frame::dragRect() const
     return qobject_cast<Views::Frame_qtwidgets *>(view()->asQWidget())->dragRect();
 }
 
-MainWindowBase *Frame::mainWindow() const
+MainWindow *Frame::mainWindow() const
 {
     return m_layoutWidget ? m_layoutWidget->mainWindow() : nullptr;
 }
diff --git a/src/controllers/Frame.h b/src/controllers/Frame.h
index b35fa6d4..b772fa1c 100644
--- a/src/controllers/Frame.h
+++ b/src/controllers/Frame.h
@@ -27,7 +27,7 @@
 class TestDocks;
 
 namespace KDDockWidgets {
-class MainWindowBase;
+class MainWindow;
 class MDILayoutWidget;
 class WidgetResizeHandler;
 }
@@ -177,7 +177,7 @@ public:
      * @brief Returns the main window this frame is in.
      * nullptr if not inside a main window.
      */
-    MainWindowBase *mainWindow() const;
+    MainWindow *mainWindow() const;
 
     /**
      * @brief Puts the Frame back in its previous main window position
diff --git a/src/controllers/MainWindow.cpp b/src/controllers/MainWindow.cpp
index 49ede8d6..0293d0e6 100644
--- a/src/controllers/MainWindow.cpp
+++ b/src/controllers/MainWindow.cpp
@@ -45,7 +45,7 @@
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Controllers;
 
-static LayoutWidget *createLayoutWidget(MainWindowBase *mainWindow, MainWindowOptions options)
+static LayoutWidget *createLayoutWidget(MainWindow *mainWindow, MainWindowOptions options)
 {
     if (options & MainWindowOption_MDI)
         return new MDILayoutWidget(mainWindow);
@@ -53,10 +53,10 @@ static LayoutWidget *createLayoutWidget(MainWindowBase *mainWindow, MainWindowOp
     return new DropAreaWithCentralFrame(mainWindow, options);
 }
 
-class MainWindowBase::Private
+class MainWindow::Private
 {
 public:
-    explicit Private(MainWindowBase *mainWindow, const QString &uniqueName, MainWindowOptions options)
+    explicit Private(MainWindow *mainWindow, const QString &uniqueName, MainWindowOptions options)
         : m_options(options)
         , q(mainWindow)
         , m_layoutWidget(createLayoutWidget(mainWindow, options))
@@ -111,30 +111,30 @@ public:
     QString name;
     QStringList affinities;
     const MainWindowOptions m_options;
-    MainWindowBase *const q;
+    MainWindow *const q;
     QPointer<Controllers::DockWidgetBase> m_overlayedDockWidget;
     LayoutWidget *const m_layoutWidget;
     Controllers::DockWidgetBase *const m_persistentCentralDockWidget;
 };
 
-MainWindowBase::MainWindowBase(const QString &uniqueName, KDDockWidgets::MainWindowOptions options,
-                               WidgetType *parent, Qt::WindowFlags flags)
+MainWindow::MainWindow(const QString &uniqueName, KDDockWidgets::MainWindowOptions options,
+                       WidgetType *parent, Qt::WindowFlags flags)
     : QMainWindow(parent, flags)
     , d(new Private(this, uniqueName, options))
 {
     setUniqueName(uniqueName);
 
     connect(d->m_layoutWidget, &LayoutWidget::visibleWidgetCountChanged, this,
-            &MainWindowBase::frameCountChanged);
+            &MainWindow::frameCountChanged);
 }
 
-MainWindowBase::~MainWindowBase()
+MainWindow::~MainWindow()
 {
     DockRegistry::self()->unregisterMainWindow(this);
     delete d;
 }
 
-void MainWindowBase::addDockWidgetAsTab(Controllers::DockWidgetBase *widget)
+void MainWindow::addDockWidgetAsTab(Controllers::DockWidgetBase *widget)
 {
     Q_ASSERT(widget);
     qCDebug(addwidget) << Q_FUNC_INFO << widget;
@@ -166,8 +166,8 @@ void MainWindowBase::addDockWidgetAsTab(Controllers::DockWidgetBase *widget)
     }
 }
 
-void MainWindowBase::addDockWidget(Controllers::DockWidgetBase *dw, Location location,
-                                   Controllers::DockWidgetBase *relativeTo, InitialOption option)
+void MainWindow::addDockWidget(Controllers::DockWidgetBase *dw, Location location,
+                               Controllers::DockWidgetBase *relativeTo, InitialOption option)
 {
     if (dw->options() & Controllers::DockWidgetBase::Option_NotDockable) {
         qWarning() << Q_FUNC_INFO << "Refusing to dock non-dockable widget" << dw;
@@ -182,37 +182,37 @@ void MainWindowBase::addDockWidget(Controllers::DockWidgetBase *dw, Location loc
     dropArea()->addDockWidget(dw, location, relativeTo, option);
 }
 
-QString MainWindowBase::uniqueName() const
+QString MainWindow::uniqueName() const
 {
     return d->name;
 }
 
-MainWindowOptions MainWindowBase::options() const
+MainWindowOptions MainWindow::options() const
 {
     return d->m_options;
 }
 
-DropAreaWithCentralFrame *MainWindowBase::dropArea() const
+DropAreaWithCentralFrame *MainWindow::dropArea() const
 {
     return qobject_cast<DropAreaWithCentralFrame *>(d->m_layoutWidget);
 }
 
-MultiSplitter *MainWindowBase::multiSplitter() const
+MultiSplitter *MainWindow::multiSplitter() const
 {
     return dropArea();
 }
 
-LayoutWidget *MainWindowBase::layoutWidget() const
+LayoutWidget *MainWindow::layoutWidget() const
 {
     return d->m_layoutWidget;
 }
 
-MDILayoutWidget *MainWindowBase::mdiLayoutWidget() const
+MDILayoutWidget *MainWindow::mdiLayoutWidget() const
 {
     return qobject_cast<MDILayoutWidget *>(layoutWidget());
 }
 
-void MainWindowBase::setAffinities(const QStringList &affinityNames)
+void MainWindow::setAffinities(const QStringList &affinityNames)
 {
     QStringList affinities = affinityNames;
     affinities.removeAll(QString());
@@ -230,22 +230,22 @@ void MainWindowBase::setAffinities(const QStringList &affinityNames)
     d->affinities = affinities;
 }
 
-QStringList MainWindowBase::affinities() const
+QStringList MainWindow::affinities() const
 {
     return d->affinities;
 }
 
-void MainWindowBase::layoutEqually()
+void MainWindow::layoutEqually()
 {
     dropArea()->layoutEqually();
 }
 
-void MainWindowBase::layoutParentContainerEqually(Controllers::DockWidgetBase *dockWidget)
+void MainWindow::layoutParentContainerEqually(Controllers::DockWidgetBase *dockWidget)
 {
     dropArea()->layoutParentContainerEqually(dockWidget);
 }
 
-CursorPositions MainWindowBase::Private::allowedResizeSides(SideBarLocation loc) const
+CursorPositions MainWindow::Private::allowedResizeSides(SideBarLocation loc) const
 {
     // When a sidebar is on top, you can only resize its bottom.
     // and so forth...
@@ -266,7 +266,7 @@ CursorPositions MainWindowBase::Private::allowedResizeSides(SideBarLocation loc)
     return CursorPosition_Undefined;
 }
 
-QRect MainWindowBase::Private::rectForOverlay(Controllers::Frame *frame, SideBarLocation location) const
+QRect MainWindow::Private::rectForOverlay(Controllers::Frame *frame, SideBarLocation location) const
 {
     Controllers::SideBar *sb = q->sideBar(location);
     if (!sb)
@@ -366,7 +366,7 @@ static SideBarLocation sideBarLocationForBorder(Layouting::LayoutBorderLocations
     return SideBarLocation::None;
 }
 
-SideBarLocation MainWindowBase::Private::preferredSideBar(Controllers::DockWidgetBase *dw) const
+SideBarLocation MainWindow::Private::preferredSideBar(Controllers::DockWidgetBase *dw) const
 {
     // TODO: Algorithm can still be made smarter
 
@@ -432,7 +432,7 @@ SideBarLocation MainWindowBase::Private::preferredSideBar(Controllers::DockWidge
                              : SideBarLocation::West;
 }
 
-void MainWindowBase::Private::updateOverlayGeometry(QSize suggestedSize)
+void MainWindow::Private::updateOverlayGeometry(QSize suggestedSize)
 {
     if (!m_overlayedDockWidget)
         return;
@@ -484,7 +484,7 @@ void MainWindowBase::Private::updateOverlayGeometry(QSize suggestedSize)
     m_overlayedDockWidget->d->frame()->view()->setGeometry(newGeometry);
 }
 
-void MainWindowBase::Private::clearSideBars()
+void MainWindow::Private::clearSideBars()
 {
     for (auto loc : { SideBarLocation::North, SideBarLocation::South,
                       SideBarLocation::East, SideBarLocation::West }) {
@@ -493,12 +493,12 @@ void MainWindowBase::Private::clearSideBars()
     }
 }
 
-void MainWindowBase::moveToSideBar(Controllers::DockWidgetBase *dw)
+void MainWindow::moveToSideBar(Controllers::DockWidgetBase *dw)
 {
     moveToSideBar(dw, d->preferredSideBar(dw));
 }
 
-void MainWindowBase::moveToSideBar(Controllers::DockWidgetBase *dw, SideBarLocation location)
+void MainWindow::moveToSideBar(Controllers::DockWidgetBase *dw, SideBarLocation location)
 {
     if (dw->isPersistentCentralDockWidget())
         return;
@@ -513,7 +513,7 @@ void MainWindowBase::moveToSideBar(Controllers::DockWidgetBase *dw, SideBarLocat
     }
 }
 
-void MainWindowBase::restoreFromSideBar(DockWidgetBase *dw)
+void MainWindow::restoreFromSideBar(DockWidgetBase *dw)
 {
     // First un-overlay it, if it's overlayed
     if (dw == d->m_overlayedDockWidget)
@@ -530,7 +530,7 @@ void MainWindowBase::restoreFromSideBar(DockWidgetBase *dw)
     dw->setFloating(false); // dock it
 }
 
-void MainWindowBase::overlayOnSideBar(DockWidgetBase *dw)
+void MainWindow::overlayOnSideBar(DockWidgetBase *dw)
 {
     if (!dw || dw->isPersistentCentralDockWidget())
         return;
@@ -561,7 +561,7 @@ void MainWindowBase::overlayOnSideBar(DockWidgetBase *dw)
     Q_EMIT dw->isOverlayedChanged(true);
 }
 
-void MainWindowBase::toggleOverlayOnSideBar(DockWidgetBase *dw)
+void MainWindow::toggleOverlayOnSideBar(DockWidgetBase *dw)
 {
     const bool wasOverlayed = d->m_overlayedDockWidget == dw;
     clearSideBarOverlay(); // Because only 1 dock widget can be overlayed each time
@@ -570,7 +570,7 @@ void MainWindowBase::toggleOverlayOnSideBar(DockWidgetBase *dw)
     }
 }
 
-void MainWindowBase::clearSideBarOverlay(bool deleteFrame)
+void MainWindow::clearSideBarOverlay(bool deleteFrame)
 {
     if (!d->m_overlayedDockWidget)
         return;
@@ -601,7 +601,7 @@ void MainWindowBase::clearSideBarOverlay(bool deleteFrame)
     }
 }
 
-Controllers::SideBar *MainWindowBase::sideBarForDockWidget(const DockWidgetBase *dw) const
+Controllers::SideBar *MainWindow::sideBarForDockWidget(const DockWidgetBase *dw) const
 {
     for (auto loc : { SideBarLocation::North, SideBarLocation::South,
                       SideBarLocation::East, SideBarLocation::West }) {
@@ -615,12 +615,12 @@ Controllers::SideBar *MainWindowBase::sideBarForDockWidget(const DockWidgetBase
     return nullptr;
 }
 
-DockWidgetBase *MainWindowBase::overlayedDockWidget() const
+DockWidgetBase *MainWindow::overlayedDockWidget() const
 {
     return d->m_overlayedDockWidget;
 }
 
-bool MainWindowBase::sideBarIsVisible(SideBarLocation loc) const
+bool MainWindow::sideBarIsVisible(SideBarLocation loc) const
 {
     if (Controllers::SideBar *sb = sideBar(loc)) {
         return !sb->isEmpty(); // isVisible() is always true, but its height is 0 when empty.
@@ -629,7 +629,7 @@ bool MainWindowBase::sideBarIsVisible(SideBarLocation loc) const
     return false;
 }
 
-bool MainWindowBase::anySideBarIsVisible() const
+bool MainWindow::anySideBarIsVisible() const
 {
     for (auto loc : { SideBarLocation::North, SideBarLocation::South,
                       SideBarLocation::East, SideBarLocation::West }) {
@@ -640,12 +640,12 @@ bool MainWindowBase::anySideBarIsVisible() const
     return false;
 }
 
-bool MainWindowBase::isMDI() const
+bool MainWindow::isMDI() const
 {
     return d->m_options & MainWindowOption_MDI;
 }
 
-bool MainWindowBase::closeDockWidgets(bool force)
+bool MainWindow::closeDockWidgets(bool force)
 {
     bool allClosed = true;
 
@@ -675,7 +675,7 @@ bool MainWindowBase::closeDockWidgets(bool force)
     return allClosed;
 }
 
-void MainWindowBase::setUniqueName(const QString &uniqueName)
+void MainWindow::setUniqueName(const QString &uniqueName)
 {
     if (uniqueName.isEmpty())
         return;
@@ -689,13 +689,13 @@ void MainWindowBase::setUniqueName(const QString &uniqueName)
     }
 }
 
-void MainWindowBase::onResized(QResizeEvent *)
+void MainWindow::onResized(QResizeEvent *)
 {
     if (d->m_overlayedDockWidget)
         d->updateOverlayGeometry(d->m_overlayedDockWidget->d->frame()->size());
 }
 
-bool MainWindowBase::deserialize(const LayoutSaver::MainWindow &mw)
+bool MainWindow::deserialize(const LayoutSaver::MainWindow &mw)
 {
     if (mw.options != options()) {
         qWarning() << Q_FUNC_INFO << "Refusing to restore MainWindow with different options"
@@ -740,7 +740,7 @@ bool MainWindowBase::deserialize(const LayoutSaver::MainWindow &mw)
     return success;
 }
 
-LayoutSaver::MainWindow MainWindowBase::serialize() const
+LayoutSaver::MainWindow MainWindow::serialize() const
 {
     LayoutSaver::MainWindow m;
 
@@ -767,7 +767,7 @@ LayoutSaver::MainWindow MainWindowBase::serialize() const
     return m;
 }
 
-QRect MainWindowBase::windowGeometry() const
+QRect MainWindow::windowGeometry() const
 {
     if (QWindow *window = windowHandle())
         return window->geometry();
@@ -775,7 +775,7 @@ QRect MainWindowBase::windowGeometry() const
     return window()->geometry();
 }
 
-void MainWindowBase::setPersistentCentralWidget(QWidgetOrQuick *widget)
+void MainWindow::setPersistentCentralWidget(QWidgetOrQuick *widget)
 {
     if (!d->supportsPersistentCentralWidget()) {
         qWarning() << "MainWindow::setPersistentCentralWidget() requires MainWindowOption_HasCentralWidget";
@@ -790,7 +790,7 @@ void MainWindowBase::setPersistentCentralWidget(QWidgetOrQuick *widget)
     }
 }
 
-QWidgetOrQuick *MainWindowBase::persistentCentralWidget() const
+QWidgetOrQuick *MainWindow::persistentCentralWidget() const
 {
     if (auto dw = d->m_persistentCentralDockWidget)
         return dw->widget();
diff --git a/src/controllers/MainWindow.h b/src/controllers/MainWindow.h
index bba46362..980374d6 100644
--- a/src/controllers/MainWindow.h
+++ b/src/controllers/MainWindow.h
@@ -52,7 +52,7 @@ class DropAreaWithCentralFrame;
  * Do not use instantiate directly in user code. Use MainWindow instead.
  */
 #ifndef PYTHON_BINDINGS // Pyside bug: https://bugreports.qt.io/projects/PYSIDE/issues/PYSIDE-1327
-class DOCKS_EXPORT MainWindowBase : public QMainWindow
+class DOCKS_EXPORT MainWindow : public QMainWindow
 #else
 class DOCKS_EXPORT MainWindowBase : public QMainWindow
 #endif
@@ -63,11 +63,11 @@ class DOCKS_EXPORT MainWindowBase : public QMainWindow
     Q_PROPERTY(KDDockWidgets::MainWindowOptions options READ options CONSTANT)
     Q_PROPERTY(bool isMDI READ isMDI CONSTANT)
 public:
-    typedef QVector<MainWindowBase *> List;
-    explicit MainWindowBase(const QString &uniqueName, MainWindowOptions options = MainWindowOption_HasCentralFrame,
-                            QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
+    typedef QVector<MainWindow *> List;
+    explicit MainWindow(const QString &uniqueName, MainWindowOptions options = MainWindowOption_HasCentralFrame,
+                        QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
 
-    ~MainWindowBase() override;
+    ~MainWindow() override;
 
     /**
      * @brief Docks a DockWidget into the central frame, tabbed.
diff --git a/src/controllers/SideBar.cpp b/src/controllers/SideBar.cpp
index f38ddd8a..ecfdf719 100644
--- a/src/controllers/SideBar.cpp
+++ b/src/controllers/SideBar.cpp
@@ -21,7 +21,7 @@
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Controllers;
 
-SideBar::SideBar(SideBarLocation location, MainWindowBase *parent)
+SideBar::SideBar(SideBarLocation location, MainWindow *parent)
     : Controller(Config::self().frameworkWidgetFactory()->createSideBar(this, parent))
     , m_mainWindow(parent)
     , m_location(location)
@@ -102,7 +102,7 @@ SideBarLocation SideBar::location() const
     return m_location;
 }
 
-MainWindowBase *SideBar::mainWindow() const
+MainWindow *SideBar::mainWindow() const
 {
     return m_mainWindow;
 }
diff --git a/src/controllers/SideBar.h b/src/controllers/SideBar.h
index 66d0ef75..48a0daca 100644
--- a/src/controllers/SideBar.h
+++ b/src/controllers/SideBar.h
@@ -21,7 +21,7 @@
 
 namespace KDDockWidgets {
 
-class MainWindowBase;
+class MainWindow;
 
 namespace Controllers {
 
@@ -31,7 +31,7 @@ class DOCKS_EXPORT SideBar : public Controller
 {
     Q_OBJECT
 public:
-    explicit SideBar(SideBarLocation, MainWindowBase *parent = nullptr);
+    explicit SideBar(SideBarLocation, MainWindow *parent = nullptr);
 
     void addDockWidget(DockWidgetBase *dw);
     void removeDockWidget(DockWidgetBase *dw);
@@ -53,7 +53,7 @@ public:
     SideBarLocation location() const;
 
     /// @brief Returns the main window this side bar belongs to
-    MainWindowBase *mainWindow() const;
+    MainWindow *mainWindow() const;
 
     /// @brief Toggles the dock widget overlay. Equivalent to the user clicking on the button.
     void toggleOverlay(DockWidgetBase *);
@@ -71,7 +71,7 @@ private:
     void onDockWidgetDestroyed(QObject *dw);
     void updateSize();
 
-    MainWindowBase *const m_mainWindow;
+    MainWindow *const m_mainWindow;
     QVector<DockWidgetBase *> m_dockWidgets;
     const SideBarLocation m_location;
     const Qt::Orientation m_orientation;
diff --git a/src/controllers/TitleBar.cpp b/src/controllers/TitleBar.cpp
index ba8d0d07..d4c579cf 100644
--- a/src/controllers/TitleBar.cpp
+++ b/src/controllers/TitleBar.cpp
@@ -83,7 +83,7 @@ bool TitleBar::titleBarIsFocusable() const
 }
 
 
-KDDockWidgets::MainWindowBase *TitleBar::mainWindow() const
+KDDockWidgets::MainWindow *TitleBar::mainWindow() const
 {
     if (m_floatingWindow)
         return nullptr;
@@ -397,7 +397,7 @@ void TitleBar::onAutoHideClicked()
     for (DockWidgetBase *dw : dockwidgets) {
         if (dw->isOverlayed()) {
             // restore
-            MainWindowBase *mainWindow = dw->mainWindow();
+            MainWindow *mainWindow = dw->mainWindow();
             mainWindow->restoreFromSideBar(dw);
         } else {
             dw->moveToSideBar();
diff --git a/src/controllers/TitleBar.h b/src/controllers/TitleBar.h
index b38d5987..49006ec3 100644
--- a/src/controllers/TitleBar.h
+++ b/src/controllers/TitleBar.h
@@ -90,7 +90,7 @@ public:
 
     ///@brief If this title bar belongs to a dock widget docked into the main window, returns the main window
     /// Returns nullptr otherwise
-    MainWindowBase *mainWindow() const;
+    MainWindow *mainWindow() const;
 
     // slots:
     bool onDoubleClicked();
diff --git a/src/layoutlinter_main.cpp b/src/layoutlinter_main.cpp
index 86c48784..905a8416 100644
--- a/src/layoutlinter_main.cpp
+++ b/src/layoutlinter_main.cpp
@@ -33,7 +33,7 @@ static bool lint(const QString &filename)
     };
 
     MainWindowFactoryFunc mwFunc = [](const QString &dwName) {
-        return static_cast<MainWindowBase *>(new Views::MainWindow_qtwidgets(dwName));
+        return static_cast<MainWindow *>(new Views::MainWindow_qtwidgets(dwName));
     };
 
     KDDockWidgets::Config::self().setDockWidgetFactoryFunc(dwFunc);
diff --git a/src/private/DebugWindow.cpp b/src/private/DebugWindow.cpp
index 08103583..e83662d7 100644
--- a/src/private/DebugWindow.cpp
+++ b/src/private/DebugWindow.cpp
@@ -202,7 +202,7 @@ DebugWindow::DebugWindow(QWidget *parent)
     layout->addWidget(button);
     connect(button, &QPushButton::clicked, this, [] {
         const auto mainWindows = DockRegistry::self()->mainwindows();
-        for (MainWindowBase *mainWindow : mainWindows) {
+        for (MainWindow *mainWindow : mainWindows) {
             mainWindow->layoutWidget()->checkSanity();
         }
 
@@ -317,7 +317,7 @@ void DebugWindow::repaintWidgetRecursive(QWidget *w)
 void DebugWindow::dumpDockWidgetInfo()
 {
     const QVector<Controllers::FloatingWindow *> floatingWindows = DockRegistry::self()->floatingWindows();
-    const MainWindowBase::List mainWindows = DockRegistry::self()->mainwindows();
+    const MainWindow::List mainWindows = DockRegistry::self()->mainwindows();
     const DockWidgetBase::List dockWidgets = DockRegistry::self()->dockwidgets();
 
     for (Controllers::FloatingWindow *fw : floatingWindows) {
@@ -325,7 +325,7 @@ void DebugWindow::dumpDockWidgetInfo()
         fw->layoutWidget()->dumpLayout();
     }
 
-    for (MainWindowBase *mw : mainWindows) {
+    for (MainWindow *mw : mainWindows) {
         qDebug() << mw << "; affinities=" << mw->affinities();
         mw->layoutWidget()->dumpLayout();
     }
diff --git a/src/private/DockRegistry.cpp b/src/private/DockRegistry.cpp
index a4aedc3e..3d36d128 100644
--- a/src/private/DockRegistry.cpp
+++ b/src/private/DockRegistry.cpp
@@ -205,7 +205,7 @@ bool DockRegistry::isProbablyObscured(QWindow *window, Controllers::FloatingWind
     // Floating windows are Tool (keep above), unless we disabled it in Config
     const bool targetIsToolWindow = KDDockWidgets::usesUtilityWindows() && floatingWindowForHandle(window) != nullptr;
 
-    for (MainWindowBase *mw : m_mainWindows) {
+    for (MainWindow *mw : m_mainWindows) {
         QWindow *mwWindow = mw->window()->windowHandle();
 
         if (mwWindow && mwWindow != window && !targetIsToolWindow && mwWindow->geometry().intersects(geo)) {
@@ -262,9 +262,9 @@ Controllers::Frame *DockRegistry::frameInMDIResize() const
     return nullptr;
 }
 
-MainWindowBase::List DockRegistry::mainWindowsWithAffinity(const QStringList &affinities) const
+MainWindow::List DockRegistry::mainWindowsWithAffinity(const QStringList &affinities) const
 {
-    MainWindowBase::List result;
+    MainWindow::List result;
     result.reserve(m_mainWindows.size());
 
     for (auto mw : m_mainWindows) {
@@ -327,7 +327,7 @@ void DockRegistry::unregisterDockWidget(DockWidgetBase *dock)
     maybeDelete();
 }
 
-void DockRegistry::registerMainWindow(MainWindowBase *mainWindow)
+void DockRegistry::registerMainWindow(MainWindow *mainWindow)
 {
     if (mainWindow->uniqueName().isEmpty()) {
         qWarning() << Q_FUNC_INFO << "MainWindow" << mainWindow << " doesn't have an ID";
@@ -338,7 +338,7 @@ void DockRegistry::registerMainWindow(MainWindowBase *mainWindow)
     m_mainWindows << mainWindow;
 }
 
-void DockRegistry::unregisterMainWindow(MainWindowBase *mainWindow)
+void DockRegistry::unregisterMainWindow(MainWindow *mainWindow)
 {
     m_mainWindows.removeOne(mainWindow);
     maybeDelete();
@@ -423,7 +423,7 @@ DockWidgetBase *DockRegistry::dockByName(const QString &name, DockByNameFlags fl
     return nullptr;
 }
 
-MainWindowBase *DockRegistry::mainWindowByName(const QString &name) const
+MainWindow *DockRegistry::mainWindowByName(const QString &name) const
 {
     for (auto mainWindow : qAsConst(m_mainWindows)) {
         if (mainWindow->uniqueName() == name)
@@ -505,9 +505,9 @@ const DockWidgetBase::List DockRegistry::dockWidgets(const QStringList &names)
     return result;
 }
 
-const MainWindowBase::List DockRegistry::mainWindows(const QStringList &names)
+const MainWindow::List DockRegistry::mainWindows(const QStringList &names)
 {
-    MainWindowBase::List result;
+    MainWindow::List result;
     result.reserve(names.size());
 
     for (auto mw : qAsConst(m_mainWindows)) {
@@ -531,7 +531,7 @@ const DockWidgetBase::List DockRegistry::closedDockwidgets() const
     return result;
 }
 
-const MainWindowBase::List DockRegistry::mainwindows() const
+const MainWindow::List DockRegistry::mainwindows() const
 {
     return m_mainWindows;
 }
@@ -616,9 +616,9 @@ Controllers::FloatingWindow *DockRegistry::floatingWindowForHandle(WId hwnd) con
     return nullptr;
 }
 
-MainWindowBase *DockRegistry::mainWindowForHandle(QWindow *windowHandle) const
+MainWindow *DockRegistry::mainWindowForHandle(QWindow *windowHandle) const
 {
-    for (MainWindowBase *mw : m_mainWindows) {
+    for (MainWindow *mw : m_mainWindows) {
         if (mw->windowHandle() == windowHandle)
             return mw;
     }
@@ -655,7 +655,7 @@ QVector<QWindow *> DockRegistry::topLevels(bool excludeFloatingDocks) const
         }
     }
 
-    for (MainWindowBase *m : m_mainWindows) {
+    for (MainWindow *m : m_mainWindows) {
         if (m->isVisible()) {
             if (QWindow *window = m->window()->windowHandle()) {
                 window->setProperty("kddockwidgets_qwidget", QVariant::fromValue<QWidgetOrQuick *>(m));
@@ -676,7 +676,7 @@ void DockRegistry::clear(const QStringList &affinities)
 }
 
 void DockRegistry::clear(const DockWidgetBase::List &dockWidgets,
-                         const MainWindowBase::List &mainWindows,
+                         const MainWindow::List &mainWindows,
                          const QStringList &affinities)
 {
     for (auto dw : qAsConst(dockWidgets)) {
@@ -764,7 +764,7 @@ bool DockRegistry::onDockWidgetPressed(DockWidgetBase *dw, QMouseEvent *ev)
         return false;
 #endif
 
-    MainWindowBase *mainWindow = dw->mainWindow();
+    MainWindow *mainWindow = dw->mainWindow();
     if (!mainWindow) // Only docked widgets are interesting
         return false;
 
diff --git a/src/private/DockRegistry_p.h b/src/private/DockRegistry_p.h
index 51572cfa..13e4b287 100644
--- a/src/private/DockRegistry_p.h
+++ b/src/private/DockRegistry_p.h
@@ -55,8 +55,8 @@ public:
     void registerDockWidget(Controllers::DockWidgetBase *);
     void unregisterDockWidget(Controllers::DockWidgetBase *);
 
-    void registerMainWindow(MainWindowBase *);
-    void unregisterMainWindow(MainWindowBase *);
+    void registerMainWindow(MainWindow *);
+    void unregisterMainWindow(MainWindow *);
 
     void registerFloatingWindow(Controllers::FloatingWindow *);
     void unregisterFloatingWindow(Controllers::FloatingWindow *);
@@ -74,7 +74,7 @@ public:
 
     Q_INVOKABLE KDDockWidgets::Controllers::DockWidgetBase *dockByName(const QString &,
                                                                        KDDockWidgets::DockRegistry::DockByNameFlags = {}) const;
-    Q_INVOKABLE KDDockWidgets::MainWindowBase *mainWindowByName(const QString &) const;
+    Q_INVOKABLE KDDockWidgets::MainWindow *mainWindowByName(const QString &) const;
     Q_INVOKABLE KDDockWidgets::MainWindowMDI *mdiMainWindowByName(const QString &) const;
 
     /// @brief returns the dock widget that hosts @p guest widget. Nullptr if there's none.
@@ -92,10 +92,10 @@ public:
     const Controllers::DockWidgetBase::List closedDockwidgets() const;
 
     ///@brief returns all MainWindow instances
-    const MainWindowBase::List mainwindows() const;
+    const MainWindow::List mainwindows() const;
 
     ///@brief overload returning only the ones with the specified names
-    const MainWindowBase::List mainWindows(const QStringList &names);
+    const MainWindow::List mainWindows(const QStringList &names);
 
     ///@brief returns the list of LayoutWidget instances
     const QVector<LayoutWidget *> layouts() const;
@@ -123,7 +123,7 @@ public:
     Controllers::FloatingWindow *floatingWindowForHandle(WId hwnd) const;
 
     ///@brief returns the MainWindow with handle @p windowHandle
-    MainWindowBase *mainWindowForHandle(QWindow *windowHandle) const;
+    MainWindow *mainWindowForHandle(QWindow *windowHandle) const;
 
     ///@brief returns the top level widget associated with the specified QWindow.
     /// For QtWidgets, it returns a QWidget which is either a KDDockWidgets::MainWindow or a FloatingWindow.
@@ -152,7 +152,7 @@ public:
      * @brief clear Overload that only clears the specified dockWidgets and main windows.
      */
     void clear(const Controllers::DockWidgetBase::List &dockWidgets,
-               const MainWindowBase::List &mainWindows,
+               const MainWindow::List &mainWindows,
                const QStringList &affinities);
 
     /**
@@ -190,7 +190,7 @@ public:
     /**
      * @brief Returns all main windows which match at least one of the @p affinities
      */
-    MainWindowBase::List mainWindowsWithAffinity(const QStringList &affinities) const;
+    MainWindow::List mainWindowsWithAffinity(const QStringList &affinities) const;
 
     /// @brief Returns the LayoutWidget where the specified item is in
     LayoutWidget *layoutForItem(const Layouting::Item *) const;
@@ -251,7 +251,7 @@ private:
 
     bool m_isProcessingAppQuitEvent = false;
     Controllers::DockWidgetBase::List m_dockWidgets;
-    MainWindowBase::List m_mainWindows;
+    MainWindow::List m_mainWindows;
     QList<Controllers::Frame *> m_frames;
     QVector<Controllers::FloatingWindow *> m_floatingWindows;
     QVector<LayoutWidget *> m_layouts;
diff --git a/src/private/DropAreaWithCentralFrame_p.h b/src/private/DropAreaWithCentralFrame_p.h
index 898dbcd7..b516443b 100644
--- a/src/private/DropAreaWithCentralFrame_p.h
+++ b/src/private/DropAreaWithCentralFrame_p.h
@@ -26,7 +26,7 @@ public:
     static Controllers::Frame *createCentralFrame(MainWindowOptions options);
 
 private:
-    friend class MainWindowBase;
+    friend class MainWindow;
     friend class Controllers::Frame;
     Controllers::Frame *const m_centralFrame = nullptr;
 };
diff --git a/src/private/LayoutWidget.cpp b/src/private/LayoutWidget.cpp
index 6d0b786f..a9b0f2af 100644
--- a/src/private/LayoutWidget.cpp
+++ b/src/private/LayoutWidget.cpp
@@ -47,23 +47,23 @@ bool LayoutWidget::isInMainWindow(bool honourNesting) const
     return mainWindow(honourNesting) != nullptr;
 }
 
-MainWindowBase *LayoutWidget::mainWindow(bool honourNesting) const
+MainWindow *LayoutWidget::mainWindow(bool honourNesting) const
 {
     // QtQuick doesn't support nesting yet
     honourNesting = honourNesting && kddwUsesQtWidgets();
 
     if (honourNesting) {
         // This layout might be a MDIArea, nested in DropArea, which is main window.
-        return firstParentOfType<MainWindowBase>(this);
+        return firstParentOfType<MainWindow>(this);
     } else {
 
         if (auto pw = QWidget::parentWidget()) {
             // Note that if pw is a FloatingWindow then pw->parentWidget() can be a MainWindow too, as
             // it's parented
             if (pw->objectName() == QLatin1String("MyCentralWidget"))
-                return qobject_cast<MainWindowBase *>(pw->parentWidget());
+                return qobject_cast<MainWindow *>(pw->parentWidget());
 
-            if (auto mw = qobject_cast<MainWindowBase *>(pw))
+            if (auto mw = qobject_cast<MainWindow *>(pw))
                 return mw;
         }
     }
diff --git a/src/private/LayoutWidget_p.h b/src/private/LayoutWidget_p.h
index 1e023d21..c593abda 100644
--- a/src/private/LayoutWidget_p.h
+++ b/src/private/LayoutWidget_p.h
@@ -49,7 +49,7 @@ class FloatingWindow;
 class DockWidgetBase;
 }
 
-class MainWindowBase;
+class MainWindow;
 
 /**
  * @brief The widget (QWidget or QQuickItem) which holds a layout of dock widgets.
@@ -74,7 +74,7 @@ public:
     /// otherwise, only direct parenting is considered
     bool isInMainWindow(bool honourNesting = false) const;
 
-    MainWindowBase *mainWindow(bool honourNesting = false) const;
+    MainWindow *mainWindow(bool honourNesting = false) const;
 
     Controllers::FloatingWindow *floatingWindow() const;
 
diff --git a/src/private/Position.cpp b/src/private/Position.cpp
index 18222f7f..eeb64577 100644
--- a/src/private/Position.cpp
+++ b/src/private/Position.cpp
@@ -146,7 +146,7 @@ void Position::deserialize(const LayoutSaver::Position &lp)
                 }
             }
         } else {
-            MainWindowBase *mainWindow = DockRegistry::self()->mainWindowByName(placeholder.mainWindowUniqueName);
+            MainWindow *mainWindow = DockRegistry::self()->mainWindowByName(placeholder.mainWindowUniqueName);
             layout = mainWindow->layoutWidget();
         }
 
diff --git a/src/views_qtwidgets/FloatingWindow_qtwidgets.cpp b/src/views_qtwidgets/FloatingWindow_qtwidgets.cpp
index c671208a..4f385de4 100644
--- a/src/views_qtwidgets/FloatingWindow_qtwidgets.cpp
+++ b/src/views_qtwidgets/FloatingWindow_qtwidgets.cpp
@@ -32,7 +32,7 @@
 using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
 
-FloatingWindow_qtwidgets::FloatingWindow_qtwidgets(Controllers::FloatingWindow *controller, MainWindowBase *parent, Qt::WindowFlags windowFlags)
+FloatingWindow_qtwidgets::FloatingWindow_qtwidgets(Controllers::FloatingWindow *controller, MainWindow *parent, Qt::WindowFlags windowFlags)
     : View_qtwidgets<QWidget>(controller, Type::FloatingWindow, parent, windowFlags)
     , m_controller(controller)
     , m_vlayout(new QVBoxLayout(this))
diff --git a/src/views_qtwidgets/FloatingWindow_qtwidgets.h b/src/views_qtwidgets/FloatingWindow_qtwidgets.h
index 22e0b5e0..e1e08121 100644
--- a/src/views_qtwidgets/FloatingWindow_qtwidgets.h
+++ b/src/views_qtwidgets/FloatingWindow_qtwidgets.h
@@ -30,7 +30,7 @@ class DOCKS_EXPORT FloatingWindow_qtwidgets : public View_qtwidgets<QWidget>
     Q_OBJECT
 public:
     explicit FloatingWindow_qtwidgets(Controllers::FloatingWindow *controller,
-                                      MainWindowBase *parent = nullptr,
+                                      MainWindow *parent = nullptr,
                                       Qt::WindowFlags windowFlags = {});
 
     Controllers::FloatingWindow *floatingWindow() const;
diff --git a/src/views_qtwidgets/MainWindow_qtwidgets.cpp b/src/views_qtwidgets/MainWindow_qtwidgets.cpp
index 005288b3..d6d4ba90 100644
--- a/src/views_qtwidgets/MainWindow_qtwidgets.cpp
+++ b/src/views_qtwidgets/MainWindow_qtwidgets.cpp
@@ -93,7 +93,7 @@ MyCentralWidget::~MyCentralWidget()
 
 MainWindow_qtwidgets::MainWindow_qtwidgets(const QString &name, MainWindowOptions options,
                                            QWidget *parent, Qt::WindowFlags flags)
-    : MainWindowBase(name, options, parent, flags)
+    : MainWindow(name, options, parent, flags)
     , d(new Private(options, this))
 {
     if (d->m_supportsAutoHide) {
@@ -137,7 +137,7 @@ Controllers::SideBar *MainWindow_qtwidgets::sideBar(SideBarLocation location) co
 
 void MainWindow_qtwidgets::resizeEvent(QResizeEvent *ev)
 {
-    MainWindowBase::resizeEvent(ev);
+    MainWindow::resizeEvent(ev);
     onResized(ev); // Also call our own handler, since QtQuick doesn't have resizeEvent()
 }
 
diff --git a/src/views_qtwidgets/MainWindow_qtwidgets.h b/src/views_qtwidgets/MainWindow_qtwidgets.h
index 46b24ad8..4002a617 100644
--- a/src/views_qtwidgets/MainWindow_qtwidgets.h
+++ b/src/views_qtwidgets/MainWindow_qtwidgets.h
@@ -33,7 +33,7 @@ namespace Views {
  * @brief The QMainwindow sub-class that the application should use to be able
  * to dock KDDockWidget::DockWidget instances.
  */
-class DOCKS_EXPORT MainWindow_qtwidgets : public MainWindowBase
+class DOCKS_EXPORT MainWindow_qtwidgets : public MainWindow
 {
     Q_OBJECT
 public:
diff --git a/src/views_qtwidgets/SideBar_qtwidgets.cpp b/src/views_qtwidgets/SideBar_qtwidgets.cpp
index f7ac59a5..fb94e08e 100644
--- a/src/views_qtwidgets/SideBar_qtwidgets.cpp
+++ b/src/views_qtwidgets/SideBar_qtwidgets.cpp
@@ -26,7 +26,7 @@ using namespace KDDockWidgets;
 using namespace KDDockWidgets::Views;
 using namespace KDDockWidgets::Controllers;
 
-SideBar_qtwidgets::SideBar_qtwidgets(Controllers::SideBar *controller, MainWindowBase *parent)
+SideBar_qtwidgets::SideBar_qtwidgets(Controllers::SideBar *controller, MainWindow *parent)
     : View_qtwidgets(controller, Type::SideBar, parent)
     , m_controller(controller)
     , m_layout(controller->isVertical() ? static_cast<QBoxLayout *>(new QVBoxLayout(this))
diff --git a/src/views_qtwidgets/SideBar_qtwidgets.h b/src/views_qtwidgets/SideBar_qtwidgets.h
index 97b9b079..54423721 100644
--- a/src/views_qtwidgets/SideBar_qtwidgets.h
+++ b/src/views_qtwidgets/SideBar_qtwidgets.h
@@ -58,7 +58,7 @@ class DOCKS_EXPORT SideBar_qtwidgets : public View_qtwidgets<QWidget>
     Q_OBJECT
 public:
     explicit SideBar_qtwidgets(KDDockWidgets::Controllers::SideBar *,
-                               KDDockWidgets::MainWindowBase *parent);
+                               KDDockWidgets::MainWindow *parent);
 
     bool isVertical() const; // TODO: Move to a potential base class
 
diff --git a/tests/Testing.h b/tests/Testing.h
index ddda2cf8..e0e82f80 100644
--- a/tests/Testing.h
+++ b/tests/Testing.h
@@ -84,7 +84,7 @@ struct AddDockWidgetParams
         return params;
     }
 
-    KDDockWidgets::MainWindowBase *mainWindow() const
+    KDDockWidgets::MainWindow *mainWindow() const
     {
         return KDDockWidgets::DockRegistry::self()->mainWindowByName(mainWindowName);
     }
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index 7f67befc..f2c140e0 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -99,9 +99,9 @@ static DockWidgetBase *createAndNestDockWidget(DropArea *dropArea, Controllers::
     return dock;
 }
 
-static std::unique_ptr<MainWindowBase> createSimpleNestedMainWindow(DockWidgetBase **centralDock,
-                                                                    DockWidgetBase **leftDock,
-                                                                    DockWidgetBase **rightDock)
+static std::unique_ptr<MainWindow> createSimpleNestedMainWindow(DockWidgetBase **centralDock,
+                                                                DockWidgetBase **leftDock,
+                                                                DockWidgetBase **rightDock)
 {
     auto window = createMainWindow({ 900, 500 });
     *centralDock = createDockWidget("centralDock", Qt::green);
@@ -5751,7 +5751,7 @@ void TestDocks::tst_negativeAnchorPositionWhenEmbedded()
     QFETCH(bool, embedded);
     EnsureTopLevelsDeleted e;
 
-    MainWindowBase *m = nullptr;
+    MainWindow *m = nullptr;
     if (embedded) {
         auto em = createEmbeddedMainWindow(QSize(500, 500));
         m = em->mainWindow;
@@ -7103,7 +7103,7 @@ void TestDocks::tst_close()
     // 2. Test that closing the single frame of a main window doesn't close the main window itself
     {
         auto m = createMainWindow(QSize(800, 500), MainWindowOption_None); // Remove central frame
-        QPointer<MainWindowBase> mainWindowPtr = m.get();
+        QPointer<MainWindow> mainWindowPtr = m.get();
         dock1 = createDockWidget("hello", Qt::green);
         m->addDockWidget(dock1, Location_OnLeft);
 
@@ -7116,7 +7116,7 @@ void TestDocks::tst_close()
     // 2.1 Test closing the frame instead
     {
         auto m = createMainWindow(QSize(800, 500), MainWindowOption_None); // Remove central frame
-        QPointer<MainWindowBase> mainWindowPtr = m.get();
+        QPointer<MainWindow> mainWindowPtr = m.get();
         dock1 = createDockWidget("hello", Qt::green);
         m->addDockWidget(dock1, Location_OnLeft);
 
@@ -7130,7 +7130,7 @@ void TestDocks::tst_close()
     // 2.2 Repeat, but with a central frame
     {
         auto m = createMainWindow(QSize(800, 500));
-        QPointer<MainWindowBase> mainWindowPtr = m.get();
+        QPointer<MainWindow> mainWindowPtr = m.get();
         dock1 = createDockWidget("hello", Qt::green);
         m->addDockWidget(dock1, Location_OnLeft);
 
diff --git a/tests/utils.cpp b/tests/utils.cpp
index 1d259996..475107bf 100644
--- a/tests/utils.cpp
+++ b/tests/utils.cpp
@@ -36,7 +36,7 @@ using namespace KDDockWidgets::Tests;
 // clazy:excludeall=ctor-missing-parent-argument,missing-qobject-macro,range-loop,missing-typeinfo,detaching-member,function-args-by-ref,non-pod-global-static,reserve-candidates
 
 
-std::unique_ptr<KDDockWidgets::MainWindowBase>
+std::unique_ptr<KDDockWidgets::MainWindow>
 KDDockWidgets::Tests::createMainWindow(QSize sz, KDDockWidgets::MainWindowOptions options,
                                        const QString &name, bool show)
 {
@@ -110,7 +110,7 @@ static QWidgetOrQuick *createGuestWidget(int i)
 #endif
 }
 
-std::unique_ptr<MainWindowBase> KDDockWidgets::Tests::createMainWindow(QVector<DockDescriptor> &docks)
+std::unique_ptr<MainWindow> KDDockWidgets::Tests::createMainWindow(QVector<DockDescriptor> &docks)
 {
     static int count = 0;
     count++;
diff --git a/tests/utils.h b/tests/utils.h
index 95b1ba36..1fcf0a0a 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -132,13 +132,13 @@ struct EnsureTopLevelsDeleted
 
 bool shouldBlacklistWarning(const QString &msg, const QString &category = {});
 
-std::unique_ptr<MainWindowBase> createMainWindow(QSize sz = { 1000, 1000 },
-                                                 KDDockWidgets::MainWindowOptions options = MainWindowOption_HasCentralFrame,
-                                                 const QString &name = {}, bool show = true);
+std::unique_ptr<MainWindow> createMainWindow(QSize sz = { 1000, 1000 },
+                                             KDDockWidgets::MainWindowOptions options = MainWindowOption_HasCentralFrame,
+                                             const QString &name = {}, bool show = true);
 
 
 
-std::unique_ptr<KDDockWidgets::MainWindowBase> createMainWindow(QVector<DockDescriptor> &docks);
+std::unique_ptr<KDDockWidgets::MainWindow> createMainWindow(QVector<DockDescriptor> &docks);
 
 Controllers::DockWidgetBase *createDockWidget(const QString &name, QWidgetOrQuick *w,
                                               Controllers::DockWidgetBase::Options options = {},
@@ -273,14 +273,14 @@ public:
 class EmbeddedWindow : public QWidget
 {
 public:
-    explicit EmbeddedWindow(MainWindowBase *m)
+    explicit EmbeddedWindow(MainWindow *m)
         : mainWindow(m)
     {
     }
 
     ~EmbeddedWindow() override;
 
-    MainWindowBase *const mainWindow;
+    MainWindow *const mainWindow;
 };
 
 class NonClosableWidget : public QWidget