diff --git a/src/filter/filtermanager.cpp b/src/filter/filtermanager.cpp
index 4463be9..6aa52c0 100644
--- a/src/filter/filtermanager.cpp
+++ b/src/filter/filtermanager.cpp
@@ -22,10 +22,10 @@
 
 namespace MailCommon
 {
-class Q_DECL_HIDDEN FilterManager::Private
+class FilterManager::FilterManagerPrivate
 {
 public:
-    Private(FilterManager *qq)
+    FilterManagerPrivate(FilterManager *qq)
         : q(qq)
         , mMonitor(new Akonadi::Monitor)
     {
@@ -49,7 +49,7 @@ public:
     bool mInitialized = false;
 };
 
-void FilterManager::Private::readConfig()
+void FilterManager::FilterManagerPrivate::readConfig()
 {
     KSharedConfig::Ptr config =
         KSharedConfig::openConfig(Akonadi::ServerManager::addNamespace(QStringLiteral("akonadi_mailfilter_agent")) + QStringLiteral("rc"));
@@ -59,7 +59,7 @@ void FilterManager::Private::readConfig()
     Q_EMIT q->filtersChanged();
 }
 
-void FilterManager::Private::writeConfig(bool withSync) const
+void FilterManager::FilterManagerPrivate::writeConfig(bool withSync) const
 {
     KSharedConfig::Ptr config =
         KSharedConfig::openConfig(Akonadi::ServerManager::addNamespace(QStringLiteral("akonadi_mailfilter_agent")) + QStringLiteral("rc"));
@@ -73,7 +73,7 @@ void FilterManager::Private::writeConfig(bool withSync) const
     }
 }
 
-void FilterManager::Private::clear()
+void FilterManager::FilterManagerPrivate::clear()
 {
     qDeleteAll(mFilters);
     mFilters.clear();
@@ -82,29 +82,29 @@ void FilterManager::Private::clear()
 
 using namespace MailCommon;
 
-FilterManager *FilterManager::Private::mInstance = nullptr;
-FilterActionDict *FilterManager::Private::mFilterActionDict = nullptr;
+FilterManager *FilterManager::FilterManagerPrivate::mInstance = nullptr;
+FilterActionDict *FilterManager::FilterManagerPrivate::mFilterActionDict = nullptr;
 
 FilterManager *FilterManager::instance()
 {
-    if (!FilterManager::Private::mInstance) {
-        FilterManager::Private::mInstance = new FilterManager;
+    if (!FilterManager::FilterManagerPrivate::mInstance) {
+        FilterManager::FilterManagerPrivate::mInstance = new FilterManager;
     }
 
-    return FilterManager::Private::mInstance;
+    return FilterManager::FilterManagerPrivate::mInstance;
 }
 
 FilterActionDict *FilterManager::filterActionDict()
 {
-    if (!FilterManager::Private::mFilterActionDict) {
-        FilterManager::Private::mFilterActionDict = new FilterActionDict;
+    if (!FilterManager::FilterManagerPrivate::mFilterActionDict) {
+        FilterManager::FilterManagerPrivate::mFilterActionDict = new FilterActionDict;
     }
 
-    return FilterManager::Private::mFilterActionDict;
+    return FilterManager::FilterManagerPrivate::mFilterActionDict;
 }
 
 FilterManager::FilterManager()
-    : d(new Private(this))
+    : d(new FilterManagerPrivate(this))
 {
     updateTagList();
 
diff --git a/src/filter/filtermanager.h b/src/filter/filtermanager.h
index 57ada70..31dd147 100644
--- a/src/filter/filtermanager.h
+++ b/src/filter/filtermanager.h
@@ -190,8 +190,8 @@ Q_SIGNALS:
 private:
     FilterManager();
 
-    class Private;
-    Private *const d;
+    class FilterManagerPrivate;
+    FilterManagerPrivate *const d;
 };
 }
 
diff --git a/src/mdn/sendmdnhandler.cpp b/src/mdn/sendmdnhandler.cpp
index 13f9767..31ec5c9 100644
--- a/src/mdn/sendmdnhandler.cpp
+++ b/src/mdn/sendmdnhandler.cpp
@@ -25,10 +25,10 @@
 
 using namespace MailCommon;
 
-class Q_DECL_HIDDEN SendMdnHandler::Private
+class Q_DECL_HIDDEN SendMdnHandler::SendMdnHandlerPrivate
 {
 public:
-    Private(SendMdnHandler *qq, IKernel *kernel)
+    SendMdnHandlerPrivate(SendMdnHandler *qq, IKernel *kernel)
         : q(qq)
         , mKernel(kernel)
     {
@@ -42,7 +42,7 @@ public:
     QTimer mTimer;
 };
 
-void SendMdnHandler::Private::handleMessages()
+void SendMdnHandler::SendMdnHandlerPrivate::handleMessages()
 {
     while (!mItemQueue.isEmpty()) {
         Akonadi::Item item = mItemQueue.dequeue();
@@ -90,7 +90,7 @@ void SendMdnHandler::Private::handleMessages()
 
 SendMdnHandler::SendMdnHandler(IKernel *kernel, QObject *parent)
     : QObject(parent)
-    , d(new Private(this, kernel))
+    , d(new SendMdnHandlerPrivate(this, kernel))
 {
     d->mTimer.setSingleShot(true);
     connect(&d->mTimer, &QTimer::timeout, this, [this]() {
diff --git a/src/mdn/sendmdnhandler.h b/src/mdn/sendmdnhandler.h
index ae8a3ba..de3c9e0 100644
--- a/src/mdn/sendmdnhandler.h
+++ b/src/mdn/sendmdnhandler.h
@@ -45,8 +45,8 @@ public:
 
 private:
     //@cond PRIVATE
-    class Private;
-    std::unique_ptr<Private> const d;
+    class SendMdnHandlerPrivate;
+    std::unique_ptr<SendMdnHandlerPrivate> const d;
     //@endcond
 };
 }