diff --git a/src/Config.cpp b/src/Config.cpp
index 82f5700b..482f8afe 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -113,7 +113,7 @@ void Config::setFrameworkWidgetFactory(FrameworkWidgetFactory *wf)
     d->m_frameworkWidgetFactory = wf;
 }
 
-FrameworkWidgetFactory *Config::frameWorkWidgetFactory() const
+FrameworkWidgetFactory *Config::frameworkWidgetFactory() const
 {
     return d->m_frameworkWidgetFactory;
 }
diff --git a/src/Config.h b/src/Config.h
index ed82bfb2..8d83628d 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -108,7 +108,7 @@ public:
     void setFrameworkWidgetFactory(FrameworkWidgetFactory *);
 
     ///@brief getter for the framework widget factory
-    FrameworkWidgetFactory *frameWorkWidgetFactory() const;
+    FrameworkWidgetFactory *frameworkWidgetFactory() const;
 
     /**
      * @brief Returns the thickness of the separator.
diff --git a/src/DockWidgetBase.cpp b/src/DockWidgetBase.cpp
index 34aca87d..8982bbc6 100644
--- a/src/DockWidgetBase.cpp
+++ b/src/DockWidgetBase.cpp
@@ -325,9 +325,9 @@ FloatingWindow *DockWidgetBase::morphIntoFloatingWindow()
         if (geo.isNull())
             geo = geometry();
 
-        auto frame = Config::self().frameWorkWidgetFactory()->createFrame();
+        auto frame = Config::self().frameworkWidgetFactory()->createFrame();
         frame->addWidget(this);
-        auto floatingWindow = Config::self().frameWorkWidgetFactory()->createFloatingWindow(frame);
+        auto floatingWindow = Config::self().frameworkWidgetFactory()->createFloatingWindow(frame);
         floatingWindow->setGeometry(geo);
         floatingWindow->show();
 
diff --git a/src/DropArea.cpp b/src/DropArea.cpp
index f6a8ffd3..47a8e638 100644
--- a/src/DropArea.cpp
+++ b/src/DropArea.cpp
@@ -40,7 +40,7 @@ using namespace KDDockWidgets;
  */
 DropArea::DropArea(QWidgetOrQuick *parent)
     : MultiSplitter(parent)
-    , m_dropIndicatorOverlay(Config::self().frameWorkWidgetFactory()->createDropIndicatorOverlay(this))
+    , m_dropIndicatorOverlay(Config::self().frameworkWidgetFactory()->createDropIndicatorOverlay(this))
 {
     qCDebug(creation) << "DropArea";
     connect(m_layout, &MultiSplitterLayout::aboutToDumpDebug,
@@ -120,11 +120,11 @@ void DropArea::addDockWidget(DockWidgetBase *dw, Location location, DockWidgetBa
             // The frame only has this dock widget, and the frame is already in the layout. So move the frame instead
             frame = oldFrame;
         } else {
-            frame = Config::self().frameWorkWidgetFactory()->createFrame();
+            frame = Config::self().frameworkWidgetFactory()->createFrame();
             frame->addWidget(dw);
         }
     } else {
-        frame = Config::self().frameWorkWidgetFactory()->createFrame();
+        frame = Config::self().frameworkWidgetFactory()->createFrame();
         frame->addWidget(dw);
     }
 
@@ -241,7 +241,7 @@ bool DropArea::drop(QWidgetOrQuick *droppedWindow, KDDockWidgets::Location locat
     qCDebug(docking) << "DropArea::addFrame";
 
     if (auto dock = qobject_cast<DockWidgetBase *>(droppedWindow)) {
-        auto frame = Config::self().frameWorkWidgetFactory()->createFrame();
+        auto frame = Config::self().frameworkWidgetFactory()->createFrame();
         frame->addWidget(dock);
         m_layout->addWidget(frame, location, relativeTo);
     } else if (auto floatingWindow = qobject_cast<FloatingWindow *>(droppedWindow)) {
diff --git a/src/DropAreaWithCentralFrame.cpp b/src/DropAreaWithCentralFrame.cpp
index 1db9c82d..1244b31a 100644
--- a/src/DropAreaWithCentralFrame.cpp
+++ b/src/DropAreaWithCentralFrame.cpp
@@ -38,6 +38,6 @@ DropAreaWithCentralFrame::~DropAreaWithCentralFrame()
 
 Frame* DropAreaWithCentralFrame::createCentralFrame(MainWindowOptions options)
 {
-    return (options & MainWindowOption_HasCentralFrame) ? Config::self().frameWorkWidgetFactory()->createFrame(nullptr, Frame::Option_IsCentralFrame | Frame::Option_AlwaysShowsTabs)
+    return (options & MainWindowOption_HasCentralFrame) ? Config::self().frameworkWidgetFactory()->createFrame(nullptr, Frame::Option_IsCentralFrame | Frame::Option_AlwaysShowsTabs)
                                                         : nullptr;
 }
diff --git a/src/FloatingWindow.cpp b/src/FloatingWindow.cpp
index 4b82cdbc..a8f46c94 100644
--- a/src/FloatingWindow.cpp
+++ b/src/FloatingWindow.cpp
@@ -90,7 +90,7 @@ public:
 FloatingWindow::FloatingWindow(QWidgetOrQuick *parent)
     : QWidgetAdapter(parent, KDDockWidgets::usesNativeDraggingAndResizing() ? Qt::Window : Qt::Tool)
     , Draggable(this, KDDockWidgets::usesNativeDraggingAndResizing()) // FloatingWindow is only draggable when using a native title bar. Otherwise the KDDockWidgets::TitleBar is the draggable
-    , m_titleBar(Config::self().frameWorkWidgetFactory()->createTitleBar(this))
+    , m_titleBar(Config::self().frameworkWidgetFactory()->createTitleBar(this))
     , m_dropArea(new DropArea(this))
 {
 #ifdef Q_OS_WIN
diff --git a/src/Frame.cpp b/src/Frame.cpp
index 266ab662..c73094b9 100644
--- a/src/Frame.cpp
+++ b/src/Frame.cpp
@@ -58,8 +58,8 @@ static Frame::Options actualOptions(Frame::Options options)
 
 Frame::Frame(QWidgetOrQuick *parent, Options options)
     : QWidgetAdapter(parent)
-    , m_tabWidget(Config::self().frameWorkWidgetFactory()->createTabWidget(this))
-    , m_titleBar(Config::self().frameWorkWidgetFactory()->createTitleBar(this))
+    , m_tabWidget(Config::self().frameworkWidgetFactory()->createTabWidget(this))
+    , m_titleBar(Config::self().frameworkWidgetFactory()->createTitleBar(this))
     , m_options(actualOptions(options))
 {
     s_dbg_numFrames++;
@@ -466,7 +466,7 @@ bool Frame::event(QEvent *e)
 
 Frame *Frame::deserialize(const LayoutSaver::Frame &f)
 {
-    auto frame = Config::self().frameWorkWidgetFactory()->createFrame(/*parent=*/nullptr, Frame::Options(f.options));
+    auto frame = Config::self().frameworkWidgetFactory()->createFrame(/*parent=*/nullptr, Frame::Options(f.options));
     frame->setObjectName(f.objectName);
 
     for (const auto &savedDock : qAsConst(f.dockWidgets)) {
diff --git a/src/LayoutSaver.cpp b/src/LayoutSaver.cpp
index 64e906bc..be2f0b53 100644
--- a/src/LayoutSaver.cpp
+++ b/src/LayoutSaver.cpp
@@ -211,7 +211,7 @@ bool LayoutSaver::restoreLayout(const QByteArray &data)
         QWidget *parent = fw.parentIndex == -1 ? nullptr
                                                : DockRegistry::self()->mainwindows().at(fw.parentIndex);
 
-        auto floatingWindow = Config::self().frameWorkWidgetFactory()->createFloatingWindow(parent);
+        auto floatingWindow = Config::self().frameworkWidgetFactory()->createFloatingWindow(parent);
         d->deserializeWindowGeometry(fw, floatingWindow);
         if (!floatingWindow->deserialize(fw)) {
             return false;
diff --git a/src/TabWidget.cpp b/src/TabWidget.cpp
index be362ad6..e51b7fa1 100644
--- a/src/TabWidget.cpp
+++ b/src/TabWidget.cpp
@@ -105,13 +105,13 @@ FloatingWindow * TabBar::detachTab(DockWidgetBase *dockWidget)
     QRect r = dockWidget->geometry();
     m_tabWidget->removeDockWidget(dockWidget);
 
-    auto newFrame = Config::self().frameWorkWidgetFactory()->createFrame();
+    auto newFrame = Config::self().frameworkWidgetFactory()->createFrame();
     const QPoint globalPoint = m_thisWidget->mapToGlobal(QPoint(0, 0));
     newFrame->addWidget(dockWidget);
 
     // We're potentially already dead at this point, as frames with 0 tabs auto-destruct. Don't access members from this point.
 
-    auto floatingWindow = Config::self().frameWorkWidgetFactory()->createFloatingWindow(newFrame);
+    auto floatingWindow = Config::self().frameworkWidgetFactory()->createFloatingWindow(newFrame);
     r.moveTopLeft(globalPoint);
     floatingWindow->setGeometry(r);
     floatingWindow->show();
@@ -224,7 +224,7 @@ std::unique_ptr<WindowBeingDragged> TabWidget::makeWindow()
 
     const QPoint globalPoint = m_thisWidget->mapToGlobal(QPoint(0, 0));
 
-    auto floatingWindow = Config::self().frameWorkWidgetFactory()->createFloatingWindow(m_frame);
+    auto floatingWindow = Config::self().frameworkWidgetFactory()->createFloatingWindow(m_frame);
     r.moveTopLeft(globalPoint);
     floatingWindow->setGeometry(r);
     floatingWindow->show();
diff --git a/src/TitleBar.cpp b/src/TitleBar.cpp
index c106b502..2f962d31 100644
--- a/src/TitleBar.cpp
+++ b/src/TitleBar.cpp
@@ -126,7 +126,7 @@ std::unique_ptr<WindowBeingDragged> TitleBar::makeWindow()
     qCDebug(hovering) << "TitleBar::makeWindow original geometry" << r;
     r.moveTopLeft(m_frame->mapToGlobal(QPoint(0, 0)));
 
-    auto floatingWindow = Config::self().frameWorkWidgetFactory()->createFloatingWindow(m_frame);
+    auto floatingWindow = Config::self().frameworkWidgetFactory()->createFloatingWindow(m_frame);
     floatingWindow->setGeometry(r);
     floatingWindow->show();
     qCDebug(hovering) << "TitleBar::makeWindow setting geometry" << r << "actual=" << floatingWindow->geometry();
diff --git a/src/multisplitter/Anchor.cpp b/src/multisplitter/Anchor.cpp
index 3ebbc574..30a45f7d 100644
--- a/src/multisplitter/Anchor.cpp
+++ b/src/multisplitter/Anchor.cpp
@@ -44,7 +44,7 @@ Anchor::Anchor(Qt::Orientation orientation, MultiSplitterLayout *multiSplitter,
     , m_orientation(orientation)
     , m_type(type)
     , m_layout(multiSplitter)
-    , m_separatorWidget(Config::self().frameWorkWidgetFactory()->createSeparator(this, multiSplitter->multiSplitter()))
+    , m_separatorWidget(Config::self().frameworkWidgetFactory()->createSeparator(this, multiSplitter->multiSplitter()))
 {
     multiSplitter->insertAnchor(this);
     connect(this, &QObject::objectNameChanged, m_separatorWidget, &QObject::setObjectName);
diff --git a/src/multisplitter/Item.cpp b/src/multisplitter/Item.cpp
index 02e700f9..cafa2914 100644
--- a/src/multisplitter/Item.cpp
+++ b/src/multisplitter/Item.cpp
@@ -366,7 +366,7 @@ void Item::restorePlaceholder(DockWidgetBase *dockWidget, int tabIndex)
 {
     qCDebug(placeholder) << Q_FUNC_INFO << "Restoring to window=" << window();
     if (d->m_isPlaceholder) {
-        d->setFrame(Config::self().frameWorkWidgetFactory()->createFrame(layout()->multiSplitter()));
+        d->setFrame(Config::self().frameworkWidgetFactory()->createFrame(layout()->multiSplitter()));
         d->m_frame->setGeometry(d->m_geometry);
     }
 
diff --git a/src/multisplitter/MultiSplitterLayout.cpp b/src/multisplitter/MultiSplitterLayout.cpp
index b23250d3..3b7493b4 100644
--- a/src/multisplitter/MultiSplitterLayout.cpp
+++ b/src/multisplitter/MultiSplitterLayout.cpp
@@ -385,7 +385,7 @@ void MultiSplitterLayout::addAsPlaceholder(DockWidgetBase *dockWidget, Location
     auto result = createTargetAnchorGroup(location, relativeTo);
     AnchorGroup targetAnchorGroup = result.first;
 
-    auto frame = Config::self().frameWorkWidgetFactory()->createFrame(m_multiSplitter);
+    auto frame = Config::self().frameworkWidgetFactory()->createFrame(m_multiSplitter);
     auto item = new Item(frame, this);
 
     targetAnchorGroup.addItem(item);
diff --git a/src/quick/TabWidgetQuick.cpp b/src/quick/TabWidgetQuick.cpp
index 165a1162..5829f1b1 100644
--- a/src/quick/TabWidgetQuick.cpp
+++ b/src/quick/TabWidgetQuick.cpp
@@ -34,7 +34,7 @@ using namespace KDDockWidgets;
 
 TabWidgetQuick::TabWidgetQuick(Frame *parent)
     : TabWidget(this, parent)
-    , m_tabBar(Config::self().frameWorkWidgetFactory()->createTabBar(this))
+    , m_tabBar(Config::self().frameworkWidgetFactory()->createTabBar(this))
 {
 }
 
diff --git a/src/widgets/TabWidgetWidget.cpp b/src/widgets/TabWidgetWidget.cpp
index 3cd8cd5f..7221a847 100644
--- a/src/widgets/TabWidgetWidget.cpp
+++ b/src/widgets/TabWidgetWidget.cpp
@@ -35,7 +35,7 @@ using namespace KDDockWidgets;
 TabWidgetWidget::TabWidgetWidget(Frame *parent)
     : QTabWidget(parent)
     , TabWidget(this, parent)
-    , m_tabBar(Config::self().frameWorkWidgetFactory()->createTabBar(this))
+    , m_tabBar(Config::self().frameworkWidgetFactory()->createTabBar(this))
 {
     setTabBar(static_cast<QTabBar*>(m_tabBar->asWidget()));
 
diff --git a/tests/tst_docks.cpp b/tests/tst_docks.cpp
index 9713c978..5823841d 100644
--- a/tests/tst_docks.cpp
+++ b/tests/tst_docks.cpp
@@ -494,7 +494,7 @@ Frame* createFrameWithWidget(const QString &name, MultiSplitter *parent, int min
     QWidget *w = createWidget(minLength, name);
     auto dw = new DockWidget(name);
     dw->setWidget(w);
-    auto frame = Config::self().frameWorkWidgetFactory()->createFrame(parent);
+    auto frame = Config::self().frameworkWidgetFactory()->createFrame(parent);
     frame->addWidget(dw);
     return frame;
 }
@@ -528,7 +528,7 @@ void TestDocks::tst_createFloatingWindow()
 
 void TestDocks::nestDockWidget(DockWidgetBase *dock, DropArea *dropArea, Frame *relativeTo, KDDockWidgets::Location location)
 {
-    auto frame = Config::self().frameWorkWidgetFactory()->createFrame();
+    auto frame = Config::self().frameworkWidgetFactory()->createFrame();
     frame->addWidget(dock);
     dock->frame()->setObjectName(dock->objectName());
 
@@ -2078,7 +2078,7 @@ std::unique_ptr<MultiSplitter> TestDocks::createMultiSplitterFromSetup(MultiSpli
 
     const int count = setup.widgets.size();
     for (int i = 0; i < count; ++i) {
-        auto frame = Config::self().frameWorkWidgetFactory()->createFrame(widget.get());
+        auto frame = Config::self().frameworkWidgetFactory()->createFrame(widget.get());
         auto dock = new DockWidget(QString("foo_createMultiSplitterFromSetup%1").arg(i));
         dock->setWidget(setup.widgets[i]);
         frame->addWidget(dock);
@@ -2115,7 +2115,7 @@ void TestDocks::tst_availableLengthForDrop_data()
     {
         // Frame has a bit bigger min size than the widget it hosts, since it has space for a tab bar and titlebar
 
-        auto frame = Config::self().frameWorkWidgetFactory()->createFrame();
+        auto frame = Config::self().frameworkWidgetFactory()->createFrame();
         const int w1MinLength = 100;
         QWidget *w1 = createWidget(w1MinLength);
         auto dock = new DockWidget("foo");