renamed QOrganizerCollectionEngineLocalId -> QOrganizerCollectionEngineId and QOrganizerItemEngineLocalId -> QOrganizerItemEngineId

28 files changed, 169 insertions, 169 deletions

diff --git a/plugins/organizer/maemo5/qorganizermaemo5.cpp b/plugins/organizer/maemo5/qorganizermaemo5.cpp
index 2a789a82aa..d3a1570b32 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5.cpp
+++ b/plugins/organizer/maemo5/qorganizermaemo5.cpp
@@ -75,12 +75,12 @@ static const char* CALENDAR =  "/.calendar";
 static const char* CALENDARDB = "/calendardb";
 
 QOrganizerItemMaemo5EngineLocalId::QOrganizerItemMaemo5EngineLocalId()
-    : QOrganizerItemEngineLocalId(), m_localItemId(0)
+    : QOrganizerItemEngineId(), m_localItemId(0)
 {
 }
 
 QOrganizerItemMaemo5EngineLocalId::QOrganizerItemMaemo5EngineLocalId(quint32 itemId)
-    : QOrganizerItemEngineLocalId(), m_localItemId(itemId)
+    : QOrganizerItemEngineId(), m_localItemId(itemId)
 {
 }
 
@@ -89,11 +89,11 @@ QOrganizerItemMaemo5EngineLocalId::~QOrganizerItemMaemo5EngineLocalId()
 }
 
 QOrganizerItemMaemo5EngineLocalId::QOrganizerItemMaemo5EngineLocalId(const QOrganizerItemMaemo5EngineLocalId& other)
-    : QOrganizerItemEngineLocalId(), m_localItemId(other.m_localItemId)
+    : QOrganizerItemEngineId(), m_localItemId(other.m_localItemId)
 {
 }
 
-bool QOrganizerItemMaemo5EngineLocalId::isEqualTo(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemMaemo5EngineLocalId::isEqualTo(const QOrganizerItemEngineId* other) const
 {
     quint32 otherlocalItemId = static_cast<const QOrganizerItemMaemo5EngineLocalId*>(other)->m_localItemId;
     if (m_localItemId != otherlocalItemId)
@@ -101,7 +101,7 @@ bool QOrganizerItemMaemo5EngineLocalId::isEqualTo(const QOrganizerItemEngineLoca
     return true;
 }
 
-bool QOrganizerItemMaemo5EngineLocalId::isLessThan(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemMaemo5EngineLocalId::isLessThan(const QOrganizerItemEngineId* other) const
 {
     quint32 otherlocalItemId = static_cast<const QOrganizerItemMaemo5EngineLocalId*>(other)->m_localItemId;
     return (m_localItemId < otherlocalItemId);
@@ -120,7 +120,7 @@ QString QOrganizerItemMaemo5EngineLocalId::managerUri() const
     return QString::fromLatin1("qtorganizer:maemo5:");
 }
 
-QOrganizerItemEngineLocalId* QOrganizerItemMaemo5EngineLocalId::clone() const
+QOrganizerItemEngineId* QOrganizerItemMaemo5EngineLocalId::clone() const
 {
     QOrganizerItemMaemo5EngineLocalId *myClone = new QOrganizerItemMaemo5EngineLocalId;
     myClone->m_localItemId = m_localItemId;
@@ -158,17 +158,17 @@ uint QOrganizerItemMaemo5EngineLocalId::hash() const
 
 
 QOrganizerCollectionMaemo5EngineLocalId::QOrganizerCollectionMaemo5EngineLocalId()
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(0)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(0)
 {
 }
 
 QOrganizerCollectionMaemo5EngineLocalId::QOrganizerCollectionMaemo5EngineLocalId(quint32 collectionId)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(collectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(collectionId)
 {
 }
 
 QOrganizerCollectionMaemo5EngineLocalId::QOrganizerCollectionMaemo5EngineLocalId(const QOrganizerCollectionMaemo5EngineLocalId& other)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(other.m_localCollectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(other.m_localCollectionId)
 {
 }
 
@@ -176,7 +176,7 @@ QOrganizerCollectionMaemo5EngineLocalId::~QOrganizerCollectionMaemo5EngineLocalI
 {
 }
 
-bool QOrganizerCollectionMaemo5EngineLocalId::isEqualTo(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionMaemo5EngineLocalId::isEqualTo(const QOrganizerCollectionEngineId* other) const
 {
     quint32 otherlocalCollectionId = static_cast<const QOrganizerCollectionMaemo5EngineLocalId*>(other)->m_localCollectionId;
     if (m_localCollectionId != otherlocalCollectionId)
@@ -184,7 +184,7 @@ bool QOrganizerCollectionMaemo5EngineLocalId::isEqualTo(const QOrganizerCollecti
     return true;
 }
 
-bool QOrganizerCollectionMaemo5EngineLocalId::isLessThan(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionMaemo5EngineLocalId::isLessThan(const QOrganizerCollectionEngineId* other) const
 {
     // order by collection, then by item in collection.
     quint32 otherlocalCollectionId = static_cast<const QOrganizerCollectionMaemo5EngineLocalId*>(other)->m_localCollectionId;
@@ -205,7 +205,7 @@ QString QOrganizerCollectionMaemo5EngineLocalId::managerUri() const
     return QString::fromLatin1("qtorganizer:maemo5:");
 }
 
-QOrganizerCollectionEngineLocalId* QOrganizerCollectionMaemo5EngineLocalId::clone() const
+QOrganizerCollectionEngineId* QOrganizerCollectionMaemo5EngineLocalId::clone() const
 {
     QOrganizerCollectionMaemo5EngineLocalId *myClone = new QOrganizerCollectionMaemo5EngineLocalId;
     myClone->m_localCollectionId = m_localCollectionId;
@@ -246,12 +246,12 @@ QOrganizerManagerEngine* QOrganizerItemMaemo5Factory::engine(const QMap<QString,
     return retn;
 }
 
-QOrganizerItemEngineLocalId* QOrganizerItemMaemo5Factory::createItemEngineLocalId() const
+QOrganizerItemEngineId* QOrganizerItemMaemo5Factory::createItemEngineLocalId() const
 {
     return new QOrganizerItemMaemo5EngineLocalId;
 }
 
-QOrganizerCollectionEngineLocalId* QOrganizerItemMaemo5Factory::createCollectionEngineLocalId() const
+QOrganizerCollectionEngineId* QOrganizerItemMaemo5Factory::createCollectionEngineLocalId() const
 {
     return new QOrganizerCollectionMaemo5EngineLocalId;
 }
diff --git a/plugins/organizer/maemo5/qorganizermaemo5_p.h b/plugins/organizer/maemo5/qorganizermaemo5_p.h
index 3fbba4ff18..0843d2f56d 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5_p.h
+++ b/plugins/organizer/maemo5/qorganizermaemo5_p.h
@@ -69,8 +69,8 @@
 #include "qorganizermanager.h"
 #include "qorganizermanagerengine.h"
 #include "qorganizermanagerenginefactory.h"
-#include "qorganizeritemenginelocalid.h"
-#include "qorganizercollectionenginelocalid.h"
+#include "qorganizeritemengineid.h"
+#include "qorganizercollectionengineid.h"
 #include "qorganizeritemdetaildefinition.h"
 #include "qorganizerabstractrequest.h"
 #include "qorganizeritemchangeset.h"
@@ -96,8 +96,8 @@ class QOrganizerItemMaemo5Factory : public QObject, public QOrganizerManagerEngi
   Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
     QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error*);
-    QOrganizerItemEngineLocalId* createItemEngineLocalId() const;
-    QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId() const;
+    QOrganizerItemEngineId* createItemEngineLocalId() const;
+    QOrganizerCollectionEngineId* createCollectionEngineLocalId() const;
     QString managerName() const;
 };
 
diff --git a/plugins/organizer/maemo5/qorganizermaemo5ids_p.h b/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
index d7c51f4197..20f79bbf02 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
+++ b/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
@@ -43,8 +43,8 @@
 #define QORGANIZERMAEMO5IDS_P_H
 
 #include "qtorganizer.h"
-#include "qorganizeritemenginelocalid.h"
-#include "qorganizercollectionenginelocalid.h"
+#include "qorganizeritemengineid.h"
+#include "qorganizercollectionengineid.h"
 
 QTM_USE_NAMESPACE
 
@@ -53,7 +53,7 @@ class OrganizerItemTransform;     // forward declare maemo5 transform.
 class QOrganizerItemMaemo5Engine; // forward declare maemo5 engine.
 class OrganizerAsynchProcess;     // forward declare maemo5 asynchronous process.
 
-class QOrganizerCollectionMaemo5EngineLocalId : public QOrganizerCollectionEngineLocalId
+class QOrganizerCollectionMaemo5EngineLocalId : public QOrganizerCollectionEngineId
 {
 public:
     QOrganizerCollectionMaemo5EngineLocalId();
@@ -61,12 +61,12 @@ public:
     ~QOrganizerCollectionMaemo5EngineLocalId();
     QOrganizerCollectionMaemo5EngineLocalId(const QOrganizerCollectionMaemo5EngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerCollectionEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerCollectionEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerCollectionEngineId* other) const;
+    bool isLessThan(const QOrganizerCollectionEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerCollectionEngineLocalId* clone() const;
+    QOrganizerCollectionEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
@@ -82,7 +82,7 @@ public:
     friend class OrganizerAsynchProcess;
 };
 
-class QOrganizerItemMaemo5EngineLocalId : public QOrganizerItemEngineLocalId
+class QOrganizerItemMaemo5EngineLocalId : public QOrganizerItemEngineId
 {
 public:
     QOrganizerItemMaemo5EngineLocalId();
@@ -90,12 +90,12 @@ public:
     ~QOrganizerItemMaemo5EngineLocalId();
     QOrganizerItemMaemo5EngineLocalId(const QOrganizerItemMaemo5EngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerItemEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerItemEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerItemEngineId* other) const;
+    bool isLessThan(const QOrganizerItemEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerItemEngineLocalId* clone() const;
+    QOrganizerItemEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
diff --git a/plugins/organizer/skeleton/qorganizerskeleton.cpp b/plugins/organizer/skeleton/qorganizerskeleton.cpp
index 5f6f721906..6faa91a1f5 100644
--- a/plugins/organizer/skeleton/qorganizerskeleton.cpp
+++ b/plugins/organizer/skeleton/qorganizerskeleton.cpp
@@ -55,13 +55,13 @@ QOrganizerManagerEngine* QOrganizerItemSkeletonFactory::engine(const QMap<QStrin
     return ret;
 }
 
-QOrganizerItemEngineLocalId* QOrganizerItemSkeletonFactory::createItemEngineLocalId() const
+QOrganizerItemEngineId* QOrganizerItemSkeletonFactory::createItemEngineLocalId() const
 {
     /* TODO - instantiate your engine-specific item id in this function */
     return new QOrganizerItemSkeletonEngineLocalId;
 }
 
-QOrganizerCollectionEngineLocalId* QOrganizerItemSkeletonFactory::createCollectionEngineLocalId() const
+QOrganizerCollectionEngineId* QOrganizerItemSkeletonFactory::createCollectionEngineLocalId() const
 {
     /* TODO - instantiate your engine-specific collection id in this function */
     return new QOrganizerCollectionSkeletonEngineLocalId;
@@ -75,7 +75,7 @@ QString QOrganizerItemSkeletonFactory::managerName() const
 Q_EXPORT_PLUGIN2(qtorganizer_skeleton, QOrganizerItemSkeletonFactory);
 
 QOrganizerItemSkeletonEngineLocalId::QOrganizerItemSkeletonEngineLocalId()
-    : QOrganizerItemEngineLocalId(), m_localItemId(0)
+    : QOrganizerItemEngineId(), m_localItemId(0)
 {
     /*
       TODO
@@ -98,7 +98,7 @@ QOrganizerItemSkeletonEngineLocalId::QOrganizerItemSkeletonEngineLocalId()
 }
 
 QOrganizerItemSkeletonEngineLocalId::QOrganizerItemSkeletonEngineLocalId(quint32 itemId)
-    : QOrganizerItemEngineLocalId(), m_localItemId(itemId)
+    : QOrganizerItemEngineId(), m_localItemId(itemId)
 {
     /*
       TODO
@@ -116,7 +116,7 @@ QOrganizerItemSkeletonEngineLocalId::QOrganizerItemSkeletonEngineLocalId(quint32
 }
 
 QOrganizerItemSkeletonEngineLocalId::QOrganizerItemSkeletonEngineLocalId(const QOrganizerItemSkeletonEngineLocalId& other)
-    : QOrganizerItemEngineLocalId(), m_localItemId(other.m_localItemId)
+    : QOrganizerItemEngineId(), m_localItemId(other.m_localItemId)
 {
     /* TODO - implement a copy constructor for your engine-specific local id class */
 }
@@ -126,7 +126,7 @@ QOrganizerItemSkeletonEngineLocalId::~QOrganizerItemSkeletonEngineLocalId()
     /* TODO - Clean up any memory in use by your engine-specific local id. */
 }
 
-bool QOrganizerItemSkeletonEngineLocalId::isEqualTo(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemSkeletonEngineLocalId::isEqualTo(const QOrganizerItemEngineId* other) const
 {
     /*
       TODO
@@ -144,7 +144,7 @@ bool QOrganizerItemSkeletonEngineLocalId::isEqualTo(const QOrganizerItemEngineLo
     return true;
 }
 
-bool QOrganizerItemSkeletonEngineLocalId::isLessThan(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemSkeletonEngineLocalId::isLessThan(const QOrganizerItemEngineId* other) const
 {
     /*
       TODO
@@ -187,7 +187,7 @@ QString QOrganizerItemSkeletonEngineLocalId::managerUri() const
     return QString::fromLatin1("qtorganizer:skeleton:");
 }
 
-QOrganizerItemEngineLocalId* QOrganizerItemSkeletonEngineLocalId::clone() const
+QOrganizerItemEngineId* QOrganizerItemSkeletonEngineLocalId::clone() const
 {
     /*
       TODO
@@ -297,7 +297,7 @@ uint QOrganizerItemSkeletonEngineLocalId::hash() const
 
 
 QOrganizerCollectionSkeletonEngineLocalId::QOrganizerCollectionSkeletonEngineLocalId()
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(0)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(0)
 {
     /*
       TODO
@@ -319,7 +319,7 @@ QOrganizerCollectionSkeletonEngineLocalId::QOrganizerCollectionSkeletonEngineLoc
 }
 
 QOrganizerCollectionSkeletonEngineLocalId::QOrganizerCollectionSkeletonEngineLocalId(quint32 collectionId)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(collectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(collectionId)
 {
     /*
       TODO
@@ -337,7 +337,7 @@ QOrganizerCollectionSkeletonEngineLocalId::QOrganizerCollectionSkeletonEngineLoc
 }
 
 QOrganizerCollectionSkeletonEngineLocalId::QOrganizerCollectionSkeletonEngineLocalId(const QOrganizerCollectionSkeletonEngineLocalId& other)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(other.m_localCollectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(other.m_localCollectionId)
 {
     /* TODO - implement a copy constructor for your engine-specific local id class */
 }
@@ -347,7 +347,7 @@ QOrganizerCollectionSkeletonEngineLocalId::~QOrganizerCollectionSkeletonEngineLo
     /* TODO - Clean up any memory in use by your engine-specific local id. */
 }
 
-bool QOrganizerCollectionSkeletonEngineLocalId::isEqualTo(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionSkeletonEngineLocalId::isEqualTo(const QOrganizerCollectionEngineId* other) const
 {
     /*
       TODO
@@ -365,7 +365,7 @@ bool QOrganizerCollectionSkeletonEngineLocalId::isEqualTo(const QOrganizerCollec
     return true;
 }
 
-bool QOrganizerCollectionSkeletonEngineLocalId::isLessThan(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionSkeletonEngineLocalId::isLessThan(const QOrganizerCollectionEngineId* other) const
 {
     /*
       TODO
@@ -410,7 +410,7 @@ QString QOrganizerCollectionSkeletonEngineLocalId::managerUri() const
     return QString::fromLatin1("qtorganizer:skeleton:");
 }
 
-QOrganizerCollectionEngineLocalId* QOrganizerCollectionSkeletonEngineLocalId::clone() const
+QOrganizerCollectionEngineId* QOrganizerCollectionSkeletonEngineLocalId::clone() const
 {
     /*
       TODO
diff --git a/plugins/organizer/skeleton/qorganizerskeleton_p.h b/plugins/organizer/skeleton/qorganizerskeleton_p.h
index 9463cad6f0..82dd4a7bb8 100644
--- a/plugins/organizer/skeleton/qorganizerskeleton_p.h
+++ b/plugins/organizer/skeleton/qorganizerskeleton_p.h
@@ -71,8 +71,8 @@
 #include "qorganizeritemdetaildefinition.h"
 #include "qorganizerabstractrequest.h"
 #include "qorganizeritemchangeset.h"
-#include "qorganizeritemenginelocalid.h"
-#include "qorganizercollectionenginelocalid.h"
+#include "qorganizeritemengineid.h"
+#include "qorganizercollectionengineid.h"
 
 QTM_USE_NAMESPACE
 
@@ -82,12 +82,12 @@ class QOrganizerItemSkeletonFactory : public QObject, public QOrganizerManagerEn
   Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
     QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error*);
-    QOrganizerItemEngineLocalId* createItemEngineLocalId() const;
-    QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId() const;
+    QOrganizerItemEngineId* createItemEngineLocalId() const;
+    QOrganizerCollectionEngineId* createCollectionEngineLocalId() const;
     QString managerName() const;
 };
 
-class QOrganizerCollectionSkeletonEngineLocalId : public QOrganizerCollectionEngineLocalId
+class QOrganizerCollectionSkeletonEngineLocalId : public QOrganizerCollectionEngineId
 {
 public:
     QOrganizerCollectionSkeletonEngineLocalId();
@@ -95,12 +95,12 @@ public:
     ~QOrganizerCollectionSkeletonEngineLocalId();
     QOrganizerCollectionSkeletonEngineLocalId(const QOrganizerCollectionSkeletonEngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerCollectionEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerCollectionEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerCollectionEngineId* other) const;
+    bool isLessThan(const QOrganizerCollectionEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerCollectionEngineLocalId* clone() const;
+    QOrganizerCollectionEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
@@ -118,7 +118,7 @@ public:
     quint32 m_localCollectionId;
 };
 
-class QOrganizerItemSkeletonEngineLocalId : public QOrganizerItemEngineLocalId
+class QOrganizerItemSkeletonEngineLocalId : public QOrganizerItemEngineId
 {
 public:
     QOrganizerItemSkeletonEngineLocalId();
@@ -126,12 +126,12 @@ public:
     ~QOrganizerItemSkeletonEngineLocalId();
     QOrganizerItemSkeletonEngineLocalId(const QOrganizerItemSkeletonEngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerItemEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerItemEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerItemEngineId* other) const;
+    bool isLessThan(const QOrganizerItemEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerItemEngineLocalId* clone() const;
+    QOrganizerItemEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
diff --git a/plugins/organizer/symbian/qorganizersymbian.cpp b/plugins/organizer/symbian/qorganizersymbian.cpp
index c9892831d8..74628fc61a 100644
--- a/plugins/organizer/symbian/qorganizersymbian.cpp
+++ b/plugins/organizer/symbian/qorganizersymbian.cpp
@@ -67,12 +67,12 @@
 using namespace OrganizerSymbianUtils;
 
 QOrganizerItemSymbianEngineLocalId::QOrganizerItemSymbianEngineLocalId()
-    : QOrganizerItemEngineLocalId(), m_localCollectionId(0), m_localItemId(0)
+    : QOrganizerItemEngineId(), m_localCollectionId(0), m_localItemId(0)
 {
 }
 
 QOrganizerItemSymbianEngineLocalId::QOrganizerItemSymbianEngineLocalId(quint64 collectionId, quint32 itemId)
-    : QOrganizerItemEngineLocalId(), m_localCollectionId(collectionId), m_localItemId(itemId)
+    : QOrganizerItemEngineId(), m_localCollectionId(collectionId), m_localItemId(itemId)
 {
 }
 
@@ -81,11 +81,11 @@ QOrganizerItemSymbianEngineLocalId::~QOrganizerItemSymbianEngineLocalId()
 }
 
 QOrganizerItemSymbianEngineLocalId::QOrganizerItemSymbianEngineLocalId(const QOrganizerItemSymbianEngineLocalId& other)
-    : QOrganizerItemEngineLocalId(), m_localCollectionId(other.m_localCollectionId), m_localItemId(other.m_localItemId)
+    : QOrganizerItemEngineId(), m_localCollectionId(other.m_localCollectionId), m_localItemId(other.m_localItemId)
 {
 }
 
-bool QOrganizerItemSymbianEngineLocalId::isEqualTo(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemSymbianEngineLocalId::isEqualTo(const QOrganizerItemEngineId* other) const
 {
     quint64 otherlocalCollectionId = static_cast<const QOrganizerItemSymbianEngineLocalId*>(other)->m_localCollectionId;
     quint32 otherlocalItemId = static_cast<const QOrganizerItemSymbianEngineLocalId*>(other)->m_localItemId;
@@ -96,7 +96,7 @@ bool QOrganizerItemSymbianEngineLocalId::isEqualTo(const QOrganizerItemEngineLoc
     return true;
 }
 
-bool QOrganizerItemSymbianEngineLocalId::isLessThan(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemSymbianEngineLocalId::isLessThan(const QOrganizerItemEngineId* other) const
 {
     // order by collection, then by item in collection.
     quint64 otherlocalCollectionId = static_cast<const QOrganizerItemSymbianEngineLocalId*>(other)->m_localCollectionId;
@@ -121,7 +121,7 @@ QString QOrganizerItemSymbianEngineLocalId::managerUri() const
     return managerUri;
 }
 
-QOrganizerItemEngineLocalId* QOrganizerItemSymbianEngineLocalId::clone() const
+QOrganizerItemEngineId* QOrganizerItemSymbianEngineLocalId::clone() const
 {
     QOrganizerItemSymbianEngineLocalId *myClone = new QOrganizerItemSymbianEngineLocalId;
     myClone->m_localCollectionId = m_localCollectionId;
@@ -162,17 +162,17 @@ uint QOrganizerItemSymbianEngineLocalId::hash() const
 }
 
 QOrganizerCollectionSymbianEngineLocalId::QOrganizerCollectionSymbianEngineLocalId()
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(0)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(0)
 {
 }
 
 QOrganizerCollectionSymbianEngineLocalId::QOrganizerCollectionSymbianEngineLocalId(quint64 collectionId)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(collectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(collectionId)
 {
 }
 
 QOrganizerCollectionSymbianEngineLocalId::QOrganizerCollectionSymbianEngineLocalId(const QOrganizerCollectionSymbianEngineLocalId& other)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(other.m_localCollectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(other.m_localCollectionId)
 {
 }
 
@@ -180,7 +180,7 @@ QOrganizerCollectionSymbianEngineLocalId::~QOrganizerCollectionSymbianEngineLoca
 {
 }
 
-bool QOrganizerCollectionSymbianEngineLocalId::isEqualTo(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionSymbianEngineLocalId::isEqualTo(const QOrganizerCollectionEngineId* other) const
 {
     quint64 otherlocalCollectionId = static_cast<const QOrganizerCollectionSymbianEngineLocalId*>(other)->m_localCollectionId;
     if (m_localCollectionId != otherlocalCollectionId)
@@ -188,7 +188,7 @@ bool QOrganizerCollectionSymbianEngineLocalId::isEqualTo(const QOrganizerCollect
     return true;
 }
 
-bool QOrganizerCollectionSymbianEngineLocalId::isLessThan(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionSymbianEngineLocalId::isLessThan(const QOrganizerCollectionEngineId* other) const
 {
     // order by collection, then by item in collection.
     quint64 otherlocalCollectionId = static_cast<const QOrganizerCollectionSymbianEngineLocalId*>(other)->m_localCollectionId;
@@ -209,7 +209,7 @@ QString QOrganizerCollectionSymbianEngineLocalId::managerUri() const
     return QString::fromLatin1("qtorganizer:symbian:");
 }
 
-QOrganizerCollectionEngineLocalId* QOrganizerCollectionSymbianEngineLocalId::clone() const
+QOrganizerCollectionEngineId* QOrganizerCollectionSymbianEngineLocalId::clone() const
 {
     QOrganizerCollectionSymbianEngineLocalId *myClone = new QOrganizerCollectionSymbianEngineLocalId;
     myClone->m_localCollectionId = m_localCollectionId;
@@ -270,12 +270,12 @@ QOrganizerManagerEngine* QOrganizerItemSymbianFactory::engine(
     return ret;
 }
 
-QOrganizerItemEngineLocalId* QOrganizerItemSymbianFactory::createItemEngineLocalId() const
+QOrganizerItemEngineId* QOrganizerItemSymbianFactory::createItemEngineLocalId() const
 {
     return new QOrganizerItemSymbianEngineLocalId;
 }
 
-QOrganizerCollectionEngineLocalId* QOrganizerItemSymbianFactory::createCollectionEngineLocalId() const
+QOrganizerCollectionEngineId* QOrganizerItemSymbianFactory::createCollectionEngineLocalId() const
 {
     return new QOrganizerCollectionSymbianEngineLocalId;
 }
diff --git a/plugins/organizer/symbian/qorganizersymbian_p.h b/plugins/organizer/symbian/qorganizersymbian_p.h
index 0ca92ee2c5..51231d17bc 100644
--- a/plugins/organizer/symbian/qorganizersymbian_p.h
+++ b/plugins/organizer/symbian/qorganizersymbian_p.h
@@ -66,8 +66,8 @@
 #include <QObject>
 
 #include "qorganizeritem.h"
-#include "qorganizeritemenginelocalid.h"
-#include "qorganizercollectionenginelocalid.h"
+#include "qorganizeritemengineid.h"
+#include "qorganizercollectionengineid.h"
 #include "qorganizermanager.h"
 #include "qorganizermanagerengine.h"
 #include "qorganizermanagerenginefactory.h"
@@ -91,7 +91,7 @@ const uint KSymbianEngineLocalIdType = 0xb038f9e;
 
 class OrganizerItemTransform; // forward declare transform class.
 class QOrganizerItemSymbianEngine; // forward declare symbian engine.
-class QOrganizerCollectionSymbianEngineLocalId : public QOrganizerCollectionEngineLocalId
+class QOrganizerCollectionSymbianEngineLocalId : public QOrganizerCollectionEngineId
 {
 public:
     QOrganizerCollectionSymbianEngineLocalId();
@@ -99,12 +99,12 @@ public:
     ~QOrganizerCollectionSymbianEngineLocalId();
     QOrganizerCollectionSymbianEngineLocalId(const QOrganizerCollectionSymbianEngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerCollectionEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerCollectionEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerCollectionEngineId* other) const;
+    bool isLessThan(const QOrganizerCollectionEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerCollectionEngineLocalId* clone() const;
+    QOrganizerCollectionEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
@@ -120,7 +120,7 @@ private:
     friend class QOrganizerItemSymbianEngine;
 };
 
-class QOrganizerItemSymbianEngineLocalId : public QOrganizerItemEngineLocalId
+class QOrganizerItemSymbianEngineLocalId : public QOrganizerItemEngineId
 {
 public:
     QOrganizerItemSymbianEngineLocalId();
@@ -128,12 +128,12 @@ public:
     ~QOrganizerItemSymbianEngineLocalId();
     QOrganizerItemSymbianEngineLocalId(const QOrganizerItemSymbianEngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerItemEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerItemEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerItemEngineId* other) const;
+    bool isLessThan(const QOrganizerItemEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerItemEngineLocalId* clone() const;
+    QOrganizerItemEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
@@ -168,8 +168,8 @@ public QOrganizerManagerEngineFactory
         const QMap<QString, QString>& parameters, 
         QOrganizerManager::Error*);
     QString managerName() const;
-    QOrganizerItemEngineLocalId* createItemEngineLocalId() const;
-    QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId() const;
+    QOrganizerItemEngineId* createItemEngineLocalId() const;
+    QOrganizerCollectionEngineId* createCollectionEngineLocalId() const;
 };
 
 class QOrganizerItemSymbianEngineData : public QSharedData
diff --git a/src/organizer/engines/qorganizeritemmemorybackend.cpp b/src/organizer/engines/qorganizeritemmemorybackend.cpp
index 964ab47831..d9a8e6749c 100644
--- a/src/organizer/engines/qorganizeritemmemorybackend.cpp
+++ b/src/organizer/engines/qorganizeritemmemorybackend.cpp
@@ -95,12 +95,12 @@ QMap<QString, QOrganizerItemMemoryEngineData*> QOrganizerItemMemoryEngine::engin
   the precise implementation required may differ.
  */
 QOrganizerItemMemoryEngineLocalId::QOrganizerItemMemoryEngineLocalId()
-    : QOrganizerItemEngineLocalId(), m_localCollectionId(0), m_localItemId(0)
+    : QOrganizerItemEngineId(), m_localCollectionId(0), m_localItemId(0)
 {
 }
 
 QOrganizerItemMemoryEngineLocalId::QOrganizerItemMemoryEngineLocalId(quint32 collectionId, quint32 itemId)
-    : QOrganizerItemEngineLocalId(), m_localCollectionId(collectionId), m_localItemId(itemId)
+    : QOrganizerItemEngineId(), m_localCollectionId(collectionId), m_localItemId(itemId)
 {
 }
 
@@ -109,11 +109,11 @@ QOrganizerItemMemoryEngineLocalId::~QOrganizerItemMemoryEngineLocalId()
 }
 
 QOrganizerItemMemoryEngineLocalId::QOrganizerItemMemoryEngineLocalId(const QOrganizerItemMemoryEngineLocalId& other)
-    : QOrganizerItemEngineLocalId(), m_localCollectionId(other.m_localCollectionId), m_localItemId(other.m_localItemId)
+    : QOrganizerItemEngineId(), m_localCollectionId(other.m_localCollectionId), m_localItemId(other.m_localItemId)
 {
 }
 
-bool QOrganizerItemMemoryEngineLocalId::isEqualTo(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemMemoryEngineLocalId::isEqualTo(const QOrganizerItemEngineId* other) const
 {
     quint32 otherlocalCollectionId = static_cast<const QOrganizerItemMemoryEngineLocalId*>(other)->m_localCollectionId;
     quint32 otherlocalItemId = static_cast<const QOrganizerItemMemoryEngineLocalId*>(other)->m_localItemId;
@@ -124,7 +124,7 @@ bool QOrganizerItemMemoryEngineLocalId::isEqualTo(const QOrganizerItemEngineLoca
     return true;
 }
 
-bool QOrganizerItemMemoryEngineLocalId::isLessThan(const QOrganizerItemEngineLocalId* other) const
+bool QOrganizerItemMemoryEngineLocalId::isLessThan(const QOrganizerItemEngineId* other) const
 {
     // order by collection, then by item in collection.
     quint32 otherlocalCollectionId = static_cast<const QOrganizerItemMemoryEngineLocalId*>(other)->m_localCollectionId;
@@ -149,7 +149,7 @@ QString QOrganizerItemMemoryEngineLocalId::managerUri() const
     return QString::fromLatin1("qtorganizer:memory:");
 }
 
-QOrganizerItemEngineLocalId* QOrganizerItemMemoryEngineLocalId::clone() const
+QOrganizerItemEngineId* QOrganizerItemMemoryEngineLocalId::clone() const
 {
     QOrganizerItemMemoryEngineLocalId *myClone = new QOrganizerItemMemoryEngineLocalId;
     myClone->m_localCollectionId = m_localCollectionId;
@@ -199,17 +199,17 @@ uint QOrganizerItemMemoryEngineLocalId::hash() const
   the precise implementation required may differ.
  */
 QOrganizerCollectionMemoryEngineLocalId::QOrganizerCollectionMemoryEngineLocalId()
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(0)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(0)
 {
 }
 
 QOrganizerCollectionMemoryEngineLocalId::QOrganizerCollectionMemoryEngineLocalId(quint32 collectionId)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(collectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(collectionId)
 {
 }
 
 QOrganizerCollectionMemoryEngineLocalId::QOrganizerCollectionMemoryEngineLocalId(const QOrganizerCollectionMemoryEngineLocalId& other)
-    : QOrganizerCollectionEngineLocalId(), m_localCollectionId(other.m_localCollectionId)
+    : QOrganizerCollectionEngineId(), m_localCollectionId(other.m_localCollectionId)
 {
 }
 
@@ -217,7 +217,7 @@ QOrganizerCollectionMemoryEngineLocalId::~QOrganizerCollectionMemoryEngineLocalI
 {
 }
 
-bool QOrganizerCollectionMemoryEngineLocalId::isEqualTo(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionMemoryEngineLocalId::isEqualTo(const QOrganizerCollectionEngineId* other) const
 {
     quint32 otherlocalCollectionId = static_cast<const QOrganizerCollectionMemoryEngineLocalId*>(other)->m_localCollectionId;
     if (m_localCollectionId != otherlocalCollectionId)
@@ -225,7 +225,7 @@ bool QOrganizerCollectionMemoryEngineLocalId::isEqualTo(const QOrganizerCollecti
     return true;
 }
 
-bool QOrganizerCollectionMemoryEngineLocalId::isLessThan(const QOrganizerCollectionEngineLocalId* other) const
+bool QOrganizerCollectionMemoryEngineLocalId::isLessThan(const QOrganizerCollectionEngineId* other) const
 {
     // order by collection, then by item in collection.
     quint32 otherlocalCollectionId = static_cast<const QOrganizerCollectionMemoryEngineLocalId*>(other)->m_localCollectionId;
@@ -246,7 +246,7 @@ QString QOrganizerCollectionMemoryEngineLocalId::managerUri() const
     return QString::fromLatin1("qtorganizer:memory:");
 }
 
-QOrganizerCollectionEngineLocalId* QOrganizerCollectionMemoryEngineLocalId::clone() const
+QOrganizerCollectionEngineId* QOrganizerCollectionMemoryEngineLocalId::clone() const
 {
     QOrganizerCollectionMemoryEngineLocalId *myClone = new QOrganizerCollectionMemoryEngineLocalId;
     myClone->m_localCollectionId = m_localCollectionId;
diff --git a/src/organizer/engines/qorganizeritemmemorybackend_p.h b/src/organizer/engines/qorganizeritemmemorybackend_p.h
index dfaac8726b..56e8c9df7e 100644
--- a/src/organizer/engines/qorganizeritemmemorybackend_p.h
+++ b/src/organizer/engines/qorganizeritemmemorybackend_p.h
@@ -72,12 +72,12 @@
 #include "qorganizerabstractrequest.h"
 #include "qorganizeritemchangeset.h"
 #include "qorganizerrecurrencerule.h"
-#include "qorganizeritemenginelocalid.h"
-#include "qorganizercollectionenginelocalid.h"
+#include "qorganizeritemengineid.h"
+#include "qorganizercollectionengineid.h"
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemMemoryEngineLocalId : public QOrganizerItemEngineLocalId
+class QOrganizerItemMemoryEngineLocalId : public QOrganizerItemEngineId
 {
 public:
     QOrganizerItemMemoryEngineLocalId();
@@ -85,12 +85,12 @@ public:
     ~QOrganizerItemMemoryEngineLocalId();
     QOrganizerItemMemoryEngineLocalId(const QOrganizerItemMemoryEngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerItemEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerItemEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerItemEngineId* other) const;
+    bool isLessThan(const QOrganizerItemEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerItemEngineLocalId* clone() const;
+    QOrganizerItemEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
@@ -107,7 +107,7 @@ private:
     friend class QOrganizerItemMemoryEngine;
 };
 
-class QOrganizerCollectionMemoryEngineLocalId : public QOrganizerCollectionEngineLocalId
+class QOrganizerCollectionMemoryEngineLocalId : public QOrganizerCollectionEngineId
 {
 public:
     QOrganizerCollectionMemoryEngineLocalId();
@@ -115,12 +115,12 @@ public:
     ~QOrganizerCollectionMemoryEngineLocalId();
     QOrganizerCollectionMemoryEngineLocalId(const QOrganizerCollectionMemoryEngineLocalId& other);
 
-    bool isEqualTo(const QOrganizerCollectionEngineLocalId* other) const;
-    bool isLessThan(const QOrganizerCollectionEngineLocalId* other) const;
+    bool isEqualTo(const QOrganizerCollectionEngineId* other) const;
+    bool isLessThan(const QOrganizerCollectionEngineId* other) const;
 
     uint engineLocalIdType() const;
     QString managerUri() const;
-    QOrganizerCollectionEngineLocalId* clone() const;
+    QOrganizerCollectionEngineId* clone() const;
 
 #ifndef QT_NO_DEBUG_STREAM
     QDebug& debugStreamOut(QDebug& dbg) const;
diff --git a/src/organizer/organizer.pro b/src/organizer/organizer.pro
index 7d3f34c4cb..a4719495f9 100644
--- a/src/organizer/organizer.pro
+++ b/src/organizer/organizer.pro
@@ -19,7 +19,7 @@ include(engines/engines.pri)
 PUBLIC_HEADERS += \
     qorganizercollection.h \
     qorganizercollectionchangeset.h \
-    qorganizercollectionenginelocalid.h \
+    qorganizercollectionengineid.h \
     qorganizercollectionid.h \
     qorganizerabstractrequest.h \
     qorganizeritemchangeset.h \
@@ -30,7 +30,7 @@ PUBLIC_HEADERS += \
     qorganizeritemfilter.h \
     qorganizeritem.h \
     qorganizeritemid.h \
-    qorganizeritemenginelocalid.h \
+    qorganizeritemengineid.h \
     qorganizermanager.h \
     qorganizermanagerengine.h \
     qorganizermanagerenginefactory.h \
@@ -57,7 +57,7 @@ PRIVATE_HEADERS += \
 SOURCES += \
     qorganizercollection.cpp \
     qorganizercollectionchangeset.cpp \
-    qorganizercollectionenginelocalid.cpp \
+    qorganizercollectionengineid.cpp \
     qorganizercollectionid.cpp \
     qorganizerabstractrequest.cpp \
     qorganizeritemchangeset.cpp \
@@ -68,7 +68,7 @@ SOURCES += \
     qorganizeritemfetchhint.cpp \
     qorganizeritemfilter.cpp \
     qorganizeritemid.cpp \
-    qorganizeritemenginelocalid.cpp \
+    qorganizeritemengineid.cpp \
     qorganizermanager.cpp \
     qorganizermanagerengine.cpp \
     qorganizermanagerenginefactory.cpp \
diff --git a/src/organizer/qorganizercollectionenginelocalid.cpp b/src/organizer/qorganizercollectionengineid.cpp
index 85663beaf1..8527d205ef 100644
--- a/src/organizer/qorganizercollectionenginelocalid.cpp
+++ b/src/organizer/qorganizercollectionengineid.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qorganizeritemenginelocalid.h"
+#include "qorganizeritemengineid.h"
 
 /*!
   \class QOrganizerCollectionEngineLocalId
diff --git a/src/organizer/qorganizercollectionenginelocalid.h b/src/organizer/qorganizercollectionengineid.h
index 292c908f7b..3b4e1b2ae3 100644
--- a/src/organizer/qorganizercollectionenginelocalid.h
+++ b/src/organizer/qorganizercollectionengineid.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QORGANIZERCOLLECTIONENGINELOCALID_H
-#define QORGANIZERCOLLECTIONENGINELOCALID_H
+#ifndef QORGANIZERCOLLECTIONENGINEID_H
+#define QORGANIZERCOLLECTIONENGINEID_H
 
 #include <QString>
 #include <QSharedDataPointer>
@@ -51,17 +51,17 @@ class QDataStream;
 
 QTM_BEGIN_NAMESPACE
 
-class Q_ORGANIZER_EXPORT QOrganizerCollectionEngineLocalId : public QSharedData
+class Q_ORGANIZER_EXPORT QOrganizerCollectionEngineId : public QSharedData
 {
 public:
-    virtual ~QOrganizerCollectionEngineLocalId() {}
+    virtual ~QOrganizerCollectionEngineId() {}
 
-    virtual bool isEqualTo(const QOrganizerCollectionEngineLocalId* other) const = 0;
-    virtual bool isLessThan(const QOrganizerCollectionEngineLocalId* other) const = 0;
+    virtual bool isEqualTo(const QOrganizerCollectionEngineId* other) const = 0;
+    virtual bool isLessThan(const QOrganizerCollectionEngineId* other) const = 0;
 
     virtual uint engineLocalIdType() const = 0;
     virtual QString managerUri() const = 0;
-    virtual QOrganizerCollectionEngineLocalId* clone() const = 0;
+    virtual QOrganizerCollectionEngineId* clone() const = 0;
 
 #ifndef QT_NO_DEBUG_STREAM
     // NOTE: on platforms where Qt is built without debug streams enabled, vtable will differ!
@@ -77,7 +77,7 @@ public:
 
 QTM_END_NAMESPACE
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerCollectionEngineLocalId), Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerCollectionEngineId), Q_MOVABLE_TYPE);
 
 
 #endif
diff --git a/src/organizer/qorganizercollectionid.cpp b/src/organizer/qorganizercollectionid.cpp
index b4f0c97030..d5d34bb36b 100644
--- a/src/organizer/qorganizercollectionid.cpp
+++ b/src/organizer/qorganizercollectionid.cpp
@@ -40,13 +40,13 @@
 ****************************************************************************/
 
 #include "qorganizercollectionid.h"
-#include "qorganizercollectionenginelocalid.h"
+#include "qorganizercollectionengineid.h"
 #include "qorganizermanager_p.h"
 #include <QHash>
 #include <QDebug>
 
 #if !defined(Q_CC_MWERKS)
-template<> QTM_PREPEND_NAMESPACE(QOrganizerCollectionEngineLocalId) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QOrganizerCollectionEngineLocalId)>::clone()
+template<> QTM_PREPEND_NAMESPACE(QOrganizerCollectionEngineId) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QOrganizerCollectionEngineId)>::clone()
 {
     return d ? d->clone() : 0;
 }
@@ -86,7 +86,7 @@ QOrganizerCollectionId::~QOrganizerCollectionId()
   will delete it when the local id goes out of scope.  Engine implementors must not
   delete the \a engineItemId or undefined behaviour will occur.
  */
-QOrganizerCollectionId::QOrganizerCollectionId(QOrganizerCollectionEngineLocalId* engineItemId)
+QOrganizerCollectionId::QOrganizerCollectionId(QOrganizerCollectionEngineId* engineItemId)
     : d(engineItemId)
 {
 }
diff --git a/src/organizer/qorganizercollectionid.h b/src/organizer/qorganizercollectionid.h
index 78195e60e7..916016e76c 100644
--- a/src/organizer/qorganizercollectionid.h
+++ b/src/organizer/qorganizercollectionid.h
@@ -61,7 +61,7 @@ Q_ORGANIZER_EXPORT QDebug& operator<<(QDebug& dbg, const QOrganizerCollectionId&
 #endif
 
 class QOrganizerManagerEngine;
-class QOrganizerCollectionEngineLocalId;
+class QOrganizerCollectionEngineId;
 
 class Q_ORGANIZER_EXPORT QOrganizerCollectionId
 {
@@ -69,7 +69,7 @@ public:
     QOrganizerCollectionId();
     ~QOrganizerCollectionId();
 
-    explicit QOrganizerCollectionId(QOrganizerCollectionEngineLocalId* engineId);
+    explicit QOrganizerCollectionId(QOrganizerCollectionEngineId* engineId);
     QOrganizerCollectionId(const QOrganizerCollectionId& other);
     QOrganizerCollectionId& operator=(const QOrganizerCollectionId& other);
 
@@ -82,7 +82,7 @@ public:
     QString managerUri() const;
 
 private:
-    QSharedDataPointer<QOrganizerCollectionEngineLocalId> d;
+    QSharedDataPointer<QOrganizerCollectionEngineId> d;
 
 #ifndef QT_NO_DEBUG_STREAM
     Q_ORGANIZER_EXPORT friend QDebug& operator<<(QDebug& dbg, const QOrganizerCollectionId& id);
diff --git a/src/organizer/qorganizeritemenginelocalid.cpp b/src/organizer/qorganizeritemengineid.cpp
index 1c90c6e50f..7a024afc8d 100644
--- a/src/organizer/qorganizeritemenginelocalid.cpp
+++ b/src/organizer/qorganizeritemengineid.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qorganizeritemenginelocalid.h"
+#include "qorganizeritemengineid.h"
 
 /*!
   \class QOrganizerItemEngineLocalId
diff --git a/src/organizer/qorganizeritemenginelocalid.h b/src/organizer/qorganizeritemengineid.h
index df7ffef765..e1a4796fea 100644
--- a/src/organizer/qorganizeritemenginelocalid.h
+++ b/src/organizer/qorganizeritemengineid.h
@@ -51,17 +51,17 @@ class QDataStream;
 
 QTM_BEGIN_NAMESPACE
 
-class Q_ORGANIZER_EXPORT QOrganizerItemEngineLocalId: public QSharedData
+class Q_ORGANIZER_EXPORT QOrganizerItemEngineId: public QSharedData
 {
 public:
-    virtual ~QOrganizerItemEngineLocalId() {}
+    virtual ~QOrganizerItemEngineId() {}
 
-    virtual bool isEqualTo(const QOrganizerItemEngineLocalId* other) const = 0;
-    virtual bool isLessThan(const QOrganizerItemEngineLocalId* other) const = 0;
+    virtual bool isEqualTo(const QOrganizerItemEngineId* other) const = 0;
+    virtual bool isLessThan(const QOrganizerItemEngineId* other) const = 0;
 
     virtual uint engineLocalIdType() const = 0;
     virtual QString managerUri() const = 0;
-    virtual QOrganizerItemEngineLocalId* clone() const = 0;
+    virtual QOrganizerItemEngineId* clone() const = 0;
 
 #ifndef QT_NO_DEBUG_STREAM
     // NOTE: on platforms where Qt is built without debug streams enabled, vtable will differ!
@@ -77,7 +77,7 @@ public:
 
 QTM_END_NAMESPACE
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemEngineLocalId), Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemEngineId), Q_MOVABLE_TYPE);
 
 
 #endif
diff --git a/src/organizer/qorganizeritemid.cpp b/src/organizer/qorganizeritemid.cpp
index ee74f03a8f..9e0dd1a45f 100644
--- a/src/organizer/qorganizeritemid.cpp
+++ b/src/organizer/qorganizeritemid.cpp
@@ -40,14 +40,14 @@
 ****************************************************************************/
 
 #include "qorganizeritemid.h"
-#include "qorganizeritemenginelocalid.h"
+#include "qorganizeritemengineid.h"
 #include "qorganizermanager_p.h"
 #include <QHash>
 #include <QDebug>
 #include <QDataStream>
 
 #if !defined(Q_CC_MWERKS)
-template<> QTM_PREPEND_NAMESPACE(QOrganizerItemEngineLocalId) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QOrganizerItemEngineLocalId)>::clone()
+template<> QTM_PREPEND_NAMESPACE(QOrganizerItemEngineId) *QSharedDataPointer<QTM_PREPEND_NAMESPACE(QOrganizerItemEngineId)>::clone()
 {
     return d ? d->clone() : 0;
 }
@@ -82,7 +82,7 @@ QOrganizerItemId::QOrganizerItemId()
   will delete it when the local id goes out of scope.  Engine implementors must not
   delete the \a engineItemId or undefined behaviour will occur.
  */
-QOrganizerItemId::QOrganizerItemId(QOrganizerItemEngineLocalId* engineItemId)
+QOrganizerItemId::QOrganizerItemId(QOrganizerItemEngineId* engineItemId)
     : d(engineItemId)
 {
 }
diff --git a/src/organizer/qorganizeritemid.h b/src/organizer/qorganizeritemid.h
index 332081738f..ff7e91a9fb 100644
--- a/src/organizer/qorganizeritemid.h
+++ b/src/organizer/qorganizeritemid.h
@@ -63,13 +63,13 @@ Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemId& id
 #endif
 
 class QOrganizerManagerEngine;
-class QOrganizerItemEngineLocalId;
+class QOrganizerItemEngineId;
 
 class Q_ORGANIZER_EXPORT QOrganizerItemId
 {
 public:
     QOrganizerItemId();
-    explicit QOrganizerItemId(QOrganizerItemEngineLocalId* engineId);
+    explicit QOrganizerItemId(QOrganizerItemEngineId* engineId);
     ~QOrganizerItemId();
 
     QOrganizerItemId(const QOrganizerItemId& other);
@@ -84,7 +84,7 @@ public:
     QString managerUri() const;
 
 private:
-    QSharedDataPointer<QOrganizerItemEngineLocalId> d;
+    QSharedDataPointer<QOrganizerItemEngineId> d;
 
 #ifndef QT_NO_DEBUG_STREAM
     Q_ORGANIZER_EXPORT friend QDebug& operator<<(QDebug& dbg, const QOrganizerItemId& id);
diff --git a/src/organizer/qorganizermanager_p.cpp b/src/organizer/qorganizermanager_p.cpp
index 788bb6bd1d..4225c0745a 100644
--- a/src/organizer/qorganizermanager_p.cpp
+++ b/src/organizer/qorganizermanager_p.cpp
@@ -259,7 +259,7 @@ void QOrganizerManagerData::loadFactories()
 }
 
 /* Caller takes ownership of the id */
-QOrganizerItemEngineLocalId* QOrganizerManagerData::createEngineItemId(const QString& uri)
+QOrganizerItemEngineId* QOrganizerManagerData::createEngineItemId(const QString& uri)
 {
     QString managerName;
     QOrganizerManager::parseUri(uri, &managerName, NULL);
@@ -273,7 +273,7 @@ QOrganizerItemEngineLocalId* QOrganizerManagerData::createEngineItemId(const QSt
 }
 
 /* Caller takes ownership of the id */
-QOrganizerCollectionEngineLocalId* QOrganizerManagerData::createEngineCollectionId(const QString& uri)
+QOrganizerCollectionEngineId* QOrganizerManagerData::createEngineCollectionId(const QString& uri)
 {
     QString managerName;
     QOrganizerManager::parseUri(uri, &managerName, NULL);
diff --git a/src/organizer/qorganizermanager_p.h b/src/organizer/qorganizermanager_p.h
index 8480aed74f..109a6aebfa 100644
--- a/src/organizer/qorganizermanager_p.h
+++ b/src/organizer/qorganizermanager_p.h
@@ -83,8 +83,8 @@ public:
 
     void createEngine(const QString& managerName, const QMap<QString, QString>& parameters);
     static QOrganizerManagerEngine* engine(const QOrganizerManager* manager);
-    static QOrganizerItemEngineLocalId* createEngineItemId(const QString& uri);
-    static QOrganizerCollectionEngineLocalId* createEngineCollectionId(const QString& uri);
+    static QOrganizerItemEngineId* createEngineItemId(const QString& uri);
+    static QOrganizerCollectionEngineId* createEngineCollectionId(const QString& uri);
 
     QOrganizerManagerEngine* m_engine;
     QOrganizerManager::Error m_error;
diff --git a/src/organizer/qorganizermanagerengine.cpp b/src/organizer/qorganizermanagerengine.cpp
index eb501ab552..c6100bc05e 100644
--- a/src/organizer/qorganizermanagerengine.cpp
+++ b/src/organizer/qorganizermanagerengine.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qorganizermanagerengine.h"
-#include "qorganizeritemenginelocalid.h"
+#include "qorganizeritemengineid.h"
 
 #include "qorganizeritemdetaildefinition.h"
 #include "qorganizeritemdetailfielddefinition.h"
@@ -2464,7 +2464,7 @@ void QOrganizerManagerEngine::addSorted(QList<QOrganizerItem>* sorted, const QOr
   Returns the engine local id from the given \a localId.
   The caller does not take ownership of the pointer, and should not delete returned id or undefined behavior may occur.
  */
-const QOrganizerItemEngineLocalId* QOrganizerManagerEngine::engineLocalItemId(const QOrganizerItemId& localId)
+const QOrganizerItemEngineId* QOrganizerManagerEngine::engineLocalItemId(const QOrganizerItemId& localId)
 {
     return localId.d.data();
 }
@@ -2473,7 +2473,7 @@ const QOrganizerItemEngineLocalId* QOrganizerManagerEngine::engineLocalItemId(co
   Returns the engine local id from the given \a localId.
   The caller does not take ownership of the pointer, and should not delete returned id or undefined behavior may occur.
  */
-const QOrganizerCollectionEngineLocalId* QOrganizerManagerEngine::engineLocalCollectionId(const QOrganizerCollectionId& localId)
+const QOrganizerCollectionEngineId* QOrganizerManagerEngine::engineLocalCollectionId(const QOrganizerCollectionId& localId)
 {
     return localId.d.data();
 }
diff --git a/src/organizer/qorganizermanagerengine.h b/src/organizer/qorganizermanagerengine.h
index 8ecb816a65..48856d70dd 100644
--- a/src/organizer/qorganizermanagerengine.h
+++ b/src/organizer/qorganizermanagerengine.h
@@ -64,7 +64,7 @@ QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemFilter;
 class QOrganizerItemSortOrder;
-class QOrganizerItemEngineLocalId;
+class QOrganizerItemEngineId;
 
 /* Forward decls, since these don't actually exist yet */
 class QOrganizerItemOccurrenceFetchRequest;
@@ -169,8 +169,8 @@ public:
 
     // Other protected area update functions
     static void setDetailAccessConstraints(QOrganizerItemDetail* detail, QOrganizerItemDetail::AccessConstraints constraints);
-    static const QOrganizerItemEngineLocalId* engineLocalItemId(const QOrganizerItemId& localId);
-    static const QOrganizerCollectionEngineLocalId* engineLocalCollectionId(const QOrganizerCollectionId& localId);
+    static const QOrganizerItemEngineId* engineLocalItemId(const QOrganizerItemId& localId);
+    static const QOrganizerCollectionEngineId* engineLocalCollectionId(const QOrganizerCollectionId& localId);
 
     /* Helper functions */
     static bool isItemBetweenDates(const QOrganizerItem& item, const QDateTime& startPeriod, const QDateTime& endPeriod);
diff --git a/src/organizer/qorganizermanagerenginefactory.h b/src/organizer/qorganizermanagerenginefactory.h
index 57f433ef14..af0c532e58 100644
--- a/src/organizer/qorganizermanagerenginefactory.h
+++ b/src/organizer/qorganizermanagerenginefactory.h
@@ -52,7 +52,7 @@
 QTM_BEGIN_NAMESPACE
 /* Backend plugin API interface, creates engines for us */
 class QOrganizerManagerEngine;
-class QOrganizerCollectionEngineLocalId;
+class QOrganizerCollectionEngineId;
 class Q_ORGANIZER_EXPORT QOrganizerManagerEngineFactory
 {
 public:
@@ -61,8 +61,8 @@ public:
     virtual ~QOrganizerManagerEngineFactory();
     virtual QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error) = 0;
     virtual QString managerName() const = 0;
-    virtual QOrganizerItemEngineLocalId* createItemEngineLocalId() const = 0;
-    virtual QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId()const  = 0;
+    virtual QOrganizerItemEngineId* createItemEngineLocalId() const = 0;
+    virtual QOrganizerCollectionEngineId* createCollectionEngineLocalId()const  = 0;
 };
 QTM_END_NAMESPACE
 
diff --git a/src/organizer/qtorganizer.h b/src/organizer/qtorganizer.h
index dd7fd61dd3..70c64f5cf7 100644
--- a/src/organizer/qtorganizer.h
+++ b/src/organizer/qtorganizer.h
@@ -47,7 +47,7 @@
 
 #include "qtorganizerglobal.h"                        // global exports
 
-#include "qorganizerabstractrequest.h"            // asynchronous request
+#include "qorganizerabstractrequest.h"                // asynchronous request
 #include "qorganizeritemdetail.h"                     // organizer item detail
 #include "qorganizeritemdetaildefinition.h"           // detail definition
 #include "qorganizeritemdetailfielddefinition.h"      // field in a detail definition
@@ -55,10 +55,10 @@
 #include "qorganizeritemfilter.h"                     // organizer item filter
 #include "qorganizeritem.h"                           // organizer item
 #include "qorganizeritemid.h"                         // organizer item identifier
-#include "qorganizermanager.h"                    // manager
-#include "qorganizermanagerengine.h"              // manager backend
-#include "qorganizermanagerenginefactory.h"       // manage backend instantiator
-#include "qorganizerrecurrencerule.h"             // a single recurrence rule
+#include "qorganizermanager.h"                        // manager
+#include "qorganizermanagerengine.h"                  // manager backend
+#include "qorganizermanagerenginefactory.h"           // manage backend instantiator
+#include "qorganizerrecurrencerule.h"                 // a single recurrence rule
 #include "qorganizeritemsortorder.h"                  // organizer item sorting
 
 #include "qorganizercollection.h"                     // collection of items
@@ -66,8 +66,8 @@
 
 #include "qorganizercollectionchangeset.h"            // engine-specific collection changeset
 #include "qorganizeritemchangeset.h"                  // engine-specific item changeset
-#include "qorganizercollectionenginelocalid.h"        // engine-specific collection id
-#include "qorganizeritemenginelocalid.h"              // engine specific item id
+#include "qorganizercollectionengineid.h"             // engine-specific collection id
+#include "qorganizeritemengineid.h"                   // engine specific item id
 
 #include "qorganizeritems.h"                          // item derived classes
 #include "qorganizeritemdetails.h"                    // detail derived classes
diff --git a/tests/auto/qorganizercollection/tst_qorganizercollection.cpp b/tests/auto/qorganizercollection/tst_qorganizercollection.cpp
index a5f1695868..9eb56bd1ae 100644
--- a/tests/auto/qorganizercollection/tst_qorganizercollection.cpp
+++ b/tests/auto/qorganizercollection/tst_qorganizercollection.cpp
@@ -91,14 +91,14 @@ void tst_QOrganizerCollection::metaData()
     QCOMPARE(c.metaData(), mdm);
 }
 
-class BasicCollectionLocalId : public QOrganizerCollectionEngineLocalId
+class BasicCollectionLocalId : public QOrganizerCollectionEngineId
 {
 public:
     BasicCollectionLocalId(uint id) : m_id(id) {}
-    bool isEqualTo(const QOrganizerCollectionEngineLocalId* other) const {
+    bool isEqualTo(const QOrganizerCollectionEngineId* other) const {
         return m_id == static_cast<const BasicCollectionLocalId*>(other)->m_id;
     }
-    bool isLessThan(const QOrganizerCollectionEngineLocalId* other) const {
+    bool isLessThan(const QOrganizerCollectionEngineId* other) const {
         return m_id < static_cast<const BasicCollectionLocalId*>(other)->m_id;
     }
     uint engineLocalIdType() const {
@@ -107,7 +107,7 @@ public:
     QString managerUri() const {
         return QString::fromLatin1("qtorganizer:basic:");
     }
-    QOrganizerCollectionEngineLocalId* clone() const {
+    QOrganizerCollectionEngineId* clone() const {
         BasicCollectionLocalId* cloned = new BasicCollectionLocalId(m_id);
         return cloned;
     }
diff --git a/tests/auto/qorganizeritem/tst_qorganizeritem.cpp b/tests/auto/qorganizeritem/tst_qorganizeritem.cpp
index 6136fab7c7..ab52971a9c 100644
--- a/tests/auto/qorganizeritem/tst_qorganizeritem.cpp
+++ b/tests/auto/qorganizeritem/tst_qorganizeritem.cpp
@@ -43,7 +43,7 @@
 
 #include "qtorganizer.h"
 #include "qorganizeritemid.h"
-#include "qorganizeritemenginelocalid.h"
+#include "qorganizeritemengineid.h"
 #include <QSet>
 
 //TESTED_COMPONENT=src/organizer
@@ -470,14 +470,14 @@ void tst_QOrganizerItem::emptiness()
     QVERIFY(oi.isEmpty() == true); // type doesn't affect emptiness
 }
 
-class BasicItemLocalId : public QOrganizerItemEngineLocalId
+class BasicItemLocalId : public QOrganizerItemEngineId
 {
 public:
     BasicItemLocalId(uint id) : m_id(id) {}
-    bool isEqualTo(const QOrganizerItemEngineLocalId* other) const {
+    bool isEqualTo(const QOrganizerItemEngineId* other) const {
         return m_id == static_cast<const BasicItemLocalId*>(other)->m_id;
     }
-    bool isLessThan(const QOrganizerItemEngineLocalId* other) const {
+    bool isLessThan(const QOrganizerItemEngineId* other) const {
         return m_id < static_cast<const BasicItemLocalId*>(other)->m_id;
     }
     uint engineLocalIdType() const {
@@ -486,7 +486,7 @@ public:
     QString managerUri() const {
         return QString::fromLatin1("qtorganizer:basicId:");
     }
-    QOrganizerItemEngineLocalId* clone() const {
+    QOrganizerItemEngineId* clone() const {
         BasicItemLocalId* cloned = new BasicItemLocalId(m_id);
         return cloned;
     }
diff --git a/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp b/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
index 6125e6a99d..7fe4227daf 100644
--- a/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
+++ b/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
@@ -42,7 +42,7 @@
 #include <QMetaType>
 
 #include "qtorganizer.h"
-#include "qorganizeritemenginelocalid.h"
+#include "qorganizeritemengineid.h"
 
 //TESTED_COMPONENT=src/organizer
 //TESTED_CLASS=
@@ -86,20 +86,20 @@ private slots:
     void sortTraits();
 };
 
-class BasicItemLocalId : public QOrganizerItemEngineLocalId
+class BasicItemLocalId : public QOrganizerItemEngineId
 {
 public:
     BasicItemLocalId(uint id) : m_id(id) {}
-    bool isEqualTo(const QOrganizerItemEngineLocalId* other) const {
+    bool isEqualTo(const QOrganizerItemEngineId* other) const {
         return m_id == static_cast<const BasicItemLocalId*>(other)->m_id;
     }
-    bool isLessThan(const QOrganizerItemEngineLocalId* other) const {
+    bool isLessThan(const QOrganizerItemEngineId* other) const {
         return m_id < static_cast<const BasicItemLocalId*>(other)->m_id;
     }
     uint engineLocalIdType() const {
         return 0;
     }
-    QOrganizerItemEngineLocalId* clone() const {
+    QOrganizerItemEngineId* clone() const {
         BasicItemLocalId* cloned = new BasicItemLocalId(m_id);
         return cloned;
     }
diff --git a/tests/auto/qorganizermanager/tst_qorganizermanager.cpp b/tests/auto/qorganizermanager/tst_qorganizermanager.cpp
index 039b791401..c506d8e1a1 100644
--- a/tests/auto/qorganizermanager/tst_qorganizermanager.cpp
+++ b/tests/auto/qorganizermanager/tst_qorganizermanager.cpp
@@ -52,7 +52,7 @@
 #include "qorganizerevent.h"
 
 #include "qorganizeritemmemorybackend_p.h"
-#include "qorganizeritemenginelocalid.h"
+#include "qorganizeritemengineid.h"
 
 QTM_USE_NAMESPACE
 // Eventually these will make it into qtestcase.h