Rename ReplicaPrivate -> ReplicaImplementation

All those implementations for the QtROReplica ('InProcess', 'Connected',
'RemoteObject') aren't technically d-pointers. Mark them as such by
naming them differently.

This also has the nice benefit that one does not override QObject's
'd_ptr' variable accidentally with these implementation instances.

Needed in order to pimpl QRemoteObjectRegistry properly

Change-Id: I88322e37d2ff7e5044980e8fdf9f713d6be80c38
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>

13 files changed, 185 insertions, 186 deletions

diff --git a/src/remoteobjects/doc/snippets/doc_src_remoteobjects.cpp b/src/remoteobjects/doc/snippets/doc_src_remoteobjects.cpp
index a549ab7..3ab3280 100644
--- a/src/remoteobjects/doc/snippets/doc_src_remoteobjects.cpp
+++ b/src/remoteobjects/doc/snippets/doc_src_remoteobjects.cpp
@@ -73,7 +73,7 @@ hostNode.enableRemoting<MinuteTimerSourceAPI>(&timer);
 
 //! [create_replica]
 #include "rep_TimeModel_replica.h"
-QScopedPointer<MinuteTimerReplica> d_ptr;
+QScopedPointer<MinuteTimerReplica> d_impl;
 //! [create_replica]
 
 //! [dynamic_replica]
@@ -81,7 +81,7 @@ QRemoteObjectDynamicReplica *dynamicRep;
 //! [dynamic_replica]
 
 //! [acquire_replica]
-d_ptr->reset(clientNode.acquire("MinuteTimer"));
+d_impl->reset(clientNode.acquire("MinuteTimer"));
 *dynamicRep = clientNode.acquire("MinuteTimer");
 //! [acquire_replica]
 
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp
index 06e131a..92444c1 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp
+++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.cpp
@@ -56,7 +56,7 @@ inline QDebug operator<<(QDebug stream, const RequestedData &data)
     return stream.nospace() << "RequestedData[start=" << data.start << ", end=" << data.end << ", roles=" << data.roles << "]";
 }
 
-CacheData::CacheData(QAbstractItemModelReplicaPrivate *model, CacheData *parentItem)
+CacheData::CacheData(QAbstractItemModelReplicaImplementation *model, CacheData *parentItem)
     : replicaModel(model)
     , parent(parentItem)
     , hasChildren(false)
@@ -72,42 +72,42 @@ CacheData::~CacheData() {
         replicaModel->m_activeParents.erase(this);
 }
 
-QAbstractItemModelReplicaPrivate::QAbstractItemModelReplicaPrivate()
+QAbstractItemModelReplicaImplementation::QAbstractItemModelReplicaImplementation()
     : QRemoteObjectReplica()
     , m_selectionModel(0)
     , m_rootItem(this)
     , m_lastRequested(-1)
 {
     m_rootItem.children.setCacheSize(DefaultRootCacheSize);
-    QAbstractItemModelReplicaPrivate::registerMetatypes();
+    QAbstractItemModelReplicaImplementation::registerMetatypes();
     initializeModelConnections();
-    connect(this, &QAbstractItemModelReplicaPrivate::availableRolesChanged, this, [this]{
+    connect(this, &QAbstractItemModelReplicaImplementation::availableRolesChanged, this, [this]{
         m_availableRoles.clear();
     });
 }
 
-QAbstractItemModelReplicaPrivate::QAbstractItemModelReplicaPrivate(QRemoteObjectNode *node, const QString &name)
+QAbstractItemModelReplicaImplementation::QAbstractItemModelReplicaImplementation(QRemoteObjectNode *node, const QString &name)
     : QRemoteObjectReplica(ConstructWithNode)
     , m_selectionModel(0)
     , m_rootItem(this)
     , m_lastRequested(-1)
 {
     m_rootItem.children.setCacheSize(DefaultRootCacheSize);
-    QAbstractItemModelReplicaPrivate::registerMetatypes();
+    QAbstractItemModelReplicaImplementation::registerMetatypes();
     initializeModelConnections();
     initializeNode(node, name);
-    connect(this, &QAbstractItemModelReplicaPrivate::availableRolesChanged, this, [this]{
+    connect(this, &QAbstractItemModelReplicaImplementation::availableRolesChanged, this, [this]{
         m_availableRoles.clear();
     });
 }
 
-QAbstractItemModelReplicaPrivate::~QAbstractItemModelReplicaPrivate()
+QAbstractItemModelReplicaImplementation::~QAbstractItemModelReplicaImplementation()
 {
     m_rootItem.clear();
     qDeleteAll(m_pendingRequests);
 }
 
-void QAbstractItemModelReplicaPrivate::initialize()
+void QAbstractItemModelReplicaImplementation::initialize()
 {
     QVariantList properties;
     properties << QVariant::fromValue(QVector<int>());
@@ -115,7 +115,7 @@ void QAbstractItemModelReplicaPrivate::initialize()
     setProperties(properties);
 }
 
-void QAbstractItemModelReplicaPrivate::registerMetatypes()
+void QAbstractItemModelReplicaImplementation::registerMetatypes()
 {
     static bool alreadyRegistered = false;
     if (!alreadyRegistered) {
@@ -134,16 +134,16 @@ void QAbstractItemModelReplicaPrivate::registerMetatypes()
     }
 }
 
-void QAbstractItemModelReplicaPrivate::initializeModelConnections()
+void QAbstractItemModelReplicaImplementation::initializeModelConnections()
 {
-    connect(this, &QAbstractItemModelReplicaPrivate::dataChanged, this, &QAbstractItemModelReplicaPrivate::onDataChanged);
-    connect(this, &QAbstractItemModelReplicaPrivate::rowsInserted, this, &QAbstractItemModelReplicaPrivate::onRowsInserted);
-    connect(this, &QAbstractItemModelReplicaPrivate::columnsInserted, this, &QAbstractItemModelReplicaPrivate::onColumnsInserted);
-    connect(this, &QAbstractItemModelReplicaPrivate::rowsRemoved, this, &QAbstractItemModelReplicaPrivate::onRowsRemoved);
-    connect(this, &QAbstractItemModelReplicaPrivate::rowsMoved, this, &QAbstractItemModelReplicaPrivate::onRowsMoved);
-    connect(this, &QAbstractItemModelReplicaPrivate::currentChanged, this, &QAbstractItemModelReplicaPrivate::onCurrentChanged);
-    connect(this, &QAbstractItemModelReplicaPrivate::modelReset, this, &QAbstractItemModelReplicaPrivate::onModelReset);
-    connect(this, &QAbstractItemModelReplicaPrivate::headerDataChanged, this, &QAbstractItemModelReplicaPrivate::onHeaderDataChanged);
+    connect(this, &QAbstractItemModelReplicaImplementation::dataChanged, this, &QAbstractItemModelReplicaImplementation::onDataChanged);
+    connect(this, &QAbstractItemModelReplicaImplementation::rowsInserted, this, &QAbstractItemModelReplicaImplementation::onRowsInserted);
+    connect(this, &QAbstractItemModelReplicaImplementation::columnsInserted, this, &QAbstractItemModelReplicaImplementation::onColumnsInserted);
+    connect(this, &QAbstractItemModelReplicaImplementation::rowsRemoved, this, &QAbstractItemModelReplicaImplementation::onRowsRemoved);
+    connect(this, &QAbstractItemModelReplicaImplementation::rowsMoved, this, &QAbstractItemModelReplicaImplementation::onRowsMoved);
+    connect(this, &QAbstractItemModelReplicaImplementation::currentChanged, this, &QAbstractItemModelReplicaImplementation::onCurrentChanged);
+    connect(this, &QAbstractItemModelReplicaImplementation::modelReset, this, &QAbstractItemModelReplicaImplementation::onModelReset);
+    connect(this, &QAbstractItemModelReplicaImplementation::headerDataChanged, this, &QAbstractItemModelReplicaImplementation::onHeaderDataChanged);
 }
 
 inline void removeIndexFromRow(const QModelIndex &index, const QVector<int> &roles, CachedRowEntry *entry)
@@ -161,7 +161,7 @@ inline void removeIndexFromRow(const QModelIndex &index, const QVector<int> &rol
     }
 }
 
-void QAbstractItemModelReplicaPrivate::onReplicaCurrentChanged(const QModelIndex &current, const QModelIndex &previous)
+void QAbstractItemModelReplicaImplementation::onReplicaCurrentChanged(const QModelIndex &current, const QModelIndex &previous)
 {
     Q_UNUSED(previous)
     IndexList currentIndex = toModelIndexList(current, q);
@@ -169,15 +169,15 @@ void QAbstractItemModelReplicaPrivate::onReplicaCurrentChanged(const QModelIndex
     replicaSetCurrentIndex(currentIndex, QItemSelectionModel::Clear|QItemSelectionModel::Select|QItemSelectionModel::Current);
 }
 
-void QAbstractItemModelReplicaPrivate::setModel(QAbstractItemModelReplica *model)
+void QAbstractItemModelReplicaImplementation::setModel(QAbstractItemModelReplica *model)
 {
     q = model;
     setParent(model);
     m_selectionModel.reset(new QItemSelectionModel(model));
-    connect(m_selectionModel.data(), &QItemSelectionModel::currentChanged, this, &QAbstractItemModelReplicaPrivate::onReplicaCurrentChanged);
+    connect(m_selectionModel.data(), &QItemSelectionModel::currentChanged, this, &QAbstractItemModelReplicaImplementation::onReplicaCurrentChanged);
 }
 
-bool QAbstractItemModelReplicaPrivate::clearCache(const IndexList &start, const IndexList &end, const QVector<int> &roles = QVector<int>())
+bool QAbstractItemModelReplicaImplementation::clearCache(const IndexList &start, const IndexList &end, const QVector<int> &roles = QVector<int>())
 {
     Q_ASSERT(start.size() == end.size());
 
@@ -211,7 +211,7 @@ bool QAbstractItemModelReplicaPrivate::clearCache(const IndexList &start, const
     return true;
 }
 
-void QAbstractItemModelReplicaPrivate::onDataChanged(const IndexList &start, const IndexList &end, const QVector<int> &roles)
+void QAbstractItemModelReplicaImplementation::onDataChanged(const IndexList &start, const IndexList &end, const QVector<int> &roles)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "start=" << start << "end=" << end << "roles=" << roles;
 
@@ -258,7 +258,7 @@ void QAbstractItemModelReplicaPrivate::onDataChanged(const IndexList &start, con
     }
 }
 
-void QAbstractItemModelReplicaPrivate::onRowsInserted(const IndexList &parent, int start, int end)
+void QAbstractItemModelReplicaImplementation::onRowsInserted(const IndexList &parent, int start, int end)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "start=" << start << "end=" << end << "parent=" << parent;
 
@@ -277,7 +277,7 @@ void QAbstractItemModelReplicaPrivate::onRowsInserted(const IndexList &parent, i
     }
 }
 
-void QAbstractItemModelReplicaPrivate::onColumnsInserted(const IndexList &parent, int start, int end)
+void QAbstractItemModelReplicaImplementation::onColumnsInserted(const IndexList &parent, int start, int end)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "start=" << start << "end=" << end << "parent=" << parent;
 
@@ -304,7 +304,7 @@ void QAbstractItemModelReplicaPrivate::onColumnsInserted(const IndexList &parent
 
 }
 
-void QAbstractItemModelReplicaPrivate::onRowsRemoved(const IndexList &parent, int start, int end)
+void QAbstractItemModelReplicaImplementation::onRowsRemoved(const IndexList &parent, int start, int end)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "start=" << start << "end=" << end << "parent=" << parent;
 
@@ -320,7 +320,7 @@ void QAbstractItemModelReplicaPrivate::onRowsRemoved(const IndexList &parent, in
     q->endRemoveRows();
 }
 
-void QAbstractItemModelReplicaPrivate::onRowsMoved(IndexList srcParent, int srcRow, int count, IndexList destParent, int destRow)
+void QAbstractItemModelReplicaImplementation::onRowsMoved(IndexList srcParent, int srcRow, int count, IndexList destParent, int destRow)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO;
 
@@ -341,7 +341,7 @@ void QAbstractItemModelReplicaPrivate::onRowsMoved(IndexList srcParent, int srcR
     q->endMoveRows();
 }
 
-void QAbstractItemModelReplicaPrivate::onCurrentChanged(IndexList current, IndexList previous)
+void QAbstractItemModelReplicaImplementation::onCurrentChanged(IndexList current, IndexList previous)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "current=" << current << "previous=" << previous;
     Q_UNUSED(previous);
@@ -356,7 +356,7 @@ void QAbstractItemModelReplicaPrivate::onCurrentChanged(IndexList current, Index
         m_selectionModel->setCurrentIndex(currentIndex, QItemSelectionModel::Clear|QItemSelectionModel::Select|QItemSelectionModel::Current);
 }
 
-void QAbstractItemModelReplicaPrivate::handleInitDone(QRemoteObjectPendingCallWatcher *watcher)
+void QAbstractItemModelReplicaImplementation::handleInitDone(QRemoteObjectPendingCallWatcher *watcher)
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO;
 
@@ -365,7 +365,7 @@ void QAbstractItemModelReplicaPrivate::handleInitDone(QRemoteObjectPendingCallWa
     emit q->initialized();
 }
 
-void QAbstractItemModelReplicaPrivate::handleModelResetDone(QRemoteObjectPendingCallWatcher *watcher)
+void QAbstractItemModelReplicaImplementation::handleModelResetDone(QRemoteObjectPendingCallWatcher *watcher)
 {
     const QSize size = watcher->returnValue().toSize();
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO << "size=" << size;
@@ -385,7 +385,7 @@ void QAbstractItemModelReplicaPrivate::handleModelResetDone(QRemoteObjectPending
     delete watcher;
 }
 
-void QAbstractItemModelReplicaPrivate::handleSizeDone(QRemoteObjectPendingCallWatcher *watcher)
+void QAbstractItemModelReplicaImplementation::handleSizeDone(QRemoteObjectPendingCallWatcher *watcher)
 {
     SizeWatcher *sizeWatcher = static_cast<SizeWatcher*>(watcher);
     const QSize size = sizeWatcher->returnValue().toSize();
@@ -419,15 +419,15 @@ void QAbstractItemModelReplicaPrivate::handleSizeDone(QRemoteObjectPendingCallWa
     delete watcher;
 }
 
-void QAbstractItemModelReplicaPrivate::init()
+void QAbstractItemModelReplicaImplementation::init()
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO;
     SizeWatcher *watcher = doModelReset();
     m_pendingRequests.push_back(watcher);
-    connect(watcher, &SizeWatcher::finished, this, &QAbstractItemModelReplicaPrivate::handleInitDone);
+    connect(watcher, &SizeWatcher::finished, this, &QAbstractItemModelReplicaImplementation::handleInitDone);
 }
 
-SizeWatcher* QAbstractItemModelReplicaPrivate::doModelReset()
+SizeWatcher* QAbstractItemModelReplicaImplementation::doModelReset()
 {
     qDeleteAll(m_pendingRequests);
     m_pendingRequests.clear();
@@ -494,7 +494,7 @@ int collectEntriesForRow(DataEntries* filteredEntries, int row, const DataEntrie
     return size;
 }
 
-void QAbstractItemModelReplicaPrivate::requestedData(QRemoteObjectPendingCallWatcher *qobject)
+void QAbstractItemModelReplicaImplementation::requestedData(QRemoteObjectPendingCallWatcher *qobject)
 {
     RowWatcher *watcher = static_cast<RowWatcher *>(qobject);
     Q_ASSERT(watcher);
@@ -537,7 +537,7 @@ void QAbstractItemModelReplicaPrivate::requestedData(QRemoteObjectPendingCallWat
     delete watcher;
 }
 
-void QAbstractItemModelReplicaPrivate::fetchPendingData()
+void QAbstractItemModelReplicaImplementation::fetchPendingData()
 {
     if (m_requestedData.isEmpty())
         return;
@@ -616,19 +616,19 @@ void QAbstractItemModelReplicaPrivate::fetchPendingData()
         RowWatcher *watcher = new RowWatcher(it->start, it->end, it->roles, reply);
         rows += 1 + it->end.first().row - it->start.first().row;
         m_pendingRequests.push_back(watcher);
-        connect(watcher, &RowWatcher::finished, this, &QAbstractItemModelReplicaPrivate::requestedData);
+        connect(watcher, &RowWatcher::finished, this, &QAbstractItemModelReplicaImplementation::requestedData);
     }
     m_requestedData.clear();
 }
 
-void QAbstractItemModelReplicaPrivate::onModelReset()
+void QAbstractItemModelReplicaImplementation::onModelReset()
 {
     qCDebug(QT_REMOTEOBJECT_MODELS) << Q_FUNC_INFO;
     SizeWatcher *watcher = doModelReset();
-    connect(watcher, &SizeWatcher::finished, this, &QAbstractItemModelReplicaPrivate::handleModelResetDone);
+    connect(watcher, &SizeWatcher::finished, this, &QAbstractItemModelReplicaImplementation::handleModelResetDone);
 }
 
-void QAbstractItemModelReplicaPrivate::onHeaderDataChanged(Qt::Orientation orientation, int first, int last)
+void QAbstractItemModelReplicaImplementation::onHeaderDataChanged(Qt::Orientation orientation, int first, int last)
 {
     // TODO clean cache
     const int index = orientation == Qt::Horizontal ? 0 : 1;
@@ -638,7 +638,7 @@ void QAbstractItemModelReplicaPrivate::onHeaderDataChanged(Qt::Orientation orien
     emit q->headerDataChanged(orientation, first, last);
 }
 
-void QAbstractItemModelReplicaPrivate::fetchPendingHeaderData()
+void QAbstractItemModelReplicaImplementation::fetchPendingHeaderData()
 {
     QVector<int> roles;
     QVector<int> sections;
@@ -650,7 +650,7 @@ void QAbstractItemModelReplicaPrivate::fetchPendingHeaderData()
     }
     QRemoteObjectPendingReply<QVariantList> reply = replicaHeaderRequest(orientations, sections, roles);
     HeaderWatcher *watcher = new HeaderWatcher(orientations, sections, roles, reply);
-    connect(watcher, &HeaderWatcher::finished, this, &QAbstractItemModelReplicaPrivate::requestedHeaderData);
+    connect(watcher, &HeaderWatcher::finished, this, &QAbstractItemModelReplicaImplementation::requestedHeaderData);
     m_requestedHeaderData.clear();
     m_pendingRequests.push_back(watcher);
 }
@@ -679,7 +679,7 @@ static inline QVector<QPair<int, int> > listRanges(const QVector<int> &list)
     return result;
 }
 
-void QAbstractItemModelReplicaPrivate::requestedHeaderData(QRemoteObjectPendingCallWatcher *qobject)
+void QAbstractItemModelReplicaImplementation::requestedHeaderData(QRemoteObjectPendingCallWatcher *qobject)
 {
     HeaderWatcher *watcher = static_cast<HeaderWatcher *>(qobject);
     Q_ASSERT(watcher);
@@ -712,13 +712,13 @@ void QAbstractItemModelReplicaPrivate::requestedHeaderData(QRemoteObjectPendingC
     delete watcher;
 }
 
-QAbstractItemModelReplica::QAbstractItemModelReplica(QAbstractItemModelReplicaPrivate *rep)
+QAbstractItemModelReplica::QAbstractItemModelReplica(QAbstractItemModelReplicaImplementation *rep)
     : QAbstractItemModel()
     , d(rep)
 {
     rep->setModel(this);
 
-    connect(rep, &QAbstractItemModelReplicaPrivate::initialized, d.data(), &QAbstractItemModelReplicaPrivate::init);
+    connect(rep, &QAbstractItemModelReplicaImplementation::initialized, d.data(), &QAbstractItemModelReplicaImplementation::init);
 }
 
 QAbstractItemModelReplica::~QAbstractItemModelReplica()
@@ -869,7 +869,7 @@ int QAbstractItemModelReplica::rowCount(const QModelIndex &parent) const
         IndexList parentList = toModelIndexList(parent, this);
         QRemoteObjectPendingReply<QSize> reply = d->replicaSizeRequest(parentList);
         SizeWatcher *watcher = new SizeWatcher(parentList, reply);
-        connect(watcher, &SizeWatcher::finished, d.data(), &QAbstractItemModelReplicaPrivate::handleSizeDone);
+        connect(watcher, &SizeWatcher::finished, d.data(), &QAbstractItemModelReplicaImplementation::handleSizeDone);
     } else if (parent.column() > 0) {
         return 0;
     }
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
index f3d48bb..c9d92c6 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica.h
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QAbstractItemModelReplicaPrivate;
+class QAbstractItemModelReplicaImplementation;
 
 class Q_REMOTEOBJECTS_EXPORT QAbstractItemModelReplica : public QAbstractItemModel
 {
@@ -79,9 +79,9 @@ Q_SIGNALS:
     void initialized();
 
 private:
-    explicit QAbstractItemModelReplica(QAbstractItemModelReplicaPrivate *rep);
-    QScopedPointer<QAbstractItemModelReplicaPrivate> d;
-    friend class QAbstractItemModelReplicaPrivate;
+    explicit QAbstractItemModelReplica(QAbstractItemModelReplicaImplementation *rep);
+    QScopedPointer<QAbstractItemModelReplicaImplementation> d;
+    friend class QAbstractItemModelReplicaImplementation;
     friend class QRemoteObjectNode;
 };
 
diff --git a/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h b/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h
index 986ac3c..d002a3c 100644
--- a/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h
+++ b/src/remoteobjects/qremoteobjectabstractitemmodelreplica_p.h
@@ -219,10 +219,10 @@ struct LRUCache
     }
 };
 
-class QAbstractItemModelReplicaPrivate;
+class QAbstractItemModelReplicaImplementation;
 struct CacheData
 {
-    QAbstractItemModelReplicaPrivate *replicaModel;
+    QAbstractItemModelReplicaImplementation *replicaModel;
     CacheData *parent;
     CachedRowEntry cachedRowEntry;
 
@@ -231,7 +231,7 @@ struct CacheData
     int columnCount;
     int rowCount;
 
-    explicit CacheData(QAbstractItemModelReplicaPrivate *model, CacheData *parentItem = nullptr);
+    explicit CacheData(QAbstractItemModelReplicaImplementation *model, CacheData *parentItem = nullptr);
 
     ~CacheData();
 
@@ -320,7 +320,7 @@ public:
     QVector<int> sections, roles;
 };
 
-class QAbstractItemModelReplicaPrivate : public QRemoteObjectReplica
+class QAbstractItemModelReplicaImplementation : public QRemoteObjectReplica
 {
     Q_OBJECT
     //TODO Use an input name for the model on the Replica side
@@ -328,9 +328,9 @@ class QAbstractItemModelReplicaPrivate : public QRemoteObjectReplica
     Q_PROPERTY(QVector<int> availableRoles READ availableRoles NOTIFY availableRolesChanged)
     Q_PROPERTY(QIntHash roleNames READ roleNames)
 public:
-    QAbstractItemModelReplicaPrivate();
-    QAbstractItemModelReplicaPrivate(QRemoteObjectNode *node, const QString &name);
-    ~QAbstractItemModelReplicaPrivate() override;
+    QAbstractItemModelReplicaImplementation();
+    QAbstractItemModelReplicaImplementation(QRemoteObjectNode *node, const QString &name);
+    ~QAbstractItemModelReplicaImplementation() override;
     void initialize() override;
     static void registerMetatypes();
 
@@ -364,35 +364,35 @@ Q_SIGNALS:
 public Q_SLOTS:
     QRemoteObjectPendingReply<QSize> replicaSizeRequest(IndexList parentList)
     {
-        static int __repc_index = QAbstractItemModelReplicaPrivate::staticMetaObject.indexOfSlot("replicaSizeRequest(IndexList)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaSizeRequest(IndexList)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(parentList);
         return QRemoteObjectPendingReply<QSize>(sendWithReply(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args));
     }
     QRemoteObjectPendingReply<DataEntries> replicaRowRequest(IndexList start, IndexList end, QVector<int> roles)
     {
-        static int __repc_index = QAbstractItemModelReplicaPrivate::staticMetaObject.indexOfSlot("replicaRowRequest(IndexList,IndexList,QVector<int>)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaRowRequest(IndexList,IndexList,QVector<int>)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(start) << QVariant::fromValue(end) << QVariant::fromValue(roles);
         return QRemoteObjectPendingReply<DataEntries>(sendWithReply(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args));
     }
     QRemoteObjectPendingReply<QVariantList> replicaHeaderRequest(QVector<Qt::Orientation> orientations, QVector<int> sections, QVector<int> roles)
     {
-        static int __repc_index = QAbstractItemModelReplicaPrivate::staticMetaObject.indexOfSlot("replicaHeaderRequest(QVector<Qt::Orientation>,QVector<int>,QVector<int>)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaHeaderRequest(QVector<Qt::Orientation>,QVector<int>,QVector<int>)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(orientations) << QVariant::fromValue(sections) << QVariant::fromValue(roles);
         return QRemoteObjectPendingReply<QVariantList>(sendWithReply(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args));
     }
     void replicaSetCurrentIndex(IndexList index, QItemSelectionModel::SelectionFlags command)
     {
-        static int __repc_index = QAbstractItemModelReplicaPrivate::staticMetaObject.indexOfSlot("replicaSetCurrentIndex(IndexList,QItemSelectionModel::SelectionFlags)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaSetCurrentIndex(IndexList,QItemSelectionModel::SelectionFlags)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(index) << QVariant::fromValue(command);
         send(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args);
     }
     void replicaSetData(IndexList index, const QVariant &value, int role)
     {
-        static int __repc_index = QAbstractItemModelReplicaPrivate::staticMetaObject.indexOfSlot("replicaSetData(IndexList,QVariant,int)");
+        static int __repc_index = QAbstractItemModelReplicaImplementation::staticMetaObject.indexOfSlot("replicaSetData(IndexList,QVariant,int)");
         QVariantList __repc_args;
         __repc_args << QVariant::fromValue(index) << QVariant::fromValue(value) << QVariant::fromValue(role);
         send(QMetaObject::InvokeMetaMethod, __repc_index, __repc_args);
diff --git a/src/remoteobjects/qremoteobjectdynamicreplica.cpp b/src/remoteobjects/qremoteobjectdynamicreplica.cpp
index 77bb780..096a13e 100644
--- a/src/remoteobjects/qremoteobjectdynamicreplica.cpp
+++ b/src/remoteobjects/qremoteobjectdynamicreplica.cpp
@@ -84,9 +84,9 @@ QRemoteObjectDynamicReplica::~QRemoteObjectDynamicReplica()
 */
 const QMetaObject* QRemoteObjectDynamicReplica::metaObject() const
 {
-    QSharedPointer<QRemoteObjectReplicaPrivate> d = qSharedPointerCast<QRemoteObjectReplicaPrivate>(d_ptr);
+    auto impl = qSharedPointerCast<QRemoteObjectReplicaImplementation>(d_impl);
 
-    return d->m_metaObject ? d->m_metaObject : QRemoteObjectReplica::metaObject();
+    return impl->m_metaObject ? impl->m_metaObject : QRemoteObjectReplica::metaObject();
 }
 
 /*!
@@ -97,8 +97,6 @@ const QMetaObject* QRemoteObjectDynamicReplica::metaObject() const
 */
 void *QRemoteObjectDynamicReplica::qt_metacast(const char *name)
 {
-    QSharedPointer<QRemoteObjectReplicaPrivate> d = qSharedPointerCast<QRemoteObjectReplicaPrivate>(d_ptr);
-
     if (!name)
         return 0;
 
@@ -106,7 +104,8 @@ void *QRemoteObjectDynamicReplica::qt_metacast(const char *name)
         return static_cast<void*>(const_cast<QRemoteObjectDynamicReplica*>(this));
 
     // not entirely sure that one is needed... TODO: check
-    if (QString::fromLatin1(name) == d->m_objectName)
+    auto impl = qSharedPointerCast<QRemoteObjectReplicaImplementation>(d_impl);
+    if (QString::fromLatin1(name) == impl->m_objectName)
         return static_cast<void*>(const_cast<QRemoteObjectDynamicReplica*>(this));
 
     return QObject::qt_metacast(name);
@@ -122,11 +121,11 @@ int QRemoteObjectDynamicReplica::qt_metacall(QMetaObject::Call call, int id, voi
 {
     static const bool debugArgs = qEnvironmentVariableIsSet("QT_REMOTEOBJECT_DEBUG_ARGUMENTS");
 
-    QSharedPointer<QRemoteObjectReplicaPrivate> d = qSharedPointerCast<QRemoteObjectReplicaPrivate>(d_ptr);
+    auto impl = qSharedPointerCast<QRemoteObjectReplicaImplementation>(d_impl);
 
     int saved_id = id;
     id = QRemoteObjectReplica::qt_metacall(call, id, argv);
-    if (id < 0 || d->m_metaObject == nullptr)
+    if (id < 0 || impl->m_metaObject == nullptr)
         return id;
 
     if (call == QMetaObject::ReadProperty || call == QMetaObject::WriteProperty) {
@@ -152,13 +151,13 @@ int QRemoteObjectDynamicReplica::qt_metacall(QMetaObject::Call call, int id, voi
 
         id = -1;
     } else if (call == QMetaObject::InvokeMetaMethod) {
-        if (id < d->m_numSignals) {
+        if (id < impl->m_numSignals) {
             // signal relay from Source world to Replica
-            QMetaObject::activate(this, d->m_metaObject, id, argv);
+            QMetaObject::activate(this, impl->m_metaObject, id, argv);
 
         } else {
             // method relay from Replica to Source
-            const QMetaMethod mm = d->m_metaObject->method(saved_id);
+            const QMetaMethod mm = impl->m_metaObject->method(saved_id);
             const QList<QByteArray> types = mm.parameterTypes();
 
             const int typeSize = types.size();
diff --git a/src/remoteobjects/qremoteobjectnode.cpp b/src/remoteobjects/qremoteobjectnode.cpp
index b75b679..a8d543b 100644
--- a/src/remoteobjects/qremoteobjectnode.cpp
+++ b/src/remoteobjects/qremoteobjectnode.cpp
@@ -128,10 +128,10 @@ void QRemoteObjectNode::initializeReplica(QRemoteObjectReplica *instance, const
 {
     Q_D(QRemoteObjectNode);
     if (instance->inherits("QRemoteObjectDynamicReplica")) {
-        d->setReplicaPrivate(nullptr, instance, name);
+        d->setReplicaImplementation(nullptr, instance, name);
     } else {
         const QMetaObject *meta = instance->metaObject();
-        d->setReplicaPrivate(meta, instance, name.isEmpty() ? ::name(meta) : name);
+        d->setReplicaImplementation(meta, instance, name.isEmpty() ? ::name(meta) : name);
     }
 }
 
@@ -142,23 +142,23 @@ void QRemoteObjectNodePrivate::setLastError(QRemoteObjectNode::ErrorCode errorCo
     emit q->error(lastError);
 }
 
-void QRemoteObjectNodePrivate::setReplicaPrivate(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name)
+void QRemoteObjectNodePrivate::setReplicaImplementation(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name)
 {
-    qROPrivDebug() << "Starting setReplicaPrivate for" << name;
+    qROPrivDebug() << "Starting setReplicaImplementation for" << name;
     isInitialized.storeRelease(1);
     openConnectionIfNeeded(name);
     QMutexLocker locker(&mutex);
     if (hasInstance(name)) {
-        qCDebug(QT_REMOTEOBJECT)<<"setReplicaPrivate - using existing instance";
-        QSharedPointer<QRemoteObjectReplicaPrivate> rep = qSharedPointerCast<QRemoteObjectReplicaPrivate>(replicas.value(name).toStrongRef());
+        qCDebug(QT_REMOTEOBJECT)<<"setReplicaImplementation - using existing instance";
+        QSharedPointer<QRemoteObjectReplicaImplementation> rep = qSharedPointerCast<QRemoteObjectReplicaImplementation>(replicas.value(name).toStrongRef());
         Q_ASSERT(rep);
-        instance->d_ptr = rep;
+        instance->d_impl = rep;
         rep->configurePrivate(instance);
     } else {
-        instance->d_ptr.reset(handleNewAcquire(meta, instance, name));
+        instance->d_impl.reset(handleNewAcquire(meta, instance, name));
         instance->initialize();
-        replicas.insert(name, instance->d_ptr.toWeakRef());
-        qROPrivDebug() << "setReplicaPrivate - Created new instance" << name<<remoteObjectAddresses();
+        replicas.insert(name, instance->d_impl.toWeakRef());
+        qROPrivDebug() << "setReplicaImplementation - Created new instance" << name<<remoteObjectAddresses();
     }
 }
 
@@ -341,7 +341,7 @@ bool QRemoteObjectNodePrivate::hasInstance(const QString &name)
     if (!replicas.contains(name))
         return false;
 
-    QSharedPointer<QReplicaPrivateInterface> rep = replicas.value(name).toStrongRef();
+    QSharedPointer<QReplicaImplementationInterface> rep = replicas.value(name).toStrongRef();
     if (!rep) { //already deleted
         replicas.remove(name);
         return false;
@@ -357,12 +357,12 @@ void QRemoteObjectNodePrivate::onRemoteObjectSourceAdded(const QRemoteObjectSour
         QRemoteObjectSourceLocations locs = registry->sourceLocations();
         locs[entry.first] = entry.second;
         //TODO Is there a way to extend QRemoteObjectSourceLocations in place?
-        registry->d_ptr->setProperty(0, QVariant::fromValue(locs));
+        registry->d_impl->setProperty(0, QVariant::fromValue(locs));
         qROPrivDebug() << "onRemoteObjectSourceAdded, now locations =" << locs;
     }
     if (replicas.contains(entry.first)) //We have a replica waiting on this remoteObject
     {
-        QSharedPointer<QReplicaPrivateInterface> rep = replicas.value(entry.first).toStrongRef();
+        QSharedPointer<QReplicaImplementationInterface> rep = replicas.value(entry.first).toStrongRef();
         if (!rep) { //replica has been deleted, remove from list
             replicas.remove(entry.first);
             return;
@@ -379,7 +379,7 @@ void QRemoteObjectNodePrivate::onRemoteObjectSourceRemoved(const QRemoteObjectSo
     if (!entry.first.isEmpty()) {
         QRemoteObjectSourceLocations locs = registry->sourceLocations();
         locs.remove(entry.first);
-        registry->d_ptr->setProperty(0, QVariant::fromValue(locs));
+        registry->d_impl->setProperty(0, QVariant::fromValue(locs));
     }
 }
 
@@ -392,7 +392,7 @@ void QRemoteObjectNodePrivate::onRegistryInitialized()
         i.next();
         if (replicas.contains(i.key())) //We have a replica waiting on this remoteObject
         {
-            QSharedPointer<QReplicaPrivateInterface> rep = replicas.value(i.key()).toStrongRef();
+            QSharedPointer<QReplicaImplementationInterface> rep = replicas.value(i.key()).toStrongRef();
             if (rep && !requestedUrls.contains(i.value().hostUrl))
                 initConnection(i.value().hostUrl);
             else if (!rep) //replica has been deleted, remove from list
@@ -411,7 +411,7 @@ void QRemoteObjectNodePrivate::onShouldReconnect(ClientIoDevice *ioDevice)
         connectedSources.remove(remoteObject);
         ioDevice->removeSource(remoteObject);
         if (replicas.contains(remoteObject)) { //We have a replica waiting on this remoteObject
-            QSharedPointer<QConnectedReplicaPrivate> rep = qSharedPointerCast<QConnectedReplicaPrivate>(replicas.value(remoteObject).toStrongRef());
+            QSharedPointer<QConnectedReplicaImplementation> rep = qSharedPointerCast<QConnectedReplicaImplementation>(replicas.value(remoteObject).toStrongRef());
             if (rep && !rep->connectionToSource.isNull()) {
                 rep->setDisconnected();
             } else if (!rep) {
@@ -435,10 +435,10 @@ void QRemoteObjectNodePrivate::onShouldReconnect(ClientIoDevice *ioDevice)
 
 //This version of handleNewAcquire creates a QConnectedReplica. If this is a
 //host node, the QRemoteObjectHostBasePrivate overload is called instead.
-QReplicaPrivateInterface *QRemoteObjectNodePrivate::handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name)
+QReplicaImplementationInterface *QRemoteObjectNodePrivate::handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name)
 {
     Q_Q(QRemoteObjectNode);
-    QConnectedReplicaPrivate *rp = new QConnectedReplicaPrivate(name, meta, q);
+    QConnectedReplicaImplementation *rp = new QConnectedReplicaImplementation(name, meta, q);
     rp->configurePrivate(instance);
     if (connectedSources.contains(name)) { //Either we have a peer connections, or existing connection via registry
         if (checkSignatures(rp->m_objectSignature, connectedSources[name].objectSignature))
@@ -454,12 +454,12 @@ QReplicaPrivateInterface *QRemoteObjectNodePrivate::handleNewAcquire(const QMeta
 
 //Host Nodes can use the more efficient InProcess Replica if we (this Node) hold the Source for the
 //requested Replica.  If not, fall back to the Connected Replica case.
-QReplicaPrivateInterface *QRemoteObjectHostBasePrivate::handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name)
+QReplicaImplementationInterface *QRemoteObjectHostBasePrivate::handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name)
 {
     QMap<QString, QRemoteObjectSource*>::const_iterator mapIt;
     if (remoteObjectIo && map_contains(remoteObjectIo->m_remoteObjects, name, mapIt)) {
         Q_Q(QRemoteObjectHostBase);
-        QInProcessReplicaPrivate *rp = new QInProcessReplicaPrivate(name, meta, q);
+        QInProcessReplicaImplementation *rp = new QInProcessReplicaImplementation(name, meta, q);
         rp->configurePrivate(instance);
         connectReplica(mapIt.value()->m_object, instance);
         rp->connectionToSource = mapIt.value();
@@ -491,7 +491,7 @@ void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
                     connectedSources[remoteObject.name] = SourceInfo{connection, remoteObject.typeName, remoteObject.signature};
                     connection->addSource(remoteObject.name);
                     if (replicas.contains(remoteObject.name)) { //We have a replica waiting on this remoteObject
-                        QSharedPointer<QConnectedReplicaPrivate> rep = qSharedPointerCast<QConnectedReplicaPrivate>(replicas.value(remoteObject.name).toStrongRef());
+                        QSharedPointer<QConnectedReplicaImplementation> rep = qSharedPointerCast<QConnectedReplicaImplementation>(replicas.value(remoteObject.name).toStrongRef());
                         if (!rep || checkSignatures(remoteObject.signature, rep->m_objectSignature)) {
                             if (rep && rep->connectionToSource.isNull()) {
                                 qROPrivDebug() << "Test" << remoteObject<<replicas.keys();
@@ -513,7 +513,7 @@ void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
         case InitPacket:
         {
             qROPrivDebug() << "InitObject-->" << rxName << this;
-            QSharedPointer<QConnectedReplicaPrivate> rep = qSharedPointerCast<QConnectedReplicaPrivate>(replicas.value(rxName).toStrongRef());
+            QSharedPointer<QConnectedReplicaImplementation> rep = qSharedPointerCast<QConnectedReplicaImplementation>(replicas.value(rxName).toStrongRef());
             //Use m_rxArgs (a QVariantList to hold the properties QVariantList)
             deserializeInitPacket(connection->stream(), rxArgs);
             if (rep)
@@ -532,7 +532,7 @@ void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
             builder.setSuperClass(&QRemoteObjectReplica::staticMetaObject);
             builder.setFlags(QMetaObjectBuilder::DynamicMetaObject);
             deserializeInitDynamicPacket(connection->stream(), builder, rxArgs);
-            QSharedPointer<QConnectedReplicaPrivate> rep = qSharedPointerCast<QConnectedReplicaPrivate>(replicas.value(rxName).toStrongRef());
+            QSharedPointer<QConnectedReplicaImplementation> rep = qSharedPointerCast<QConnectedReplicaImplementation>(replicas.value(rxName).toStrongRef());
             if (rep)
             {
                 rep->initializeMetaObject(builder, rxArgs);
@@ -547,7 +547,7 @@ void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
             connectedSources.remove(rxName);
             connection->removeSource(rxName);
             if (replicas.contains(rxName)) { //We have a replica waiting on this remoteObject
-                QSharedPointer<QConnectedReplicaPrivate> rep = qSharedPointerCast<QConnectedReplicaPrivate>(replicas.value(rxName).toStrongRef());
+                QSharedPointer<QConnectedReplicaImplementation> rep = qSharedPointerCast<QConnectedReplicaImplementation>(replicas.value(rxName).toStrongRef());
                 if (rep && !rep->connectionToSource.isNull()) {
                     rep->connectionToSource.clear();
                     rep->setState(QRemoteObjectReplica::Suspect);
@@ -561,7 +561,7 @@ void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
         {
             int propertyIndex;
             deserializePropertyChangePacket(connection->stream(), propertyIndex, rxValue);
-            QSharedPointer<QRemoteObjectReplicaPrivate> rep = qSharedPointerCast<QRemoteObjectReplicaPrivate>(replicas.value(rxName).toStrongRef());
+            QSharedPointer<QRemoteObjectReplicaImplementation> rep = qSharedPointerCast<QRemoteObjectReplicaImplementation>(replicas.value(rxName).toStrongRef());
             if (rep) {
                 const QMetaProperty property = rep->m_metaObject->property(propertyIndex + rep->m_metaObject->propertyOffset());
                 rep->setProperty(propertyIndex, deserializedProperty(rxValue, property));
@@ -574,7 +574,7 @@ void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
         {
             int call, index, serialId, propertyIndex;
             deserializeInvokePacket(connection->stream(), call, index, rxArgs, serialId, propertyIndex);
-            QSharedPointer<QRemoteObjectReplicaPrivate> rep = qSharedPointerCast<QRemoteObjectReplicaPrivate>(replicas.value(rxName).toStrongRef());
+            QSharedPointer<QRemoteObjectReplicaImplementation> rep = qSharedPointerCast<QRemoteObjectReplicaImplementation>(replicas.value(rxName).toStrongRef());
             if (rep) {
                 static QVariant null(QMetaType::QObjectStar, (void*)0);
                 QVariant paramValue;
@@ -601,7 +601,7 @@ void QRemoteObjectNodePrivate::onClientRead(QObject *obj)
         {
             int ackedSerialId;
             deserializeInvokeReplyPacket(connection->stream(), ackedSerialId, rxValue);
-            QSharedPointer<QRemoteObjectReplicaPrivate> rep = qSharedPointerCast<QRemoteObjectReplicaPrivate>(replicas.value(rxName).toStrongRef());
+            QSharedPointer<QRemoteObjectReplicaImplementation> rep = qSharedPointerCast<QRemoteObjectReplicaImplementation>(replicas.value(rxName).toStrongRef());
             if (rep) {
                 qROPrivDebug() << "Received InvokeReplyPacket ack'ing serial id:" << ackedSerialId;
                 rep->notifyAboutReply(ackedSerialId, rxValue);
@@ -1369,7 +1369,7 @@ bool QRemoteObjectHostBase::disableRemoting(QObject *remoteObject)
  */
 QAbstractItemModelReplica *QRemoteObjectNode::acquireModel(const QString &name)
 {
-    QAbstractItemModelReplicaPrivate *rep = acquire<QAbstractItemModelReplicaPrivate>(name);
+    QAbstractItemModelReplicaImplementation *rep = acquire<QAbstractItemModelReplicaImplementation>(name);
     return new QAbstractItemModelReplica(rep);
 }
 
diff --git a/src/remoteobjects/qremoteobjectnode_p.h b/src/remoteobjects/qremoteobjectnode_p.h
index 727d2e1..27e84ec 100644
--- a/src/remoteobjects/qremoteobjectnode_p.h
+++ b/src/remoteobjects/qremoteobjectnode_p.h
@@ -90,7 +90,7 @@ public:
 
     virtual QRemoteObjectSourceLocations remoteObjectAddresses() const;
 
-    void setReplicaPrivate(const QMetaObject *, QRemoteObjectReplica *, const QString &);
+    void setReplicaImplementation(const QMetaObject *, QRemoteObjectReplica *, const QString &);
 
     void setLastError(QRemoteObjectNode::ErrorCode errorCode);
 
@@ -107,7 +107,7 @@ public:
     void onRegistryInitialized();
     void onShouldReconnect(ClientIoDevice *ioDevice);
 
-    virtual QReplicaPrivateInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name);
+    virtual QReplicaImplementationInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name);
     void initialize();
 private:
     bool checkSignatures(const QByteArray &a, const QByteArray &b);
@@ -123,7 +123,7 @@ public:
     QAtomicInt isInitialized;
     QMutex mutex;
     QUrl registryAddress;
-    QHash<QString, QWeakPointer<QReplicaPrivateInterface> > replicas;
+    QHash<QString, QWeakPointer<QReplicaImplementationInterface> > replicas;
     QMap<QString, SourceInfo> connectedSources;
     QSet<ClientIoDevice*> pendingReconnect;
     QSet<QUrl> requestedUrls;
@@ -144,7 +144,7 @@ class QRemoteObjectHostBasePrivate : public QRemoteObjectNodePrivate
 public:
     QRemoteObjectHostBasePrivate();
     ~QRemoteObjectHostBasePrivate() override {}
-    QReplicaPrivateInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name) override;
+    QReplicaImplementationInterface *handleNewAcquire(const QMetaObject *meta, QRemoteObjectReplica *instance, const QString &name) override;
 
 public:
     QRemoteObjectSourceIo *remoteObjectIo;
diff --git a/src/remoteobjects/qremoteobjectpendingcall.cpp b/src/remoteobjects/qremoteobjectpendingcall.cpp
index efade81..94decf0 100644
--- a/src/remoteobjects/qremoteobjectpendingcall.cpp
+++ b/src/remoteobjects/qremoteobjectpendingcall.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QRemoteObjectPendingCallData::QRemoteObjectPendingCallData(int serialId, QRemoteObjectReplicaPrivate *replica)
+QRemoteObjectPendingCallData::QRemoteObjectPendingCallData(int serialId, QRemoteObjectReplicaImplementation *replica)
     : replica(replica)
     , serialId(serialId)
     , error(QRemoteObjectPendingCall::InvalidMessage)
diff --git a/src/remoteobjects/qremoteobjectpendingcall.h b/src/remoteobjects/qremoteobjectpendingcall.h
index 80ea278..41a18a7 100644
--- a/src/remoteobjects/qremoteobjectpendingcall.h
+++ b/src/remoteobjects/qremoteobjectpendingcall.h
@@ -79,7 +79,7 @@ protected:
     QExplicitlySharedDataPointer<QRemoteObjectPendingCallData> d;
 
 private:
-    friend class QConnectedReplicaPrivate;
+    friend class QConnectedReplicaImplementation;
 };
 
 QT_END_NAMESPACE
diff --git a/src/remoteobjects/qremoteobjectpendingcall_p.h b/src/remoteobjects/qremoteobjectpendingcall_p.h
index a92234f..9a19d9b 100644
--- a/src/remoteobjects/qremoteobjectpendingcall_p.h
+++ b/src/remoteobjects/qremoteobjectpendingcall_p.h
@@ -58,17 +58,17 @@
 QT_BEGIN_NAMESPACE
 
 class QRemoteObjectPendingCallWatcherHelper;
-class QRemoteObjectReplicaPrivate;
+class QRemoteObjectReplicaImplementation;
 
 class QRemoteObjectPendingCallData : public QSharedData
 {
 public:
     typedef QExplicitlySharedDataPointer<QRemoteObjectPendingCallData> Ptr;
 
-    explicit QRemoteObjectPendingCallData(int serialId = -1, QRemoteObjectReplicaPrivate *replica = nullptr);
+    explicit QRemoteObjectPendingCallData(int serialId = -1, QRemoteObjectReplicaImplementation *replica = nullptr);
     ~QRemoteObjectPendingCallData();
 
-    QRemoteObjectReplicaPrivate *replica;
+    QRemoteObjectReplicaImplementation *replica;
     int serialId;
 
     QVariant returnValue;
diff --git a/src/remoteobjects/qremoteobjectreplica.cpp b/src/remoteobjects/qremoteobjectreplica.cpp
index 12a70c5..aa1748c 100644
--- a/src/remoteobjects/qremoteobjectreplica.cpp
+++ b/src/remoteobjects/qremoteobjectreplica.cpp
@@ -69,7 +69,7 @@ Q_STATIC_ASSERT_X(&QRemoteObjectReplica::staticMetaObject == &QRemoteObjectDynam
 // used.  It was changed to avoid a Coverity complaint.  We use the above static assert to detect if this changes
 // in the future.  See FIX #1, #2, #3 in this file.
 
-QRemoteObjectReplicaPrivate::QRemoteObjectReplicaPrivate(const QString &name, const QMetaObject *meta, QRemoteObjectNode *_node)
+QRemoteObjectReplicaImplementation::QRemoteObjectReplicaImplementation(const QString &name, const QMetaObject *meta, QRemoteObjectNode *_node)
     : QObject(nullptr), m_objectName(name), m_metaObject(meta), m_numSignals(0), m_methodOffset(0)
     // Uncomment the following two lines if QRemoteObjectDynamicReplica gets a unique staticMetaObject (FIX #1, #2)
     //, m_signalOffset(meta ? QRemoteObjectReplica::staticMetaObject.methodCount() : QRemoteObjectDynamicReplica::staticMetaObject.methodCount())
@@ -82,18 +82,18 @@ QRemoteObjectReplicaPrivate::QRemoteObjectReplicaPrivate(const QString &name, co
 {
 }
 
-QRemoteObjectReplicaPrivate::~QRemoteObjectReplicaPrivate()
+QRemoteObjectReplicaImplementation::~QRemoteObjectReplicaImplementation()
 {
     if (m_metaObject && qstrcmp(m_metaObject->className(), "QRemoteObjectDynamicReplica") == 0)
         free(const_cast<QMetaObject*>(m_metaObject));
 }
 
-QConnectedReplicaPrivate::QConnectedReplicaPrivate(const QString &name, const QMetaObject *meta, QRemoteObjectNode *node)
-    : QRemoteObjectReplicaPrivate(name, meta, node), connectionToSource(nullptr), m_curSerialId(0)
+QConnectedReplicaImplementation::QConnectedReplicaImplementation(const QString &name, const QMetaObject *meta, QRemoteObjectNode *node)
+    : QRemoteObjectReplicaImplementation(name, meta, node), connectionToSource(nullptr), m_curSerialId(0)
 {
 }
 
-QConnectedReplicaPrivate::~QConnectedReplicaPrivate()
+QConnectedReplicaImplementation::~QConnectedReplicaImplementation()
 {
     if (!connectionToSource.isNull()) {
         qCDebug(QT_REMOTEOBJECT) << "Replica deleted: sending RemoveObject to RemoteObjectSource" << m_objectName;
@@ -102,12 +102,12 @@ QConnectedReplicaPrivate::~QConnectedReplicaPrivate()
     }
 }
 
-bool QRemoteObjectReplicaPrivate::needsDynamicInitialization() const
+bool QRemoteObjectReplicaImplementation::needsDynamicInitialization() const
 {
     return m_metaObject == nullptr;
 }
 
-void QRemoteObjectReplicaPrivate::setState(QRemoteObjectReplica::State state)
+void QRemoteObjectReplicaImplementation::setState(QRemoteObjectReplica::State state)
 {
     if (m_state != QRemoteObjectReplica::Suspect && m_state >= state)
         return;
@@ -128,7 +128,7 @@ void QRemoteObjectReplicaPrivate::setState(QRemoteObjectReplica::State state)
     QMetaObject::activate(this, metaObject(), stateChangedIndex, args);
 }
 
-bool QConnectedReplicaPrivate::sendCommand()
+bool QConnectedReplicaImplementation::sendCommand()
 {
     if (connectionToSource.isNull() || !connectionToSource->isOpen()) {
         if (connectionToSource.isNull())
@@ -140,7 +140,7 @@ bool QConnectedReplicaPrivate::sendCommand()
     return true;
 }
 
-void QConnectedReplicaPrivate::initialize(const QVariantList &values)
+void QConnectedReplicaImplementation::initialize(const QVariantList &values)
 {
     qCDebug(QT_REMOTEOBJECT) << "initialize()" << m_propertyStorage.size();
     const int nParam = values.size();
@@ -175,7 +175,7 @@ void QConnectedReplicaPrivate::initialize(const QVariantList &values)
     qCDebug(QT_REMOTEOBJECT) << "isSet = true for" << m_objectName;
 }
 
-void QRemoteObjectReplicaPrivate::emitInitialized()
+void QRemoteObjectReplicaImplementation::emitInitialized()
 {
     const static int initializedIndex = QRemoteObjectReplica::staticMetaObject.indexOfMethod("initialized()");
     Q_ASSERT(initializedIndex != -1);
@@ -207,7 +207,7 @@ QVariantList QRemoteObjectReplica::retrieveProperties(const QString &repName, co
     return node()->retrieveProperties(repName, repSig);
 }
 
-void QRemoteObjectReplicaPrivate::initializeMetaObject(const QMetaObjectBuilder &builder, const QVariantList &values)
+void QRemoteObjectReplicaImplementation::initializeMetaObject(const QMetaObjectBuilder &builder, const QVariantList &values)
 {
     Q_ASSERT(!m_metaObject);
 
@@ -216,9 +216,9 @@ void QRemoteObjectReplicaPrivate::initializeMetaObject(const QMetaObjectBuilder
     setProperties(values);
 }
 
-void QConnectedReplicaPrivate::initializeMetaObject(const QMetaObjectBuilder &builder, const QVariantList &values)
+void QConnectedReplicaImplementation::initializeMetaObject(const QMetaObjectBuilder &builder, const QVariantList &values)
 {
-    QRemoteObjectReplicaPrivate::initializeMetaObject(builder, values);
+    QRemoteObjectReplicaImplementation::initializeMetaObject(builder, values);
     foreach (QRemoteObjectReplica *obj, m_parentsNeedingConnect)
         configurePrivate(obj);
     m_parentsNeedingConnect.clear();
@@ -239,12 +239,12 @@ void QConnectedReplicaPrivate::initializeMetaObject(const QMetaObjectBuilder &bu
     qCDebug(QT_REMOTEOBJECT) << "isSet = true for" << m_objectName;
 }
 
-bool QConnectedReplicaPrivate::isInitialized() const
+bool QConnectedReplicaImplementation::isInitialized() const
 {
     return  m_state > QRemoteObjectReplica::Default && m_state != QRemoteObjectReplica::SignatureMismatch;
 }
 
-bool QConnectedReplicaPrivate::waitForSource(int timeout)
+bool QConnectedReplicaImplementation::waitForSource(int timeout)
 {
     switch (state()) {
     case QRemoteObjectReplica::State::Valid:
@@ -273,7 +273,7 @@ bool QConnectedReplicaPrivate::waitForSource(int timeout)
     return state() == QRemoteObjectReplica::State::Valid;
 }
 
-void QConnectedReplicaPrivate::_q_send(QMetaObject::Call call, int index, const QVariantList &args)
+void QConnectedReplicaImplementation::_q_send(QMetaObject::Call call, int index, const QVariantList &args)
 {
     static const bool debugArgs = qEnvironmentVariableIsSet("QT_REMOTEOBJECT_DEBUG_ARGUMENTS");
 
@@ -302,7 +302,7 @@ void QConnectedReplicaPrivate::_q_send(QMetaObject::Call call, int index, const
     }
 }
 
-QRemoteObjectPendingCall QConnectedReplicaPrivate::_q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args)
+QRemoteObjectPendingCall QConnectedReplicaImplementation::_q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args)
 {
     Q_ASSERT(call == QMetaObject::InvokeMetaMethod);
 
@@ -312,7 +312,7 @@ QRemoteObjectPendingCall QConnectedReplicaPrivate::_q_sendWithReply(QMetaObject:
     return sendCommandWithReply(serialId);
 }
 
-QRemoteObjectPendingCall QConnectedReplicaPrivate::sendCommandWithReply(int serialId)
+QRemoteObjectPendingCall QConnectedReplicaImplementation::sendCommandWithReply(int serialId)
 {
     bool success = sendCommand();
     if (!success) {
@@ -326,7 +326,7 @@ QRemoteObjectPendingCall QConnectedReplicaPrivate::sendCommandWithReply(int seri
     return pendingCall;
 }
 
-void QConnectedReplicaPrivate::notifyAboutReply(int ackedSerialId, const QVariant &value)
+void QConnectedReplicaImplementation::notifyAboutReply(int ackedSerialId, const QVariant &value)
 {
     QRemoteObjectPendingCall call = m_pendingCalls.take(ackedSerialId);
 
@@ -341,7 +341,7 @@ void QConnectedReplicaPrivate::notifyAboutReply(int ackedSerialId, const QVarian
         call.d->watcherHelper->emitSignals();
 }
 
-bool QConnectedReplicaPrivate::waitForFinished(const QRemoteObjectPendingCall& call, int timeout)
+bool QConnectedReplicaImplementation::waitForFinished(const QRemoteObjectPendingCall& call, int timeout)
 {
     if (!call.d->watcherHelper)
         call.d->watcherHelper.reset(new QRemoteObjectPendingCallWatcherHelper);
@@ -360,25 +360,25 @@ bool QConnectedReplicaPrivate::waitForFinished(const QRemoteObjectPendingCall& c
     return call.d->error != QRemoteObjectPendingCall::InvalidMessage;
 }
 
-const QVariant QConnectedReplicaPrivate::getProperty(int i) const
+const QVariant QConnectedReplicaImplementation::getProperty(int i) const
 {
     Q_ASSERT_X(i >= 0 && i < m_propertyStorage.size(), __FUNCTION__, qPrintable(QString(QLatin1String("0 <= %1 < %2")).arg(i).arg(m_propertyStorage.size())));
     return m_propertyStorage[i];
 }
 
-void QConnectedReplicaPrivate::setProperties(const QVariantList &properties)
+void QConnectedReplicaImplementation::setProperties(const QVariantList &properties)
 {
     Q_ASSERT(m_propertyStorage.isEmpty());
     m_propertyStorage.reserve(properties.length());
     m_propertyStorage = properties;
 }
 
-void QConnectedReplicaPrivate::setProperty(int i, const QVariant &prop)
+void QConnectedReplicaImplementation::setProperty(int i, const QVariant &prop)
 {
     m_propertyStorage[i] = prop;
 }
 
-void QConnectedReplicaPrivate::setConnection(ClientIoDevice *conn)
+void QConnectedReplicaImplementation::setConnection(ClientIoDevice *conn)
 {
     if (connectionToSource.isNull()) {
         connectionToSource = conn;
@@ -387,19 +387,19 @@ void QConnectedReplicaPrivate::setConnection(ClientIoDevice *conn)
     requestRemoteObjectSource();
 }
 
-void QConnectedReplicaPrivate::setDisconnected()
+void QConnectedReplicaImplementation::setDisconnected()
 {
     connectionToSource.clear();
     setState(QRemoteObjectReplica::State::Suspect);
 }
 
-void QConnectedReplicaPrivate::requestRemoteObjectSource()
+void QConnectedReplicaImplementation::requestRemoteObjectSource()
 {
     serializeAddObjectPacket(m_packet, m_objectName, needsDynamicInitialization());
     sendCommand();
 }
 
-void QRemoteObjectReplicaPrivate::configurePrivate(QRemoteObjectReplica *rep)
+void QRemoteObjectReplicaImplementation::configurePrivate(QRemoteObjectReplica *rep)
 {
     qCDebug(QT_REMOTEOBJECT) << "configurePrivate starting for" << this->m_objectName;
     //We need to connect the Replicant only signals too
@@ -436,22 +436,22 @@ void QRemoteObjectReplicaPrivate::configurePrivate(QRemoteObjectReplica *rep)
             Q_UNUSED(res);
         }
         if (isInitialized()) {
-            qCDebug(QT_REMOTEOBJECT) << QStringLiteral("ReplicaPrivate initialized, emitting signal on replica");
+            qCDebug(QT_REMOTEOBJECT) << QStringLiteral("ReplicaImplementation initialized, emitting signal on replica");
             emit rep->initialized(); //Emit from new replica only
         }
         if (state() != QRemoteObjectReplica::Valid) {
-            qCDebug(QT_REMOTEOBJECT) << QStringLiteral("ReplicaPrivate not currently valid, emitting signal on replica");
+            qCDebug(QT_REMOTEOBJECT) << QStringLiteral("ReplicaImplementation not currently valid, emitting signal on replica");
             emit rep->stateChanged(state(), m_metaObject ? QRemoteObjectReplica::Default : QRemoteObjectReplica::Uninitialized);
         }
 
-        qCDebug(QT_REMOTEOBJECT) << QStringLiteral("configurePrivate finished, added replica to existing ReplicaPrivate");
+        qCDebug(QT_REMOTEOBJECT) << QStringLiteral("configurePrivate finished, added replica to existing ReplicaImplementation");
     }
 }
 
-void QConnectedReplicaPrivate::configurePrivate(QRemoteObjectReplica *rep)
+void QConnectedReplicaImplementation::configurePrivate(QRemoteObjectReplica *rep)
 {
     if (m_metaObject)
-        QRemoteObjectReplicaPrivate::configurePrivate(rep);
+        QRemoteObjectReplicaImplementation::configurePrivate(rep);
     else
         m_parentsNeedingConnect.append(rep);
 }
@@ -528,7 +528,7 @@ void QConnectedReplicaPrivate::configurePrivate(QRemoteObjectReplica *rep)
 */
 QRemoteObjectReplica::QRemoteObjectReplica(ConstructorType t)
     : QObject(nullptr)
-    , d_ptr(t == DefaultConstructor ? new QStubReplicaPrivate : 0)
+    , d_impl(t == DefaultConstructor ? new QStubReplicaImplementation : 0)
 {
     qRegisterMetaType<State>("State");
 }
@@ -547,7 +547,7 @@ void QRemoteObjectReplica::send(QMetaObject::Call call, int index, const QVarian
 {
     Q_ASSERT(index != -1);
 
-    d_ptr->_q_send(call, index, args);
+    d_impl->_q_send(call, index, args);
 }
 
 /*!
@@ -555,7 +555,7 @@ void QRemoteObjectReplica::send(QMetaObject::Call call, int index, const QVarian
 */
 QRemoteObjectPendingCall QRemoteObjectReplica::sendWithReply(QMetaObject::Call call, int index, const QVariantList &args)
 {
-    return d_ptr->_q_sendWithReply(call, index, args);
+    return d_impl->_q_sendWithReply(call, index, args);
 }
 
 /*!
@@ -563,7 +563,7 @@ QRemoteObjectPendingCall QRemoteObjectReplica::sendWithReply(QMetaObject::Call c
 */
 const QVariant QRemoteObjectReplica::propAsVariant(int i) const
 {
-    return d_ptr->getProperty(i);
+    return d_impl->getProperty(i);
 }
 
 /*!
@@ -579,7 +579,7 @@ void QRemoteObjectReplica::initializeNode(QRemoteObjectNode *node, const QString
 */
 void QRemoteObjectReplica::setProperties(const QVariantList &properties)
 {
-    d_ptr->setProperties(properties);
+    d_impl->setProperties(properties);
 }
 
 /*!
@@ -589,7 +589,7 @@ void QRemoteObjectReplica::setProperties(const QVariantList &properties)
 */
 bool QRemoteObjectReplica::isInitialized() const
 {
-    return d_ptr->isInitialized();
+    return d_impl->isInitialized();
 }
 
 /*!
@@ -599,12 +599,12 @@ bool QRemoteObjectReplica::isInitialized() const
 */
 QRemoteObjectReplica::State QRemoteObjectReplica::state() const
 {
-    return d_ptr->state();
+    return d_impl->state();
 }
 
 QRemoteObjectNode *QRemoteObjectReplica::node() const
 {
-    return d_ptr->node();
+    return d_impl->node();
 }
 
 void QRemoteObjectReplica::setNode(QRemoteObjectNode *_node)
@@ -614,7 +614,7 @@ void QRemoteObjectReplica::setNode(QRemoteObjectNode *_node)
         qCWarning(QT_REMOTEOBJECT) << "Ignoring call to setNode as the node has already been set";
         return;
     }
-    d_ptr.clear();
+    d_impl.clear();
     _node->initializeReplica(this);
 }
 
@@ -644,19 +644,19 @@ bool QRemoteObjectReplica::isReplicaValid() const
 */
 bool QRemoteObjectReplica::waitForSource(int timeout)
 {
-    return d_ptr->waitForSource(timeout);
+    return d_impl->waitForSource(timeout);
 }
 
-QInProcessReplicaPrivate::QInProcessReplicaPrivate(const QString &name, const QMetaObject *meta, QRemoteObjectNode * node)
-    : QRemoteObjectReplicaPrivate(name, meta, node)
+QInProcessReplicaImplementation::QInProcessReplicaImplementation(const QString &name, const QMetaObject *meta, QRemoteObjectNode * node)
+    : QRemoteObjectReplicaImplementation(name, meta, node)
 {
 }
 
-QInProcessReplicaPrivate::~QInProcessReplicaPrivate()
+QInProcessReplicaImplementation::~QInProcessReplicaImplementation()
 {
 }
 
-const QVariant QInProcessReplicaPrivate::getProperty(int i) const
+const QVariant QInProcessReplicaImplementation::getProperty(int i) const
 {
     Q_ASSERT(connectionToSource);
     Q_ASSERT(connectionToSource->m_object);
@@ -665,12 +665,12 @@ const QVariant QInProcessReplicaPrivate::getProperty(int i) const
     return connectionToSource->m_object->metaObject()->property(index).read(connectionToSource->m_object);
 }
 
-void QInProcessReplicaPrivate::setProperties(const QVariantList &)
+void QInProcessReplicaImplementation::setProperties(const QVariantList &)
 {
     //TODO some verification here maybe?
 }
 
-void QInProcessReplicaPrivate::setProperty(int i, const QVariant &property)
+void QInProcessReplicaImplementation::setProperty(int i, const QVariant &property)
 {
     Q_ASSERT(connectionToSource);
     Q_ASSERT(connectionToSource->m_object);
@@ -679,7 +679,7 @@ void QInProcessReplicaPrivate::setProperty(int i, const QVariant &property)
     connectionToSource->m_object->metaObject()->property(index).write(connectionToSource->m_object, property);
 }
 
-void QInProcessReplicaPrivate::_q_send(QMetaObject::Call call, int index, const QVariantList &args)
+void QInProcessReplicaImplementation::_q_send(QMetaObject::Call call, int index, const QVariantList &args)
 {
     Q_ASSERT(call == QMetaObject::InvokeMetaMethod || call == QMetaObject::WriteProperty);
 
@@ -699,7 +699,7 @@ void QInProcessReplicaPrivate::_q_send(QMetaObject::Call call, int index, const
     }
 }
 
-QRemoteObjectPendingCall QInProcessReplicaPrivate::_q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args)
+QRemoteObjectPendingCall QInProcessReplicaImplementation::_q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args)
 {
     Q_ASSERT(call == QMetaObject::InvokeMetaMethod);
 
@@ -719,29 +719,29 @@ QRemoteObjectPendingCall QInProcessReplicaPrivate::_q_sendWithReply(QMetaObject:
     return QRemoteObjectPendingCall::fromCompletedCall(returnValue);
 }
 
-QStubReplicaPrivate::QStubReplicaPrivate() {}
+QStubReplicaImplementation::QStubReplicaImplementation() {}
 
-QStubReplicaPrivate::~QStubReplicaPrivate() {}
+QStubReplicaImplementation::~QStubReplicaImplementation() {}
 
-const QVariant QStubReplicaPrivate::getProperty(int i) const
+const QVariant QStubReplicaImplementation::getProperty(int i) const
 {
     Q_ASSERT_X(i >= 0 && i < m_propertyStorage.size(), __FUNCTION__, qPrintable(QString(QLatin1String("0 <= %1 < %2")).arg(i).arg(m_propertyStorage.size())));
     return m_propertyStorage[i];
 }
 
-void QStubReplicaPrivate::setProperties(const QVariantList &properties)
+void QStubReplicaImplementation::setProperties(const QVariantList &properties)
 {
     Q_ASSERT(m_propertyStorage.isEmpty());
     m_propertyStorage.reserve(properties.length());
     m_propertyStorage = properties;
 }
 
-void QStubReplicaPrivate::setProperty(int i, const QVariant &prop)
+void QStubReplicaImplementation::setProperty(int i, const QVariant &prop)
 {
     m_propertyStorage[i] = prop;
 }
 
-void QStubReplicaPrivate::_q_send(QMetaObject::Call call, int index, const QVariantList &args)
+void QStubReplicaImplementation::_q_send(QMetaObject::Call call, int index, const QVariantList &args)
 {
     Q_UNUSED(call);
     Q_UNUSED(index);
@@ -749,7 +749,7 @@ void QStubReplicaPrivate::_q_send(QMetaObject::Call call, int index, const QVari
     qWarning("Tried calling a slot or setting a property on a replica that hasn't been initialized with a node");
 }
 
-QRemoteObjectPendingCall QStubReplicaPrivate::_q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args)
+QRemoteObjectPendingCall QStubReplicaImplementation::_q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args)
 {
     Q_UNUSED(call);
     Q_UNUSED(index);
diff --git a/src/remoteobjects/qremoteobjectreplica.h b/src/remoteobjects/qremoteobjectreplica.h
index 1163564..85f8c4e 100644
--- a/src/remoteobjects/qremoteobjectreplica.h
+++ b/src/remoteobjects/qremoteobjectreplica.h
@@ -47,8 +47,8 @@
 QT_BEGIN_NAMESPACE
 
 class QRemoteObjectPendingCall;
-class QRemoteObjectReplicaPrivate;
-class QReplicaPrivateInterface;
+class QRemoteObjectReplicaImplementation;
+class QReplicaImplementationInterface;
 class QRemoteObjectNode;
 
 class Q_REMOTEOBJECTS_EXPORT QRemoteObjectReplica : public QObject
@@ -94,7 +94,7 @@ protected:
     void persistProperties(const QString &repName, const QByteArray &repSig, const QVariantList &props) const;
     QVariantList retrieveProperties(const QString &repName, const QByteArray &repSig) const;
     void initializeNode(QRemoteObjectNode *node, const QString &name = QString());
-    QSharedPointer<QReplicaPrivateInterface> d_ptr;
+    QSharedPointer<QReplicaImplementationInterface> d_impl;
 private:
     friend class QRemoteObjectNodePrivate;
 };
diff --git a/src/remoteobjects/qremoteobjectreplica_p.h b/src/remoteobjects/qremoteobjectreplica_p.h
index 9aa8fef..465f111 100644
--- a/src/remoteobjects/qremoteobjectreplica_p.h
+++ b/src/remoteobjects/qremoteobjectreplica_p.h
@@ -75,10 +75,10 @@ class QInvokeReplyPacket;
 class QRemoteObjectPacket;
 }
 
-class QReplicaPrivateInterface
+class QReplicaImplementationInterface
 {
 public:
-    virtual ~QReplicaPrivateInterface() {}
+    virtual ~QReplicaImplementationInterface() {}
     virtual const QVariant getProperty(int i) const = 0;
     virtual void setProperties(const QVariantList &) = 0;
     virtual void setProperty(int i, const QVariant &) = 0;
@@ -91,11 +91,11 @@ public:
     virtual QRemoteObjectPendingCall _q_sendWithReply(QMetaObject::Call call, int index, const QVariantList &args) = 0;
 };
 
-class QStubReplicaPrivate : public QReplicaPrivateInterface
+class QStubReplicaImplementation : public QReplicaImplementationInterface
 {
 public:
-    explicit QStubReplicaPrivate();
-    ~QStubReplicaPrivate() override;
+    explicit QStubReplicaImplementation();
+    ~QStubReplicaImplementation() override;
 
     const QVariant getProperty(int i) const override;
     void setProperties(const QVariantList &) override;
@@ -110,11 +110,11 @@ public:
     QVariantList m_propertyStorage;
 };
 
-class QRemoteObjectReplicaPrivate : public QObject, public QReplicaPrivateInterface
+class QRemoteObjectReplicaImplementation : public QObject, public QReplicaImplementationInterface
 {
 public:
-    explicit QRemoteObjectReplicaPrivate(const QString &name, const QMetaObject *, QRemoteObjectNode *);
-    ~QRemoteObjectReplicaPrivate() override;
+    explicit QRemoteObjectReplicaImplementation(const QString &name, const QMetaObject *, QRemoteObjectNode *);
+    ~QRemoteObjectReplicaImplementation() override;
 
     bool needsDynamicInitialization() const;
 
@@ -151,11 +151,11 @@ public:
     QAtomicInt m_state;
 };
 
-class QConnectedReplicaPrivate : public QRemoteObjectReplicaPrivate
+class QConnectedReplicaImplementation : public QRemoteObjectReplicaImplementation
 {
 public:
-    explicit QConnectedReplicaPrivate(const QString &name, const QMetaObject *, QRemoteObjectNode *);
-    ~QConnectedReplicaPrivate() override;
+    explicit QConnectedReplicaImplementation(const QString &name, const QMetaObject *, QRemoteObjectNode *);
+    ~QConnectedReplicaImplementation() override;
     const QVariant getProperty(int i) const override;
     void setProperties(const QVariantList &) override;
     void setProperty(int i, const QVariant &) override;
@@ -186,11 +186,11 @@ public:
     QRemoteObjectPackets::DataStreamPacket m_packet;
 };
 
-class QInProcessReplicaPrivate : public QRemoteObjectReplicaPrivate
+class QInProcessReplicaImplementation : public QRemoteObjectReplicaImplementation
 {
 public:
-    explicit QInProcessReplicaPrivate(const QString &name, const QMetaObject *, QRemoteObjectNode *);
-    ~QInProcessReplicaPrivate() override;
+    explicit QInProcessReplicaImplementation(const QString &name, const QMetaObject *, QRemoteObjectNode *);
+    ~QInProcessReplicaImplementation() override;
 
     const QVariant getProperty(int i) const override;
     void setProperties(const QVariantList &) override;