Renames some class names

    QOrganizerEventTimeRange -> QOrganizerEventTime
    QOrganizerTodoTimeRange -> QOrganizerTodoTime
    QOrganizerJounalTimeInstant -> QOrganizerJounalTime
    QOrganizerItemManager -> QOrganizerManager
    QOrganizerItemManagerEngine -> QOrganizerManagerEngine
    QOrganizerItemAbstractRequest -> QOrganizerAbstractRequest
    QOrganizerItemRecurreneRule -> QOrganizerRecurrenceRule
    QOrganizerJournalTimeRange -> QOrganizerJournalTimeInstant

176 files changed, 3423 insertions, 3423 deletions

diff --git a/bin/rununittests.sh b/bin/rununittests.sh
index 9e476c9f42..dcbe2649f8 100755
--- a/bin/rununittests.sh
+++ b/bin/rununittests.sh
@@ -161,7 +161,7 @@ cd $shell_path/../build/tests/bin
 ./tst_qmessagestorekeys
 
 #QOrganizer
-./tst_qorganizeritemmanager
+./tst_qorganizermanager
 ./tst_qorganizercollection
 ./tst_qorganizeritem
 ./tst_qorganizeritemasync
diff --git a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
index 39ef15cfc7..105ef178de 100644
--- a/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
+++ b/doc/src/snippets/qtorganizerdocsample/qtorganizerdocsample.cpp
@@ -50,7 +50,7 @@
 QTM_USE_NAMESPACE
 
 static void snippets();
-static void dumpItems(QOrganizerItemManager* manager);
+static void dumpItems(QOrganizerManager* manager);
 static void dumpItem(const QOrganizerItem& item);
 
 int main(int, char**)
@@ -62,11 +62,11 @@ int main(int, char**)
 void snippets()
 {
     //! [Instantiating the default manager for the platform]
-    QOrganizerItemManager defaultManager;
+    QOrganizerManager defaultManager;
     //! [Instantiating the default manager for the platform]
 
     //! [Instantiating a specific manager]
-    QOrganizerItemManager specificManager("KCal");
+    QOrganizerManager specificManager("KCal");
     //! [Instantiating a specific manager]
 
     // XXX TODO: use rrule instead of rdates.
@@ -146,7 +146,7 @@ void snippets()
     dumpItems(&defaultManager);
 }
 
-void dumpItems(QOrganizerItemManager* manager)
+void dumpItems(QOrganizerManager* manager)
 {
     QList<QOrganizerItem> items = manager->items();
     qDebug() << "dumping" << items.count() << "items:";
diff --git a/examples/calendardemo/src/addcalendarpage.cpp b/examples/calendardemo/src/addcalendarpage.cpp
index d18a0e0fad..1903c7f6bf 100644
--- a/examples/calendardemo/src/addcalendarpage.cpp
+++ b/examples/calendardemo/src/addcalendarpage.cpp
@@ -150,7 +150,7 @@ void AddCalendarPage::saveClicked()
         emit showPreviousPage();
 }
 
-void AddCalendarPage::calendarChanged(QOrganizerItemManager *manager, QOrganizerCollection& calendar)
+void AddCalendarPage::calendarChanged(QOrganizerManager *manager, QOrganizerCollection& calendar)
 {
     m_manager = manager;
     m_collection = calendar;
diff --git a/examples/calendardemo/src/addcalendarpage.h b/examples/calendardemo/src/addcalendarpage.h
index d4ab993846..f9b903a6f2 100644
--- a/examples/calendardemo/src/addcalendarpage.h
+++ b/examples/calendardemo/src/addcalendarpage.h
@@ -45,7 +45,7 @@
 #include <qorganizercollection.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerCollection;
 QTM_END_NAMESPACE
 QTM_USE_NAMESPACE
@@ -67,7 +67,7 @@ public:
 public Q_SLOTS:
     void cancelClicked();
     void saveClicked();
-    void calendarChanged(QOrganizerItemManager *manager, QOrganizerCollection& calendar);
+    void calendarChanged(QOrganizerManager *manager, QOrganizerCollection& calendar);
 
 #if defined(Q_WS_MAEMO_5)
     void colorChanged(const QString&);
@@ -80,7 +80,7 @@ Q_SIGNALS:
     void showPreviousPage();
 
 private:
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QOrganizerCollection m_collection;
     QAction *m_saveOrNextSoftKey;
 
diff --git a/examples/calendardemo/src/calendardemo.cpp b/examples/calendardemo/src/calendardemo.cpp
index 84ed9ba2b7..4bb2f45071 100644
--- a/examples/calendardemo/src/calendardemo.cpp
+++ b/examples/calendardemo/src/calendardemo.cpp
@@ -78,7 +78,7 @@ CalendarDemo::CalendarDemo(QWidget *parent)
     m_addCalendarPage = new AddCalendarPage(m_stackedWidget);
     m_editCalendarsPage = new EditCalendarsPage(m_stackedWidget);
 
-    //qRegisterMetaType<QOrganizerItemManager>("QOrganizerItemManager");
+    //qRegisterMetaType<QOrganizerManager>("QOrganizerManager");
     qRegisterMetaType<QOrganizerItem>("QOrganizerItem");
     qRegisterMetaType<QOrganizerCollection>("QOrganizerCollection");
 
@@ -86,8 +86,8 @@ CalendarDemo::CalendarDemo(QWidget *parent)
     connect(m_monthPage, SIGNAL(showEditPage(const QOrganizerItem &)), this, SLOT(activateEditPage(const QOrganizerItem &)), Qt::QueuedConnection);
     connect(m_monthPage, SIGNAL(addNewEvent()), this, SLOT(addNewEvent()), Qt::QueuedConnection);
     connect(m_monthPage, SIGNAL(addNewTodo()), this, SLOT(addNewTodo()), Qt::QueuedConnection);
-    connect(m_monthPage, SIGNAL(managerChanged(QOrganizerItemManager*)), this, SLOT(changeManager(QOrganizerItemManager*)), Qt::QueuedConnection);
-    connect(m_monthPage, SIGNAL(managerChanged(QOrganizerItemManager*)), m_dayPage, SLOT(changeManager(QOrganizerItemManager*)), Qt::QueuedConnection);
+    connect(m_monthPage, SIGNAL(managerChanged(QOrganizerManager*)), this, SLOT(changeManager(QOrganizerManager*)), Qt::QueuedConnection);
+    connect(m_monthPage, SIGNAL(managerChanged(QOrganizerManager*)), m_dayPage, SLOT(changeManager(QOrganizerManager*)), Qt::QueuedConnection);
     connect(m_monthPage, SIGNAL(currentDayChanged(QDate)), this, SLOT(updateSelectedDay(QDate)));
     connect(m_dayPage, SIGNAL(showMonthPage()), this, SLOT(activateMonthPage()), Qt::QueuedConnection);
     connect(m_dayPage, SIGNAL(showEditPage(const QOrganizerItem &)), this, SLOT(activateEditPage(const QOrganizerItem &)), Qt::QueuedConnection);
@@ -98,15 +98,15 @@ CalendarDemo::CalendarDemo(QWidget *parent)
     connect(m_journalEditPage, SIGNAL(showDayPage()), this, SLOT(activateDayPage()), Qt::QueuedConnection);
     connect(m_eventOccurrenceEditPage, SIGNAL(showDayPage()), this, SLOT(activateDayPage()), Qt::QueuedConnection);
     connect(m_addCalendarPage, SIGNAL(showPreviousPage()), this, SLOT(activatePreviousPage()), Qt::QueuedConnection);
-    connect(m_editCalendarsPage, SIGNAL(showAddCalendarPage(QOrganizerItemManager*,QOrganizerCollection*)), this, SLOT(editExistingCalendar(QOrganizerItemManager*,QOrganizerCollection*)), Qt::QueuedConnection);
+    connect(m_editCalendarsPage, SIGNAL(showAddCalendarPage(QOrganizerManager*,QOrganizerCollection*)), this, SLOT(editExistingCalendar(QOrganizerManager*,QOrganizerCollection*)), Qt::QueuedConnection);
     connect(m_editCalendarsPage, SIGNAL(showPreviousPage()), this, SLOT(activateMonthPage()), Qt::QueuedConnection);
     connect(m_editCalendarsPage, SIGNAL(addClicked()), this, SLOT(addCalendar()), Qt::QueuedConnection);
 
     // Connect to the save and remove request status change signals
-    connect(&m_saveReq, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)),
-            this, SLOT(saveReqStateChanged(QOrganizerItemAbstractRequest::State)));
-    connect(&m_remReq, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)),
-            this, SLOT(removeReqStateChanged(QOrganizerItemAbstractRequest::State)));
+    connect(&m_saveReq, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)),
+            this, SLOT(saveReqStateChanged(QOrganizerAbstractRequest::State)));
+    connect(&m_remReq, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)),
+            this, SLOT(removeReqStateChanged(QOrganizerAbstractRequest::State)));
 
     m_monthPage->init();
     
@@ -316,7 +316,7 @@ void CalendarDemo::addEvents()
         item.setDisplayLabel(QString("Subject for event %1").arg(index + 1));
         
         // Set the start date to index to add events to next 5000 days
-        QOrganizerEventTimeRange timeRange;
+        QOrganizerEventTime timeRange;
         timeRange.setStartDateTime(QDateTime::currentDateTime().addDays(index));
         timeRange.setEndDateTime(QDateTime::currentDateTime().addDays(index).addSecs(60 * 60));
         item.saveDetail(&timeRange);
@@ -438,22 +438,22 @@ void CalendarDemo::editCalendar()
     m_stackedWidget->setCurrentWidget(m_editCalendarsPage);
 }
 
-void CalendarDemo::editExistingCalendar(QOrganizerItemManager *manager, QOrganizerCollection* calendar)
+void CalendarDemo::editExistingCalendar(QOrganizerManager *manager, QOrganizerCollection* calendar)
 {
     m_addCalendarPage->calendarChanged(manager, *calendar);
     m_previousPage = m_stackedWidget->currentIndex();
     m_stackedWidget->setCurrentWidget(m_addCalendarPage);
 }
 
-void CalendarDemo::saveReqStateChanged(QOrganizerItemAbstractRequest::State reqState)
+void CalendarDemo::saveReqStateChanged(QOrganizerAbstractRequest::State reqState)
 {
-    if(QOrganizerItemAbstractRequest::ActiveState == reqState) {
+    if(QOrganizerAbstractRequest::ActiveState == reqState) {
         // Request started. Show a progress or wait dialog
         m_progressDlg = new QProgressDialog("Saving events..", "Cancel", 100, 100, this);
         connect(m_progressDlg, SIGNAL(canceled()), &m_saveReq, SLOT(cancel()));
         m_progressDlg->show();
-    } else if (QOrganizerItemAbstractRequest::FinishedState == reqState ||
-               QOrganizerItemAbstractRequest::CanceledState == reqState) {
+    } else if (QOrganizerAbstractRequest::FinishedState == reqState ||
+               QOrganizerAbstractRequest::CanceledState == reqState) {
         // Request finished or cancelled. Stop showing the progress dialog and refresh
         m_progressDlg->hide();
         m_monthPage->refresh();
@@ -461,15 +461,15 @@ void CalendarDemo::saveReqStateChanged(QOrganizerItemAbstractRequest::State reqS
     }
 }
 
-void CalendarDemo::removeReqStateChanged(QOrganizerItemAbstractRequest::State reqState)
+void CalendarDemo::removeReqStateChanged(QOrganizerAbstractRequest::State reqState)
 {
-    if(QOrganizerItemAbstractRequest::ActiveState == reqState) {
+    if(QOrganizerAbstractRequest::ActiveState == reqState) {
         // Request started. Show a progress or wait dialog
         m_progressDlg = new QProgressDialog("Removing events..", "Cancel", 100, 100, this);
         connect(m_progressDlg, SIGNAL(canceled()), &m_remReq, SLOT(cancel()));
         m_progressDlg->show();
-    } else if (QOrganizerItemAbstractRequest::FinishedState == reqState ||
-               QOrganizerItemAbstractRequest::CanceledState == reqState) {
+    } else if (QOrganizerAbstractRequest::FinishedState == reqState ||
+               QOrganizerAbstractRequest::CanceledState == reqState) {
         // Request finished or cancelled. Stop showing the progress dialog and refresh
         m_progressDlg->hide();
         m_monthPage->refresh();
@@ -477,7 +477,7 @@ void CalendarDemo::removeReqStateChanged(QOrganizerItemAbstractRequest::State re
     }
 }
 
-void CalendarDemo::changeManager(QOrganizerItemManager *manager)
+void CalendarDemo::changeManager(QOrganizerManager *manager)
 {
     m_manager = manager;
 }
diff --git a/examples/calendardemo/src/calendardemo.h b/examples/calendardemo/src/calendardemo.h
index 73b87b7702..9d7073dc5a 100644
--- a/examples/calendardemo/src/calendardemo.h
+++ b/examples/calendardemo/src/calendardemo.h
@@ -49,7 +49,7 @@
 class QProgressDialog;
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerItem;
 QTM_END_NAMESPACE
 QTM_USE_NAMESPACE
@@ -83,7 +83,7 @@ public Q_SLOTS:
     void addNewEvent();
     void addNewTodo();
     void addNewJournal();
-    void changeManager(QOrganizerItemManager *manager);
+    void changeManager(QOrganizerManager *manager);
     void updateSelectedDay(const QDate& date);
 
 private Q_SLOTS:
@@ -96,15 +96,15 @@ private Q_SLOTS:
     void deleteAllEntries();
     void addCalendar();
     void editCalendar();
-    void editExistingCalendar(QOrganizerItemManager *manager, QOrganizerCollection* calendar);
-    void saveReqStateChanged(QOrganizerItemAbstractRequest::State);
-    void removeReqStateChanged(QOrganizerItemAbstractRequest::State);
+    void editExistingCalendar(QOrganizerManager *manager, QOrganizerCollection* calendar);
+    void saveReqStateChanged(QOrganizerAbstractRequest::State);
+    void removeReqStateChanged(QOrganizerAbstractRequest::State);
 
 private:
     void buildMenu();
 
     QDate m_currentDate;
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QStackedWidget *m_stackedWidget;
     MonthPage *m_monthPage;
     DayPage *m_dayPage;
diff --git a/examples/calendardemo/src/daypage.cpp b/examples/calendardemo/src/daypage.cpp
index 54ed299651..33760ffcaf 100644
--- a/examples/calendardemo/src/daypage.cpp
+++ b/examples/calendardemo/src/daypage.cpp
@@ -120,9 +120,9 @@ void DayPage::refresh()
 
     foreach (const QOrganizerItem &item, items)
     {
-        QOrganizerEventTimeRange eventTimeRange = item.detail<QOrganizerEventTimeRange>();
-        if (!eventTimeRange.isEmpty()) {
-            QString time = eventTimeRange.startDateTime().time().toString("hh:mm");
+        QOrganizerEventTime eventTime = item.detail<QOrganizerEventTime>();
+        if (!eventTime.isEmpty()) {
+            QString time = eventTime.startDateTime().time().toString("hh:mm");
             QListWidgetItem* listItem = new QListWidgetItem();
             if (item.type() == QOrganizerItemType::TypeEventOccurrence)
                 listItem->setText(QString("Event occurance:%1-%2").arg(time).arg(item.displayLabel()));
@@ -133,9 +133,9 @@ void DayPage::refresh()
             m_itemList->addItem(listItem);
         }
         
-        QOrganizerTodoTimeRange todoTimeRange = item.detail<QOrganizerTodoTimeRange>();
-        if (!todoTimeRange.isEmpty()) {
-            QString time = todoTimeRange.startDateTime().time().toString("hh:mm");
+        QOrganizerTodoTime todoTime = item.detail<QOrganizerTodoTime>();
+        if (!todoTime.isEmpty()) {
+            QString time = todoTime.startDateTime().time().toString("hh:mm");
             QListWidgetItem* listItem = new QListWidgetItem();
             listItem->setText(QString("Todo:%1-%2").arg(time).arg(item.displayLabel()));
             QVariant data = QVariant::fromValue<QOrganizerItem>(item);
@@ -143,9 +143,9 @@ void DayPage::refresh()
             m_itemList->addItem(listItem);
         }
 
-        QOrganizerJournalTimeRange journalTimeRange = item.detail<QOrganizerJournalTimeRange>();
-        if (!journalTimeRange.isEmpty()) {
-            QString time = journalTimeRange.entryDateTime().time().toString("hh:mm");
+        QOrganizerJournalTime journalTime = item.detail<QOrganizerJournalTime>();
+        if (!journalTime.isEmpty()) {
+            QString time = journalTime.entryDateTime().time().toString("hh:mm");
             QListWidgetItem* listItem = new QListWidgetItem();
             listItem->setText(QString("Journal:%1-%2").arg(time).arg(item.displayLabel()));
             QVariant data = QVariant::fromValue<QOrganizerItem>(item);
@@ -160,7 +160,7 @@ void DayPage::refresh()
         m_itemList->addItem("(no entries)");
 }
 
-void DayPage::changeManager(QOrganizerItemManager *manager)
+void DayPage::changeManager(QOrganizerManager *manager)
 {
     m_manager = manager;
 }
diff --git a/examples/calendardemo/src/daypage.h b/examples/calendardemo/src/daypage.h
index 12d810556b..d7c17a7a98 100644
--- a/examples/calendardemo/src/daypage.h
+++ b/examples/calendardemo/src/daypage.h
@@ -47,7 +47,7 @@
 #include <qorganizeritemid.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerItem;
 QTM_END_NAMESPACE
 QTM_USE_NAMESPACE
@@ -73,7 +73,7 @@ public:
 
 public Q_SLOTS:
     void refresh();
-    void changeManager(QOrganizerItemManager *manager);
+    void changeManager(QOrganizerManager *manager);
     void dayChanged(QDate date);
     void editItem();
     void removeItem();
@@ -93,7 +93,7 @@ protected: // from QWidget
     void showEvent(QShowEvent *event);
 
 private:
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QDate m_day;
     QLabel *m_dateLabel;
     QListWidget *m_itemList;
diff --git a/examples/calendardemo/src/editcalendarspage.cpp b/examples/calendardemo/src/editcalendarspage.cpp
index ebf217d3f1..78ff22ac7b 100644
--- a/examples/calendardemo/src/editcalendarspage.cpp
+++ b/examples/calendardemo/src/editcalendarspage.cpp
@@ -144,7 +144,7 @@ void EditCalendarsPage::itemDoubleClicked(QListWidgetItem *listItem)
     emit showAddCalendarPage(m_manager, &m_collection);
 }
 
-void EditCalendarsPage::showPage(QOrganizerItemManager *manager)
+void EditCalendarsPage::showPage(QOrganizerManager *manager)
 {
     m_manager = manager;
     m_calendarList->clear();
diff --git a/examples/calendardemo/src/editcalendarspage.h b/examples/calendardemo/src/editcalendarspage.h
index 740b2147c4..29422efb6f 100644
--- a/examples/calendardemo/src/editcalendarspage.h
+++ b/examples/calendardemo/src/editcalendarspage.h
@@ -45,7 +45,7 @@
 #include <qorganizercollection.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 QTM_END_NAMESPACE
 QTM_USE_NAMESPACE
 
@@ -67,18 +67,18 @@ public Q_SLOTS:
     void deleteClicked();
     void backClicked();
     void itemDoubleClicked(QListWidgetItem *listItem);
-    void showPage(QOrganizerItemManager *manager);
+    void showPage(QOrganizerManager *manager);
 
 Q_SIGNALS:
     void addClicked();
     void showPreviousPage();
-    void showAddCalendarPage(QOrganizerItemManager*, QOrganizerCollection*);
+    void showAddCalendarPage(QOrganizerManager*, QOrganizerCollection*);
 
 protected: // from QWidget
     void showEvent(QShowEvent *event);
 
 private:
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QOrganizerCollection m_collection;
     QAction *m_saveOrNextSoftKey;
     QListWidget *m_calendarList;
diff --git a/examples/calendardemo/src/eventeditpage.cpp b/examples/calendardemo/src/eventeditpage.cpp
index 0b87e0e5d6..22ef8bbb24 100644
--- a/examples/calendardemo/src/eventeditpage.cpp
+++ b/examples/calendardemo/src/eventeditpage.cpp
@@ -167,39 +167,39 @@ EventEditPage::~EventEditPage()
 
 }
 
-void EventEditPage::eventChanged(QOrganizerItemManager *manager, const QOrganizerEvent &event)
+void EventEditPage::eventChanged(QOrganizerManager *manager, const QOrganizerEvent &event)
 {
     m_manager = manager;
     m_organizerEvent = event;
     m_subjectEdit->setText(event.displayLabel());
     m_startTimeEdit->setDateTime(event.startDateTime());
     m_endTimeEdit->setDateTime(event.endDateTime());
-    QSet<QOrganizerItemRecurrenceRule> rrules(m_organizerEvent.recurrenceRules());
+    QSet<QOrganizerRecurrenceRule> rrules(m_organizerEvent.recurrenceRules());
     // Check whether existing entry and if it is repeating.
     if (rrules.count() != 0) {
-        QOrganizerItemRecurrenceRule rrule(rrules.values().at(0));
-        QOrganizerItemRecurrenceRule::Frequency freq(rrule.frequency());
+        QOrganizerRecurrenceRule rrule(rrules.values().at(0));
+        QOrganizerRecurrenceRule::Frequency freq(rrule.frequency());
         switch (freq) {
-        case QOrganizerItemRecurrenceRule::Daily:
+        case QOrganizerRecurrenceRule::Daily:
             m_typeComboBox->setCurrentIndex(1);
             break;
-        case QOrganizerItemRecurrenceRule::Weekly:
+        case QOrganizerRecurrenceRule::Weekly:
             m_typeComboBox->setCurrentIndex(2);
             break;
-        case QOrganizerItemRecurrenceRule::Monthly:
+        case QOrganizerRecurrenceRule::Monthly:
             m_typeComboBox->setCurrentIndex(3);
             break;
-        case QOrganizerItemRecurrenceRule::Yearly:
+        case QOrganizerRecurrenceRule::Yearly:
             m_typeComboBox->setCurrentIndex(4);
             break;
-        case QOrganizerItemRecurrenceRule::Invalid:
+        case QOrganizerRecurrenceRule::Invalid:
             m_typeComboBox->setCurrentIndex(0); // No repeat
             return;
         }
-        if (rrule.limitType() == QOrganizerItemRecurrenceRule::DateLimit) {
+        if (rrule.limitType() == QOrganizerRecurrenceRule::DateLimit) {
             m_endConditionComboBox->setCurrentIndex(1); // End date specified
             m_repeatUntilDate->setDate(rrule.limitDate());
-        } else if (rrule.limitType() == QOrganizerItemRecurrenceRule::CountLimit) {
+        } else if (rrule.limitType() == QOrganizerRecurrenceRule::CountLimit) {
             m_endConditionComboBox->setCurrentIndex(2); // Count specified
             m_countSpinBox->setValue(rrule.limitCount());
         }
@@ -278,19 +278,19 @@ void EventEditPage::saveClicked()
 
 void EventEditPage::frequencyChanged(const QString& frequency)
 {
-    QOrganizerItemRecurrenceRule rrule;
+    QOrganizerRecurrenceRule rrule;
 
     if (frequency != "None") {
         m_endConditionComboBox->setVisible(true);
 
         if (frequency == "Daily") {
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+            rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
         } else if (frequency == "Weekly") {
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+            rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
         } else if (frequency == "Monthly") {
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+            rrule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         } else if (frequency == "Yearly") {
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+            rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
         }
         m_organizerEvent.setRecurrenceRule(rrule);
     } else {
@@ -331,7 +331,7 @@ void EventEditPage::showEvent(QShowEvent *event)
 
 void EventEditPage::countChanged(int i)
 {
-    QOrganizerItemRecurrenceRule rrule;
+    QOrganizerRecurrenceRule rrule;
     rrule.setFrequency(m_organizerEvent.recurrenceRules().values().at(0).frequency());
     rrule.setLimit(i);
     m_organizerEvent.setRecurrenceRule(rrule);
@@ -339,7 +339,7 @@ void EventEditPage::countChanged(int i)
 
 void EventEditPage::untilChanged(QDate date)
 {
-    QOrganizerItemRecurrenceRule rrule;
+    QOrganizerRecurrenceRule rrule;
     rrule.setFrequency(m_organizerEvent.recurrenceRules().values().at(0).frequency());
     rrule.setLimit(date);
     m_organizerEvent.setRecurrenceRule(rrule);
diff --git a/examples/calendardemo/src/eventeditpage.h b/examples/calendardemo/src/eventeditpage.h
index b57df491b5..0cd4732e69 100644
--- a/examples/calendardemo/src/eventeditpage.h
+++ b/examples/calendardemo/src/eventeditpage.h
@@ -47,7 +47,7 @@
 #include <qorganizerevent.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerItemSaveRequest;
 class QOrganizerEvent;
 class QOrganizerItem;
@@ -73,7 +73,7 @@ public:
 public Q_SLOTS:
     void cancelClicked();
     void saveClicked();
-    void eventChanged(QOrganizerItemManager *manager, const QOrganizerEvent &event);
+    void eventChanged(QOrganizerManager *manager, const QOrganizerEvent &event);
     void frequencyChanged(const QString&);
     void countChanged(int);
     void untilChanged(QDate);
@@ -89,7 +89,7 @@ protected: // from QWidget
     void showEvent(QShowEvent *event);
 
 private:
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QOrganizerEvent m_organizerEvent;
     QList<QOrganizerItem> m_listOfEvents;
     QOrganizerItemSaveRequest *m_saveItemRequest;
diff --git a/examples/calendardemo/src/eventoccurrenceeditpage.cpp b/examples/calendardemo/src/eventoccurrenceeditpage.cpp
index 9a73dff156..233e048c6c 100644
--- a/examples/calendardemo/src/eventoccurrenceeditpage.cpp
+++ b/examples/calendardemo/src/eventoccurrenceeditpage.cpp
@@ -117,7 +117,7 @@ EventOccurrenceEditPage::~EventOccurrenceEditPage()
 
 }
 
-void EventOccurrenceEditPage::eventOccurrenceChanged(QOrganizerItemManager *manager, const QOrganizerEventOccurrence &eventOccurrence)
+void EventOccurrenceEditPage::eventOccurrenceChanged(QOrganizerManager *manager, const QOrganizerEventOccurrence &eventOccurrence)
 {
     m_manager = manager;
     m_organizerEventOccurrence = eventOccurrence;
diff --git a/examples/calendardemo/src/eventoccurrenceeditpage.h b/examples/calendardemo/src/eventoccurrenceeditpage.h
index 7b05900afd..93b8149714 100644
--- a/examples/calendardemo/src/eventoccurrenceeditpage.h
+++ b/examples/calendardemo/src/eventoccurrenceeditpage.h
@@ -47,7 +47,7 @@
 #include <qorganizerevent.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerItemSaveRequest;
 class QOrganizerEvent;
 class QOrganizerItem;
@@ -73,7 +73,7 @@ public:
 public Q_SLOTS:
     void cancelClicked();
     void saveOrNextClicked();
-    void eventOccurrenceChanged(QOrganizerItemManager *manager, const QOrganizerEventOccurrence &eventOccurrence);
+    void eventOccurrenceChanged(QOrganizerManager *manager, const QOrganizerEventOccurrence &eventOccurrence);
 
 Q_SIGNALS:
     void showDayPage();
@@ -82,7 +82,7 @@ protected: // from QWidget
     void showEvent(QShowEvent *event);
 
 private:
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QOrganizerEventOccurrence m_organizerEventOccurrence;
     QList<QOrganizerItem> m_listOfEvents;
     QOrganizerItemSaveRequest *m_saveItemRequest;
diff --git a/examples/calendardemo/src/journaleditpage.cpp b/examples/calendardemo/src/journaleditpage.cpp
index 7ecfb69598..4b97335aa6 100644
--- a/examples/calendardemo/src/journaleditpage.cpp
+++ b/examples/calendardemo/src/journaleditpage.cpp
@@ -128,7 +128,7 @@ JournalEditPage::~JournalEditPage()
 
 }
 
-void JournalEditPage::journalChanged(QOrganizerItemManager *manager, const QOrganizerJournal &journal)
+void JournalEditPage::journalChanged(QOrganizerManager *manager, const QOrganizerJournal &journal)
 {
     m_manager = manager;
     m_organizerJournal = journal;
diff --git a/examples/calendardemo/src/journaleditpage.h b/examples/calendardemo/src/journaleditpage.h
index 0a420a9785..58bd412784 100644
--- a/examples/calendardemo/src/journaleditpage.h
+++ b/examples/calendardemo/src/journaleditpage.h
@@ -48,7 +48,7 @@
 #include <qorganizerjournal.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerEvent;
 class QOrganizerItem;
 QTM_END_NAMESPACE
@@ -69,7 +69,7 @@ public:
 public Q_SLOTS:
     void cancelClicked();
     void saveClicked();
-    void journalChanged(QOrganizerItemManager *manager, const QOrganizerJournal &journal);
+    void journalChanged(QOrganizerManager *manager, const QOrganizerJournal &journal);
     void handleAlarmIndexChanged(const QString);
 
 Q_SIGNALS:
@@ -79,7 +79,7 @@ protected: // from QWidget
     void showEvent(QShowEvent *event);
 
 private:
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QOrganizerJournal m_organizerJournal;
     QLineEdit *m_subjectEdit;
     QDateTimeEdit *m_timeEdit;
diff --git a/examples/calendardemo/src/monthpage.cpp b/examples/calendardemo/src/monthpage.cpp
index 55b6000f31..ed13aa6d19 100644
--- a/examples/calendardemo/src/monthpage.cpp
+++ b/examples/calendardemo/src/monthpage.cpp
@@ -40,7 +40,7 @@
 
 #include <QtGui>
 #include <qtorganizer.h>
-#include <qorganizeritemabstractrequest.h>
+#include <qorganizerabstractrequest.h>
 
 #include "monthpage.h"
 #include "calendardemo.h"
@@ -61,7 +61,7 @@ MonthPage::MonthPage(QWidget *parent)
     QFormLayout *mainlayout = new QFormLayout(this);
 
     m_managerComboBox = new QComboBox(this);
-    foreach (const QString& manager, QOrganizerItemManager::availableManagers()) {
+    foreach (const QString& manager, QOrganizerManager::availableManagers()) {
         if (manager != "invalid" && manager != "skeleton")
             m_managerComboBox->addItem(manager);
     }
@@ -127,7 +127,7 @@ void MonthPage::backendChanged(const QString &managerName)
 
     // Try creating a new manager
     QMap<QString, QString> parameters;
-    QOrganizerItemManager* newManager = new QOrganizerItemManager(managerName, parameters, this);
+    QOrganizerManager* newManager = new QOrganizerManager(managerName, parameters, this);
     if (!newManager || newManager->error()) {
         QMessageBox::information(this, tr("Failed!"), QString("Failed to create manager"));
         delete newManager;
@@ -197,19 +197,19 @@ void MonthPage::refresh()
         QDate startDate;
         QDate endDate;
 
-        QOrganizerEventTimeRange eventTimeRange = item.detail<QOrganizerEventTimeRange>();
-        if (!eventTimeRange.isEmpty()) {
-            startDate = eventTimeRange.startDateTime().date();
-            endDate = eventTimeRange.endDateTime().date();
+        QOrganizerEventTime eventTime = item.detail<QOrganizerEventTime>();
+        if (!eventTime.isEmpty()) {
+            startDate = eventTime.startDateTime().date();
+            endDate = eventTime.endDateTime().date();
         } else {
-            QOrganizerTodoTimeRange todoTimeRange = item.detail<QOrganizerTodoTimeRange>();
-            if (!todoTimeRange.isEmpty()) {
-                startDate = todoTimeRange.startDateTime().date();
-                endDate = todoTimeRange.dueDateTime().date();
+            QOrganizerTodoTime todoTime = item.detail<QOrganizerTodoTime>();
+            if (!todoTime.isEmpty()) {
+                startDate = todoTime.startDateTime().date();
+                endDate = todoTime.dueDateTime().date();
             } else {
-                QOrganizerJournalTimeRange journalTimeRange = item.detail<QOrganizerJournalTimeRange>();
-                if (!journalTimeRange.isEmpty())
-                    startDate = endDate = journalTimeRange.entryDateTime().date();
+                QOrganizerJournalTime journalTime = item.detail<QOrganizerJournalTime>();
+                if (!journalTime.isEmpty())
+                    startDate = endDate = journalTime.entryDateTime().date();
             }
         }
 
@@ -255,9 +255,9 @@ void MonthPage::refreshDayItems()
 
     foreach (const QOrganizerItem &item, items)
     {
-        QOrganizerEventTimeRange eventTimeRange = item.detail<QOrganizerEventTimeRange>();
-        if (!eventTimeRange.isEmpty()) {
-            QString time = eventTimeRange.startDateTime().time().toString("hh:mm");
+        QOrganizerEventTime eventTime = item.detail<QOrganizerEventTime>();
+        if (!eventTime.isEmpty()) {
+            QString time = eventTime.startDateTime().time().toString("hh:mm");
             QListWidgetItem* listItem = new QListWidgetItem();
             listItem->setText(QString("Event:%1-%2").arg(time).arg(item.displayLabel()));
             QVariant data = QVariant::fromValue<QOrganizerItem>(item);
@@ -265,9 +265,9 @@ void MonthPage::refreshDayItems()
             m_itemList->addItem(listItem);
         }
 
-        QOrganizerTodoTimeRange todoTimeRange = item.detail<QOrganizerTodoTimeRange>();
-        if (!todoTimeRange.isEmpty()) {
-            QString time = todoTimeRange.startDateTime().time().toString("hh:mm");
+        QOrganizerTodoTime todoTime = item.detail<QOrganizerTodoTime>();
+        if (!todoTime.isEmpty()) {
+            QString time = todoTime.startDateTime().time().toString("hh:mm");
             QListWidgetItem* listItem = new QListWidgetItem();
             listItem->setText(QString("Todo:%1-%2").arg(time).arg(item.displayLabel()));
             QVariant data = QVariant::fromValue<QOrganizerItem>(item);
@@ -275,9 +275,9 @@ void MonthPage::refreshDayItems()
             m_itemList->addItem(listItem);
         }
 
-        QOrganizerJournalTimeRange journalTimeRange = item.detail<QOrganizerJournalTimeRange>();
-        if (!journalTimeRange.isEmpty()) {
-            QString time = journalTimeRange.entryDateTime().time().toString("hh:mm");
+        QOrganizerJournalTime journalTime = item.detail<QOrganizerJournalTime>();
+        if (!journalTime.isEmpty()) {
+            QString time = journalTime.entryDateTime().time().toString("hh:mm");
             QListWidgetItem* listItem = new QListWidgetItem();
             listItem->setText(QString("Journal:%1-%2").arg(time).arg(item.displayLabel()));
             QVariant data = QVariant::fromValue<QOrganizerItem>(item);
diff --git a/examples/calendardemo/src/monthpage.h b/examples/calendardemo/src/monthpage.h
index 2671e30271..6fa803b569 100644
--- a/examples/calendardemo/src/monthpage.h
+++ b/examples/calendardemo/src/monthpage.h
@@ -46,7 +46,7 @@
 #include <qmobilityglobal.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerItem;
 QTM_END_NAMESPACE
 QTM_USE_NAMESPACE
@@ -85,7 +85,7 @@ public Q_SLOTS:
     void refresh();
 
 Q_SIGNALS:
-    void managerChanged(QOrganizerItemManager *manager);
+    void managerChanged(QOrganizerManager *manager);
     void currentDayChanged(QDate date);
     void showDayPage(QDate date);
     void showEditPage(const QOrganizerItem &item);
@@ -97,7 +97,7 @@ protected: // from QWidget
 
 private:
     QComboBox* m_managerComboBox;
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QCalendarWidget *m_calendarWidget;
     QLabel *m_dateLabel;
     QListWidget *m_itemList;
diff --git a/examples/calendardemo/src/todoeditpage.cpp b/examples/calendardemo/src/todoeditpage.cpp
index b76d11b978..58a526882c 100644
--- a/examples/calendardemo/src/todoeditpage.cpp
+++ b/examples/calendardemo/src/todoeditpage.cpp
@@ -159,7 +159,7 @@ TodoEditPage::~TodoEditPage()
 
 }
 
-void TodoEditPage::todoChanged(QOrganizerItemManager *manager, const QOrganizerTodo &todo)
+void TodoEditPage::todoChanged(QOrganizerManager *manager, const QOrganizerTodo &todo)
 {
     m_manager = manager;
     m_organizerTodo = todo;
diff --git a/examples/calendardemo/src/todoeditpage.h b/examples/calendardemo/src/todoeditpage.h
index 35c97c22f9..23b9a854bf 100644
--- a/examples/calendardemo/src/todoeditpage.h
+++ b/examples/calendardemo/src/todoeditpage.h
@@ -47,7 +47,7 @@
 #include <qorganizertodo.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerEvent;
 class QOrganizerItem;
 QTM_END_NAMESPACE
@@ -68,7 +68,7 @@ public:
 public Q_SLOTS:
     void cancelClicked();
     void saveClicked();
-    void todoChanged(QOrganizerItemManager *manager, const QOrganizerTodo &todo);
+    void todoChanged(QOrganizerManager *manager, const QOrganizerTodo &todo);
     void handleAlarmIndexChanged(const QString);
 
 
@@ -79,7 +79,7 @@ protected: // from QWidget
     void showEvent(QShowEvent *event);
 
 private:
-    QOrganizerItemManager *m_manager;
+    QOrganizerManager *m_manager;
     QOrganizerTodo m_organizerTodo;
     QLineEdit *m_subjectEdit;
     QDateTimeEdit *m_startTimeEdit;
diff --git a/examples/todo/window.cpp b/examples/todo/window.cpp
index 70b78a3345..1d994bfd7a 100644
--- a/examples/todo/window.cpp
+++ b/examples/todo/window.cpp
@@ -50,7 +50,7 @@ Window::Window()
 {
     setupGui();
 
-    manager = new QOrganizerItemManager("memory");
+    manager = new QOrganizerManager("memory");
 
     setWindowTitle(tr("ToDo Example"));
     refreshList();
@@ -125,8 +125,8 @@ void Window::refreshList()
     listWidget->clear();
 
     QOrganizerItemSortOrder sortOrder;
-    sortOrder.setDetailDefinitionName(QOrganizerTodoTimeRange::DefinitionName,
-        QOrganizerTodoTimeRange::FieldDueDateTime);
+    sortOrder.setDetailDefinitionName(QOrganizerTodoTime::DefinitionName,
+        QOrganizerTodoTime::FieldDueDateTime);
 
     QList<QOrganizerItem> items =
         manager->items(QOrganizerItemFilter(), QList<QOrganizerItemSortOrder>() << sortOrder);
diff --git a/examples/todo/window.h b/examples/todo/window.h
index 28befbf343..06c51a6142 100644
--- a/examples/todo/window.h
+++ b/examples/todo/window.h
@@ -45,7 +45,7 @@
 #include <qmobilityglobal.h>
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerTodo;
 QTM_END_NAMESPACE
 
@@ -77,7 +77,7 @@ private slots:
 private:
     void setupGui();
 
-    QOrganizerItemManager *manager;
+    QOrganizerManager *manager;
     
     TodoEditor *todoEditor;
 
diff --git a/plugins/declarative/organizer/plugin.cpp b/plugins/declarative/organizer/plugin.cpp
index afcfc9812a..d3eaa3230a 100644
--- a/plugins/declarative/organizer/plugin.cpp
+++ b/plugins/declarative/organizer/plugin.cpp
@@ -80,7 +80,7 @@ public:
 
         //details
         qmlRegisterType<QDeclarativeOrganizerItemDetail>(uri, 1, 1, "OrganizerItemDetail");
-        qmlRegisterType<QDeclarativeOrganizerEventTimeRange>(uri, 1, 1, "OrganizerEventTimeRange");
+        qmlRegisterType<QDeclarativeOrganizerEventTime>(uri, 1, 1, "OrganizerEventTime");
         qmlRegisterType<QDeclarativeOrganizerItemDescription>(uri, 1, 1, "OrganizerItemDescription");
         qmlRegisterType<QDeclarativeOrganizerItemDisplayLabel>(uri, 1, 1, "OrganizerItemDisplayLabel");
         qmlRegisterType<QDeclarativeOrganizerItemGuid>(uri, 1, 1, "OrganizerItemGuid");
@@ -94,9 +94,9 @@ public:
         qmlRegisterType<QDeclarativeOrganizerItemEmailReminder>(uri, 1, 1, "OrganizerItemEmailReminder");
         qmlRegisterType<QDeclarativeOrganizerItemTimestamp>(uri, 1, 1, "OrganizerItemTimestamp");
         qmlRegisterType<QDeclarativeOrganizerItemType>(uri, 1, 1, "OrganizerItemType");
-        qmlRegisterType<QDeclarativeOrganizerJournalTimeRange>(uri, 1, 1, "OrganizerJournalTimeRange");
+        qmlRegisterType<QDeclarativeOrganizerJournalTime>(uri, 1, 1, "OrganizerJournalTime");
         qmlRegisterType<QDeclarativeOrganizerTodoProgress>(uri, 1, 1, "OrganizerTodoProgress");
-        qmlRegisterType<QDeclarativeOrganizerTodoTimeRange>(uri, 1, 1, "OrganizerTodoTimeRange");
+        qmlRegisterType<QDeclarativeOrganizerTodoTime>(uri, 1, 1, "OrganizerTodoTime");
 
         //filters
         qmlRegisterType<QDeclarativeOrganizerItemFilter>(uri, 1, 1, "OrganizerItemFilter");
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritem_p.h b/plugins/declarative/organizer/qdeclarativeorganizeritem_p.h
index 1519923c7b..a6143ac627 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritem_p.h
+++ b/plugins/declarative/organizer/qdeclarativeorganizeritem_p.h
@@ -166,34 +166,34 @@ public:
 
     void setStartDateTime(const QDateTime& startDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTimeRange, "startDateTime", startDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTime, "startDateTime", startDateTime)
     }
 
     QDateTime startDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTimeRange, "startDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTime, "startDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
     void setEndDateTime(const QDateTime& endDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTimeRange, "endDateTime", endDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTime, "endDateTime", endDateTime)
     }
 
     QDateTime endDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTimeRange, "endDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTime, "endDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
     void setTimeSpecified(bool isTimeSpecified)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTimeRange, "isTimeSpecified", isTimeSpecified)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTime, "isTimeSpecified", isTimeSpecified)
     }
 
     bool isTimeSpecified() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTimeRange, "isTimeSpecified", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTime, "isTimeSpecified", returnValue)
         return returnValue.value<bool>();
     }
 
@@ -289,34 +289,34 @@ public:
 
     void setStartDateTime(const QDateTime& startDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTimeRange, "startDateTime", startDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTime, "startDateTime", startDateTime)
     }
 
     QDateTime startDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTimeRange, "startDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTime, "startDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
     void setEndDateTime(const QDateTime& endDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTimeRange, "endDateTime", endDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTime, "endDateTime", endDateTime)
     }
 
     QDateTime endDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTimeRange, "endDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTime, "endDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
     void setTimeSpecified(bool isTimeSpecified)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTimeRange, "isTimeSpecified", isTimeSpecified)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerEventTime, "isTimeSpecified", isTimeSpecified)
     }
 
     bool isTimeSpecified() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTimeRange, "isTimeSpecified", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerEventTime, "isTimeSpecified", returnValue)
         return returnValue.value<bool>();
     }
 
@@ -380,12 +380,12 @@ public:
     explicit QDeclarativeOrganizerJournal(QObject *parent = 0);
     void setDateTime(const QDateTime& dateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerJournalTimeRange, "entryDateTime", dateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerJournalTime, "entryDateTime", dateTime)
     }
 
     QDateTime dateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerJournalTimeRange, "entryDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerJournalTime, "entryDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 signals:
@@ -426,34 +426,34 @@ public:
     explicit QDeclarativeOrganizerTodo(QObject *parent = 0);
     void setStartDateTime(const QDateTime& startDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTimeRange, "startDateTime", startDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTime, "startDateTime", startDateTime)
     }
 
     QDateTime startDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTimeRange, "startDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTime, "startDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
     void setDueDateTime(const QDateTime& dueDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTimeRange, "dueDateTime", dueDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTime, "dueDateTime", dueDateTime)
     }
 
     QDateTime dueDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTimeRange, "dueDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTime, "dueDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
     void setTimeSpecified(bool isTimeSpecified)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTimeRange, "isTimeSpecified", isTimeSpecified)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTime, "isTimeSpecified", isTimeSpecified)
     }
 
     bool isTimeSpecified() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTimeRange, "isTimeSpecified", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTime, "isTimeSpecified", returnValue)
         return returnValue.value<bool>();
     }
 
@@ -528,23 +528,23 @@ public:
     explicit QDeclarativeOrganizerTodoOccurrence(QObject *parent = 0);
     void setStartDateTime(const QDateTime& startDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTimeRange, "startDateTime", startDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTime, "startDateTime", startDateTime)
     }
 
     QDateTime startDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTimeRange, "startDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTime, "startDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
     void setDueDateTime(const QDateTime& dueDateTime)
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTimeRange, "dueDateTime", dueDateTime)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_SET(QDeclarativeOrganizerTodoTime, "dueDateTime", dueDateTime)
     }
 
     QDateTime dueDateTime() const
     {
-        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTimeRange, "dueDateTime", returnValue)
+        Q_DECLARATIVEORGANIZERITEMDETAIL_GET(QDeclarativeOrganizerTodoTime, "dueDateTime", returnValue)
         return returnValue.value<QDateTime>();
     }
 
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritemdetail.cpp b/plugins/declarative/organizer/qdeclarativeorganizeritemdetail.cpp
index 9e80217c2a..583f811be1 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritemdetail.cpp
+++ b/plugins/declarative/organizer/qdeclarativeorganizeritemdetail.cpp
@@ -42,7 +42,7 @@
 #include "qdeclarativeorganizeritemdetail_p.h"
 
 
-Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerEventTimeRange::DetailName, "eventTimeRange");
+Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerEventTime::DetailName, "eventTime");
 Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerItemComment::DetailName, "comment");
 Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerItemComment::DetailGroupName, "comments");
 Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerItemDescription::DetailName, "description");
@@ -62,6 +62,6 @@ Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerItemEmailReminder::DetailName, "em
 Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerItemEmailReminder::DetailGroupName, "emailReminders");
 Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerItemTimestamp::DetailName, "timestamp");
 Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerItemType::DetailName, "type");
-Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerJournalTimeRange::DetailName, "journalTimeRange");
+Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerJournalTime::DetailName, "journalTime");
 Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerTodoProgress::DetailName, "todoProgress");
-Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerTodoTimeRange::DetailName, "todoTimeRange");
+Q_DEFINE_LATIN1_CONSTANT(QDeclarativeOrganizerTodoTime::DetailName, "todoTime");
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h b/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h
index 688812ad8e..de65f16412 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h
+++ b/plugins/declarative/organizer/qdeclarativeorganizeritemdetail_p.h
@@ -127,29 +127,29 @@ QML_DECLARE_TYPE(QDeclarativeOrganizerItemDetail)
 
 
 //event time range detail
-class QDeclarativeOrganizerEventTimeRange : public QDeclarativeOrganizerItemDetail
+class QDeclarativeOrganizerEventTime : public QDeclarativeOrganizerItemDetail
 {
     Q_OBJECT
     Q_PROPERTY(QDateTime startDateTime READ startDateTime WRITE setStartDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime endDateTime READ endDateTime WRITE setEndDateTime NOTIFY valueChanged)
     Q_PROPERTY(bool isTimeSpecified READ isTimeSpecified WRITE setTimeSpecified NOTIFY valueChanged)
 public:
-    Q_DECLARE_LATIN1_CONSTANT(DetailName, "eventTimeRange");
+    Q_DECLARE_LATIN1_CONSTANT(DetailName, "eventTime");
 
-    QDeclarativeOrganizerEventTimeRange(QObject* parent = 0)
+    QDeclarativeOrganizerEventTime(QObject* parent = 0)
         :QDeclarativeOrganizerItemDetail(parent)
     {
     }
-    void setStartDateTime(const QDateTime& startDateTime) {m_detail.setValue(QOrganizerEventTimeRange::FieldStartDateTime, startDateTime);}
-    QDateTime startDateTime() const {return m_detail.value<QDateTime>(QOrganizerEventTimeRange::FieldStartDateTime);}
-    void setEndDateTime(const QDateTime& endDateTime) {m_detail.setValue(QOrganizerEventTimeRange::FieldEndDateTime, endDateTime);}
-    QDateTime endDateTime() const {return m_detail.value<QDateTime>(QOrganizerEventTimeRange::FieldEndDateTime);}
-    void setTimeSpecified(bool isTimeSpecified) {m_detail.setValue(QOrganizerEventTimeRange::FieldTimeSpecified, isTimeSpecified);}
-    bool isTimeSpecified() {return m_detail.value<bool>(QOrganizerEventTimeRange::FieldTimeSpecified);}
+    void setStartDateTime(const QDateTime& startDateTime) {m_detail.setValue(QOrganizerEventTime::FieldStartDateTime, startDateTime);}
+    QDateTime startDateTime() const {return m_detail.value<QDateTime>(QOrganizerEventTime::FieldStartDateTime);}
+    void setEndDateTime(const QDateTime& endDateTime) {m_detail.setValue(QOrganizerEventTime::FieldEndDateTime, endDateTime);}
+    QDateTime endDateTime() const {return m_detail.value<QDateTime>(QOrganizerEventTime::FieldEndDateTime);}
+    void setTimeSpecified(bool isTimeSpecified) {m_detail.setValue(QOrganizerEventTime::FieldTimeSpecified, isTimeSpecified);}
+    bool isTimeSpecified() {return m_detail.value<bool>(QOrganizerEventTime::FieldTimeSpecified);}
 signals:
     void valueChanged();
 };
-QML_DECLARE_TYPE(QDeclarativeOrganizerEventTimeRange)
+QML_DECLARE_TYPE(QDeclarativeOrganizerEventTime)
 
 //comment detail
 class QDeclarativeOrganizerItemComment : public QDeclarativeOrganizerItemDetail
@@ -374,7 +374,7 @@ signals:
 private slots:
     void _saveRecurrenceRules()
     {
-        QSet<QOrganizerItemRecurrenceRule> rules;
+        QSet<QOrganizerRecurrenceRule> rules;
         foreach (const QDeclarativeOrganizerItemRecurrenceRule* r, m_recurrenceRules) {
             rules << r->rule();
         }
@@ -384,7 +384,7 @@ private slots:
 
     void _saveExceptionRules()
     {
-        QSet<QOrganizerItemRecurrenceRule> rules;
+        QSet<QOrganizerRecurrenceRule> rules;
         foreach (const QDeclarativeOrganizerItemRecurrenceRule* r, m_exceptionRules) {
             rules << r->rule();
         }
@@ -559,22 +559,22 @@ signals:
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemType)
 
 //journal time range detail
-class QDeclarativeOrganizerJournalTimeRange : public QDeclarativeOrganizerItemDetail
+class QDeclarativeOrganizerJournalTime : public QDeclarativeOrganizerItemDetail
 {
     Q_OBJECT
     Q_PROPERTY(QDateTime entryDateTime READ entryDateTime WRITE setEntryDateTime NOTIFY valueChanged)
 public:
-    Q_DECLARE_LATIN1_CONSTANT(DetailName, "journalTimeRange");
-    QDeclarativeOrganizerJournalTimeRange(QObject* parent = 0)
+    Q_DECLARE_LATIN1_CONSTANT(DetailName, "journalTime");
+    QDeclarativeOrganizerJournalTime(QObject* parent = 0)
         :QDeclarativeOrganizerItemDetail(parent)
     {
     }
-    void setEntryDateTime(const QDateTime& entryDateTime) {m_detail.setValue(QOrganizerJournalTimeRange::FieldEntryDateTime, entryDateTime);}
-    QDateTime entryDateTime() const {return m_detail.value<QDateTime>(QOrganizerJournalTimeRange::FieldEntryDateTime);}
+    void setEntryDateTime(const QDateTime& entryDateTime) {m_detail.setValue(QOrganizerJournalTime::FieldEntryDateTime, entryDateTime);}
+    QDateTime entryDateTime() const {return m_detail.value<QDateTime>(QOrganizerJournalTime::FieldEntryDateTime);}
 signals:
     void valueChanged();
 };
-QML_DECLARE_TYPE(QDeclarativeOrganizerJournalTimeRange)
+QML_DECLARE_TYPE(QDeclarativeOrganizerJournalTime)
 
 //todo progress detail
 class QDeclarativeOrganizerTodoProgress : public QDeclarativeOrganizerItemDetail
@@ -615,29 +615,29 @@ signals:
 QML_DECLARE_TYPE(QDeclarativeOrganizerTodoProgress)
 
 //todo time range detail
-class QDeclarativeOrganizerTodoTimeRange : public QDeclarativeOrganizerItemDetail
+class QDeclarativeOrganizerTodoTime : public QDeclarativeOrganizerItemDetail
 {
     Q_OBJECT
     Q_PROPERTY(bool isTimeSpecified READ isTimeSpecified WRITE setTimeSpecified NOTIFY valueChanged)
     Q_PROPERTY(QDateTime startDateTime READ startDateTime WRITE setStartDateTime NOTIFY valueChanged)
     Q_PROPERTY(QDateTime dueDateTime READ dueDateTime WRITE setDueDateTime NOTIFY valueChanged)
 public:
-    Q_DECLARE_LATIN1_CONSTANT(DetailName, "todoTimeRange");
-    QDeclarativeOrganizerTodoTimeRange(QObject* parent = 0)
+    Q_DECLARE_LATIN1_CONSTANT(DetailName, "todoTime");
+    QDeclarativeOrganizerTodoTime(QObject* parent = 0)
         :QDeclarativeOrganizerItemDetail(parent)
     {
     }
-    void setStartDateTime(const QDateTime& startDateTime) {m_detail.setValue(QOrganizerTodoTimeRange::FieldStartDateTime, startDateTime);}
-    QDateTime startDateTime() const {return m_detail.value<QDateTime>(QOrganizerTodoTimeRange::FieldStartDateTime);}
-    void setDueDateTime(const QDateTime& dueDateTime) {m_detail.setValue(QOrganizerTodoTimeRange::FieldDueDateTime, dueDateTime);}
-    QDateTime dueDateTime() const {return m_detail.value<QDateTime>(QOrganizerTodoTimeRange::FieldDueDateTime);}
-    void setTimeSpecified(bool isTimeSpecified) {m_detail.setValue(QOrganizerTodoTimeRange::FieldTimeSpecified, isTimeSpecified);}
-    bool isTimeSpecified() {return m_detail.value<bool>(QOrganizerTodoTimeRange::FieldTimeSpecified);}
+    void setStartDateTime(const QDateTime& startDateTime) {m_detail.setValue(QOrganizerTodoTime::FieldStartDateTime, startDateTime);}
+    QDateTime startDateTime() const {return m_detail.value<QDateTime>(QOrganizerTodoTime::FieldStartDateTime);}
+    void setDueDateTime(const QDateTime& dueDateTime) {m_detail.setValue(QOrganizerTodoTime::FieldDueDateTime, dueDateTime);}
+    QDateTime dueDateTime() const {return m_detail.value<QDateTime>(QOrganizerTodoTime::FieldDueDateTime);}
+    void setTimeSpecified(bool isTimeSpecified) {m_detail.setValue(QOrganizerTodoTime::FieldTimeSpecified, isTimeSpecified);}
+    bool isTimeSpecified() {return m_detail.value<bool>(QOrganizerTodoTime::FieldTimeSpecified);}
 
 signals:
     void valueChanged();
 };
-QML_DECLARE_TYPE(QDeclarativeOrganizerTodoTimeRange)
+QML_DECLARE_TYPE(QDeclarativeOrganizerTodoTime)
 
 #endif // QDECLARATIVEORGANIZERITEMDETAIL_H
 
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritemmetaobject.cpp b/plugins/declarative/organizer/qdeclarativeorganizeritemmetaobject.cpp
index 4a2af6ee20..ce70c996a9 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritemmetaobject.cpp
+++ b/plugins/declarative/organizer/qdeclarativeorganizeritemmetaobject.cpp
@@ -14,7 +14,7 @@ QTM_USE_NAMESPACE
     {QDeclarativeOrganizer##classname::DetailGroupName.latin1(), QOrganizer##classname::DefinitionName.latin1(), true}
 
 static OrganizerItemDetailNameMap qt_organizerItemDetailNameMap[] = {
-    Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(EventTimeRange),
+    Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(EventTime),
     Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(ItemComment),
     Q_DECLARATIVE_ORGANIZER_ITEM_DETAILGROUPNAME(ItemComment),
     Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(ItemDescription),
@@ -34,9 +34,9 @@ static OrganizerItemDetailNameMap qt_organizerItemDetailNameMap[] = {
     Q_DECLARATIVE_ORGANIZER_ITEM_DETAILGROUPNAME(ItemEmailReminder),
     Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(ItemTimestamp),
     Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(ItemType),
-    Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(JournalTimeRange),
+    Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(JournalTime),
     Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(TodoProgress),
-    Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(TodoTimeRange)
+    Q_DECLARATIVE_ORGANIZER_ITEM_DETAILNAME(TodoTime)
 };
 
 QDeclarativeOrganizerItemMetaObject::QDeclarativeOrganizerItemMetaObject(QObject* obj, const QOrganizerItem& item)
diff --git a/plugins/declarative/organizer/qdeclarativeorganizeritemrecurrencerule_p.h b/plugins/declarative/organizer/qdeclarativeorganizeritemrecurrencerule_p.h
index 048ad13a69..ba80a33d4c 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizeritemrecurrencerule_p.h
+++ b/plugins/declarative/organizer/qdeclarativeorganizeritemrecurrencerule_p.h
@@ -44,7 +44,7 @@
 #define QDECLARATIVEORGANIZERITEMRECURRENCERULE_H
 
 #include <QtDeclarative>
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule.h"
 
 
 QTM_USE_NAMESPACE
@@ -75,37 +75,37 @@ public:
     }
 
     enum Frequency {
-        Invalid = QOrganizerItemRecurrenceRule::Invalid,
-        Daily = QOrganizerItemRecurrenceRule::Daily,
-        Weekly = QOrganizerItemRecurrenceRule::Weekly,
-        Monthly = QOrganizerItemRecurrenceRule::Monthly,
-        Yearly = QOrganizerItemRecurrenceRule::Yearly
+        Invalid = QOrganizerRecurrenceRule::Invalid,
+        Daily = QOrganizerRecurrenceRule::Daily,
+        Weekly = QOrganizerRecurrenceRule::Weekly,
+        Monthly = QOrganizerRecurrenceRule::Monthly,
+        Yearly = QOrganizerRecurrenceRule::Yearly
     };
 
     enum Month {
-        January = QOrganizerItemRecurrenceRule::January,
-        February = QOrganizerItemRecurrenceRule::February,
-        March = QOrganizerItemRecurrenceRule::March,
-        April = QOrganizerItemRecurrenceRule::April,
-        May = QOrganizerItemRecurrenceRule::May,
-        June = QOrganizerItemRecurrenceRule::June,
-        July = QOrganizerItemRecurrenceRule::July,
-        August = QOrganizerItemRecurrenceRule::August,
-        September = QOrganizerItemRecurrenceRule::September,
-        October = QOrganizerItemRecurrenceRule::October,
-        November = QOrganizerItemRecurrenceRule::November,
-        December = QOrganizerItemRecurrenceRule::December
+        January = QOrganizerRecurrenceRule::January,
+        February = QOrganizerRecurrenceRule::February,
+        March = QOrganizerRecurrenceRule::March,
+        April = QOrganizerRecurrenceRule::April,
+        May = QOrganizerRecurrenceRule::May,
+        June = QOrganizerRecurrenceRule::June,
+        July = QOrganizerRecurrenceRule::July,
+        August = QOrganizerRecurrenceRule::August,
+        September = QOrganizerRecurrenceRule::September,
+        October = QOrganizerRecurrenceRule::October,
+        November = QOrganizerRecurrenceRule::November,
+        December = QOrganizerRecurrenceRule::December
     };
 
     enum LimitType {
-        NoLimit = QOrganizerItemRecurrenceRule::NoLimit,
-        CountLimit = QOrganizerItemRecurrenceRule::CountLimit,
-        DateLimit = QOrganizerItemRecurrenceRule::DateLimit
+        NoLimit = QOrganizerRecurrenceRule::NoLimit,
+        CountLimit = QOrganizerRecurrenceRule::CountLimit,
+        DateLimit = QOrganizerRecurrenceRule::DateLimit
     };
 
     void setFrequency(Frequency freq)
     {
-        m_rule.setFrequency(static_cast<QOrganizerItemRecurrenceRule::Frequency>(freq));
+        m_rule.setFrequency(static_cast<QOrganizerRecurrenceRule::Frequency>(freq));
     }
 
     Frequency frequency() const
@@ -200,9 +200,9 @@ public:
 
     void setMonthsOfYear(const QVariantList& months)
     {
-        QSet<QOrganizerItemRecurrenceRule::Month> saved;
+        QSet<QOrganizerRecurrenceRule::Month> saved;
         foreach(QVariant day, months) {
-            saved << static_cast<QOrganizerItemRecurrenceRule::Month>(day.value<int>());
+            saved << static_cast<QOrganizerRecurrenceRule::Month>(day.value<int>());
         }
         m_rule.setMonthsOfYear(saved);
     }
@@ -258,14 +258,14 @@ public:
     {
         return m_rule.firstDayOfWeek();
     }
-    QOrganizerItemRecurrenceRule rule() const
+    QOrganizerRecurrenceRule rule() const
     {
         return m_rule;
     }
 signals:
     void valueChanged();
 private:
-    QOrganizerItemRecurrenceRule m_rule;
+    QOrganizerRecurrenceRule m_rule;
 };
 QML_DECLARE_TYPE(QDeclarativeOrganizerItemRecurrenceRule)
 
diff --git a/plugins/declarative/organizer/qdeclarativeorganizermodel.cpp b/plugins/declarative/organizer/qdeclarativeorganizermodel.cpp
index 48d46fea9e..7f56910344 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizermodel.cpp
+++ b/plugins/declarative/organizer/qdeclarativeorganizermodel.cpp
@@ -41,7 +41,7 @@
 #include <qorganizeritemdetails.h>
 
 #include "qdeclarativeorganizermodel_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 #include "qversitreader.h"
 #include "qversitwriter.h"
 #include "qversitorganizerimporter.h"
@@ -73,7 +73,7 @@ public:
     }
 
     QList<QDeclarativeOrganizerItem*> m_items;
-    QOrganizerItemManager* m_manager;
+    QOrganizerManager* m_manager;
     QDeclarativeOrganizerItemFetchHint* m_fetchHint;
     QList<QDeclarativeOrganizerItemSortOrder*> m_sortOrders;
     QDeclarativeOrganizerItemFilter* m_filter;
@@ -112,7 +112,7 @@ QString QDeclarativeOrganizerModel::manager() const
 
 QStringList QDeclarativeOrganizerModel::availableManagers() const
 {
-    return QOrganizerItemManager::availableManagers();
+    return QOrganizerManager::availableManagers();
 }
 
 QDateTime QDeclarativeOrganizerModel::startPeriod() const
@@ -183,7 +183,7 @@ void QDeclarativeOrganizerModel::setManager(const QString& managerName)
         delete d->m_manager;
 
 
-    d->m_manager = new QOrganizerItemManager(managerName);
+    d->m_manager = new QOrganizerManager(managerName);
 
     qWarning() << "Changed backend to: " << managerName;
     connect(d->m_manager, SIGNAL(dataChanged()), this, SLOT(fetchAgain()));
@@ -269,7 +269,7 @@ void QDeclarativeOrganizerModel::fetchAgain()
     req->setFilter(d->m_filter? d->m_filter->filter() : QOrganizerItemFilter());
     req->setFetchHint(d->m_fetchHint ? d->m_fetchHint->fetchHint() : QOrganizerItemFetchHint());
 
-    connect(req,SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), this, SLOT(itemFetched()));
+    connect(req,SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), this, SLOT(itemFetched()));
 
     req->start();
     emit itemsChanged();
@@ -306,7 +306,7 @@ void QDeclarativeOrganizerModel::saveItem(QDeclarativeOrganizerItem* di)
         req->setManager(d->m_manager);
         req->setItem(c);
 
-        connect(req,SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), this, SLOT(itemSaved()));
+        connect(req,SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), this, SLOT(itemSaved()));
 
         req->start();
     }
@@ -356,7 +356,7 @@ void QDeclarativeOrganizerModel::removeItems(const QList<uint>& ids)
 
     req->setItemIds(localIds);
 
-    connect(req,SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), this, SLOT(itemRemoved()));
+    connect(req,SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), this, SLOT(itemRemoved()));
 
     req->start();
 }
@@ -371,7 +371,7 @@ void QDeclarativeOrganizerModel::itemRemoved()
 {
     QOrganizerItemRemoveRequest* req = qobject_cast<QOrganizerItemRemoveRequest*>(QObject::sender());
     if (req->isFinished()) {
-         if (req->error() == QOrganizerItemManager::NoError)
+         if (req->error() == QOrganizerManager::NoError)
             fetchAgain();
          req->deleteLater();
     }
diff --git a/plugins/declarative/organizer/qdeclarativeorganizermodel_p.h b/plugins/declarative/organizer/qdeclarativeorganizermodel_p.h
index 7039fc7e24..5c05cbf99e 100644
--- a/plugins/declarative/organizer/qdeclarativeorganizermodel_p.h
+++ b/plugins/declarative/organizer/qdeclarativeorganizermodel_p.h
@@ -81,26 +81,26 @@ public:
     };
 
     enum Error {
-        NoError = QOrganizerItemManager::NoError,
-        DoesNotExistError = QOrganizerItemManager::DoesNotExistError,
-        AlreadyExistsError = QOrganizerItemManager::AlreadyExistsError,
-        InvalidDetailError = QOrganizerItemManager::InvalidDetailError,
-        LockedError = QOrganizerItemManager::LockedError,
-        DetailAccessError = QOrganizerItemManager::DetailAccessError,
-        PermissionsError = QOrganizerItemManager::PermissionsError,
-        OutOfMemoryError = QOrganizerItemManager::OutOfMemoryError,
-        NotSupportedError = QOrganizerItemManager::NotSupportedError,
-        BadArgumentError = QOrganizerItemManager::BadArgumentError,
-        UnspecifiedError = QOrganizerItemManager::UnspecifiedError,
-        VersionMismatchError = QOrganizerItemManager::VersionMismatchError,
-        LimitReachedError = QOrganizerItemManager::LimitReachedError,
-        InvalidItemTypeError = QOrganizerItemManager::InvalidItemTypeError,
-        InvalidCollectionError = QOrganizerItemManager::InvalidCollectionError,
-        InvalidOccurrenceError = QOrganizerItemManager::InvalidOccurrenceError
+        NoError = QOrganizerManager::NoError,
+        DoesNotExistError = QOrganizerManager::DoesNotExistError,
+        AlreadyExistsError = QOrganizerManager::AlreadyExistsError,
+        InvalidDetailError = QOrganizerManager::InvalidDetailError,
+        LockedError = QOrganizerManager::LockedError,
+        DetailAccessError = QOrganizerManager::DetailAccessError,
+        PermissionsError = QOrganizerManager::PermissionsError,
+        OutOfMemoryError = QOrganizerManager::OutOfMemoryError,
+        NotSupportedError = QOrganizerManager::NotSupportedError,
+        BadArgumentError = QOrganizerManager::BadArgumentError,
+        UnspecifiedError = QOrganizerManager::UnspecifiedError,
+        VersionMismatchError = QOrganizerManager::VersionMismatchError,
+        LimitReachedError = QOrganizerManager::LimitReachedError,
+        InvalidItemTypeError = QOrganizerManager::InvalidItemTypeError,
+        InvalidCollectionError = QOrganizerManager::InvalidCollectionError,
+        InvalidOccurrenceError = QOrganizerManager::InvalidOccurrenceError
     };
 
     explicit QDeclarativeOrganizerModel(QObject *parent = 0);
-    explicit QDeclarativeOrganizerModel(QOrganizerItemManager* manager, const QDateTime& start, const QDateTime& end, QObject *parent = 0);
+    explicit QDeclarativeOrganizerModel(QOrganizerManager* manager, const QDateTime& start, const QDateTime& end, QObject *parent = 0);
 
     Error error() const;
     QString manager() const;
diff --git a/plugins/organizer/maemo5/qorganizerasynchprocess.cpp b/plugins/organizer/maemo5/qorganizerasynchprocess.cpp
index 3406fe3566..9b4fdb91ad 100644
--- a/plugins/organizer/maemo5/qorganizerasynchprocess.cpp
+++ b/plugins/organizer/maemo5/qorganizerasynchprocess.cpp
@@ -48,7 +48,7 @@
 
 QTM_USE_NAMESPACE
 
-OrganizerRequestTimeoutTimer::OrganizerRequestTimeoutTimer(QOrganizerItemAbstractRequest *req, int msecs)
+OrganizerRequestTimeoutTimer::OrganizerRequestTimeoutTimer(QOrganizerAbstractRequest *req, int msecs)
     : m_req(req)
 {
     m_timeoutTimer = new QTimer();
@@ -62,7 +62,7 @@ OrganizerRequestTimeoutTimer::~OrganizerRequestTimeoutTimer()
     delete m_timeoutTimer;
 }
 
-QOrganizerItemAbstractRequest* OrganizerRequestTimeoutTimer::request() const
+QOrganizerAbstractRequest* OrganizerRequestTimeoutTimer::request() const
 {
     return m_req;
 }
@@ -100,7 +100,7 @@ OrganizerAsynchProcess::~OrganizerAsynchProcess()
         yieldCurrentThread();
 }
 
-void OrganizerAsynchProcess::requestDestroyed(QOrganizerItemAbstractRequest *req)
+void OrganizerAsynchProcess::requestDestroyed(QOrganizerAbstractRequest *req)
 {
     bool requestRemoved = false;
 
@@ -111,25 +111,25 @@ void OrganizerAsynchProcess::requestDestroyed(QOrganizerItemAbstractRequest *req
     }
     m_mainMutex.unlock();
 
-    if (!requestRemoved && req->state() != QOrganizerItemAbstractRequest::FinishedState)
+    if (!requestRemoved && req->state() != QOrganizerAbstractRequest::FinishedState)
         waitForRequestFinished(req);
 }
 
-bool OrganizerAsynchProcess::addRequest(QOrganizerItemAbstractRequest *req)
+bool OrganizerAsynchProcess::addRequest(QOrganizerAbstractRequest *req)
 {
     m_mainMutex.lock();
     m_requestQueue.enqueue(req);
     m_mainMutex.unlock();
-    QOrganizerItemManagerEngine::updateRequestState(req, QOrganizerItemAbstractRequest::ActiveState);
+    QOrganizerManagerEngine::updateRequestState(req, QOrganizerAbstractRequest::ActiveState);
     return true;
 }
 
-bool OrganizerAsynchProcess::cancelRequest(QOrganizerItemAbstractRequest *req)
+bool OrganizerAsynchProcess::cancelRequest(QOrganizerAbstractRequest *req)
 {
     m_mainMutex.lock();
 
     if (m_requestQueue.contains(req)) {
-        QOrganizerItemManagerEngine::updateRequestState(req, QOrganizerItemAbstractRequest::CanceledState);
+        QOrganizerManagerEngine::updateRequestState(req, QOrganizerAbstractRequest::CanceledState);
         m_requestQueue.removeOne(req);
         m_mainMutex.unlock();
         return true;
@@ -141,13 +141,13 @@ bool OrganizerAsynchProcess::cancelRequest(QOrganizerItemAbstractRequest *req)
     }
 }
 
-bool OrganizerAsynchProcess::waitForRequestFinished(QOrganizerItemAbstractRequest *req, int msecs)
+bool OrganizerAsynchProcess::waitForRequestFinished(QOrganizerAbstractRequest *req, int msecs)
 {
-    if (req->state() == QOrganizerItemAbstractRequest::FinishedState) {
+    if (req->state() == QOrganizerAbstractRequest::FinishedState) {
         return true;
     }
-    else if (req->state() == QOrganizerItemAbstractRequest::CanceledState
-             || req->state() == req->state() == QOrganizerItemAbstractRequest::InactiveState) {
+    else if (req->state() == QOrganizerAbstractRequest::CanceledState
+             || req->state() == req->state() == QOrganizerAbstractRequest::InactiveState) {
         return false;
     }
 
@@ -159,7 +159,7 @@ bool OrganizerAsynchProcess::waitForRequestFinished(QOrganizerItemAbstractReques
     return waitForRequestFinished(req);
 }
 
-bool OrganizerAsynchProcess::waitForRequestFinished(QOrganizerItemAbstractRequest *req)
+bool OrganizerAsynchProcess::waitForRequestFinished(QOrganizerAbstractRequest *req)
 {
     m_activeRequests.insert(req);
 
@@ -167,7 +167,7 @@ bool OrganizerAsynchProcess::waitForRequestFinished(QOrganizerItemAbstractReques
         yieldCurrentThread();
         // Process events to allow the timeout timers to work
         QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers);
-    } while(m_activeRequests.contains(req) && req->state() == QOrganizerItemAbstractRequest::ActiveState);
+    } while(m_activeRequests.contains(req) && req->state() == QOrganizerAbstractRequest::ActiveState);
 
     m_timeoutMutex.lock();
     if (!m_activeRequests.contains(req)) {
@@ -213,47 +213,47 @@ void OrganizerAsynchProcess::processRequest()
         return;
     }
 
-    QOrganizerItemAbstractRequest *req = m_requestQueue.dequeue();
-    if (req->state() != QOrganizerItemAbstractRequest::ActiveState) {
+    QOrganizerAbstractRequest *req = m_requestQueue.dequeue();
+    if (req->state() != QOrganizerAbstractRequest::ActiveState) {
         m_mainMutex.unlock();
         return;
     }
 
     switch(req->type()) {
-    case QOrganizerItemAbstractRequest::ItemFetchRequest:
+    case QOrganizerAbstractRequest::ItemFetchRequest:
         handleItemFetchRequest(static_cast<QOrganizerItemFetchRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::ItemFetchForExportRequest:
+    case QOrganizerAbstractRequest::ItemFetchForExportRequest:
         handleItemFetchForExportRequest(static_cast<QOrganizerItemFetchForExportRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::ItemInstanceFetchRequest:
+    case QOrganizerAbstractRequest::ItemInstanceFetchRequest:
         handleItemInstanceFetchRequest(static_cast<QOrganizerItemInstanceFetchRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::ItemLocalIdFetchRequest:
+    case QOrganizerAbstractRequest::ItemLocalIdFetchRequest:
         handleLocalIdFetchRequest(static_cast<QOrganizerItemLocalIdFetchRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::ItemRemoveRequest:
+    case QOrganizerAbstractRequest::ItemRemoveRequest:
         handleItemRemoveRequest(static_cast<QOrganizerItemRemoveRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::ItemSaveRequest:
+    case QOrganizerAbstractRequest::ItemSaveRequest:
         handleSaveRequest(static_cast<QOrganizerItemSaveRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest:
+    case QOrganizerAbstractRequest::DetailDefinitionFetchRequest:
         handleDefinitionFetchRequest(static_cast<QOrganizerItemDetailDefinitionFetchRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest:
+    case QOrganizerAbstractRequest::DetailDefinitionRemoveRequest:
         handleDefinitionRemoveRequest(static_cast<QOrganizerItemDetailDefinitionRemoveRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest:
+    case QOrganizerAbstractRequest::DetailDefinitionSaveRequest:
         handleDefinitionSaveRequest(static_cast<QOrganizerItemDetailDefinitionSaveRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::CollectionFetchRequest:
+    case QOrganizerAbstractRequest::CollectionFetchRequest:
         handleCollectionFetchRequest(static_cast<QOrganizerCollectionFetchRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::CollectionRemoveRequest:
+    case QOrganizerAbstractRequest::CollectionRemoveRequest:
         handleCollectionRemoveRequest(static_cast<QOrganizerCollectionRemoveRequest *>(req));
         break;
-    case QOrganizerItemAbstractRequest::CollectionSaveRequest:
+    case QOrganizerAbstractRequest::CollectionSaveRequest:
         handleCollectionSaveRequest(static_cast<QOrganizerCollectionSaveRequest *>(req));
         break;
 
@@ -267,115 +267,115 @@ void OrganizerAsynchProcess::processRequest()
 
 void OrganizerAsynchProcess::handleItemFetchRequest(QOrganizerItemFetchRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
     QList<QOrganizerItem> items = m_engine->items(req->startDate(), req->endDate(), req->filter(), req->sorting(), req->fetchHint(), &err);
-    QOrganizerItemManagerEngine::updateItemFetchRequest(req, items, err, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemFetchRequest(req, items, err, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleItemFetchForExportRequest(QOrganizerItemFetchForExportRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
     QList<QOrganizerItem> items = m_engine->itemsForExport(req->startDate(), req->endDate(), req->filter(), req->sorting(), req->fetchHint(), &err);
-    QOrganizerItemManagerEngine::updateItemFetchForExportRequest(req, items, err, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemFetchForExportRequest(req, items, err, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleItemInstanceFetchRequest(QOrganizerItemInstanceFetchRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
     QList<QOrganizerItem> items = m_engine->itemInstances(req->generator(), req->startDate(), req->endDate(), req->maxOccurrences(), req->fetchHint(), &err);
-    QOrganizerItemManagerEngine::updateItemInstanceFetchRequest(req, items, err, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemInstanceFetchRequest(req, items, err, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleLocalIdFetchRequest(QOrganizerItemLocalIdFetchRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
     QList<QOrganizerItemLocalId> ids = m_engine->itemIds(req->startDate(), req->endDate(), req->filter(), req->sorting(), &err);
-    QOrganizerItemManagerEngine::updateItemLocalIdFetchRequest(req, ids, err, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemLocalIdFetchRequest(req, ids, err, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleItemRemoveRequest(QOrganizerItemRemoveRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
+    QMap<int, QOrganizerManager::Error> errorMap;
     m_engine->removeItems(req->itemIds(), &errorMap, &err);
-    QOrganizerItemManagerEngine::updateItemRemoveRequest(req, err, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemRemoveRequest(req, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleSaveRequest(QOrganizerItemSaveRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
+    QMap<int, QOrganizerManager::Error> errorMap;
     QList<QOrganizerItem> items = req->items();
     m_engine->saveItems(&items, &errorMap, &err);
-    QOrganizerItemManagerEngine::updateItemSaveRequest(req, items, err, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemSaveRequest(req, items, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleDefinitionFetchRequest(QOrganizerItemDetailDefinitionFetchRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
     QMap<QString, QOrganizerItemDetailDefinition> definitions = m_engine->detailDefinitions(req->itemType(), &err);
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QMap<int, QOrganizerManager::Error> errorMap;
     QStringList keys = req->definitionNames();
     int definitionsCount = keys.count();
     for (int i = 0; i < definitionsCount; ++i) {
         QOrganizerItemDetailDefinition definition = m_engine->detailDefinition(keys.at(i), req->itemType(), &err);
         definitions.insert(keys.at(i), definition);
-        if (err != QOrganizerItemManager::NoError)
+        if (err != QOrganizerManager::NoError)
             errorMap.insert(i, err);
     }
-    QOrganizerItemManagerEngine::updateDefinitionFetchRequest(req, definitions, err, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateDefinitionFetchRequest(req, definitions, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleDefinitionRemoveRequest(QOrganizerItemDetailDefinitionRemoveRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
+    QMap<int, QOrganizerManager::Error> errorMap;
     QStringList definitionNames = req->definitionNames();
     int nameCount = definitionNames.count();
     for(int i = 0; i < nameCount; ++i) {
         m_engine->removeDetailDefinition(definitionNames.at(i), req->itemType(), &err);
         errorMap.insert(i, err);
     }
-    QOrganizerItemManagerEngine::updateDefinitionRemoveRequest(req, err, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateDefinitionRemoveRequest(req, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleDefinitionSaveRequest(QOrganizerItemDetailDefinitionSaveRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
+    QMap<int, QOrganizerManager::Error> errorMap;
     QList<QOrganizerItemDetailDefinition> definitions = req->definitions();
     int definitionCount = definitions.count();
     for (int i = 0; i < definitionCount; ++i) {
         m_engine->saveDetailDefinition(definitions.at(i), req->itemType(), &err);
         errorMap.insert(i, err);
     }
-    QOrganizerItemManagerEngine::updateDefinitionSaveRequest(req, definitions, err, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateDefinitionSaveRequest(req, definitions, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleCollectionFetchRequest(QOrganizerCollectionFetchRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
     QList<QOrganizerCollection> collections = m_engine->collections(&err);
-    QOrganizerItemManagerEngine::updateCollectionFetchRequest(req, collections, err, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateCollectionFetchRequest(req, collections, err, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleCollectionRemoveRequest(QOrganizerCollectionRemoveRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
+    QMap<int, QOrganizerManager::Error> errorMap;
     int i = 0;
     foreach (QOrganizerCollectionLocalId id, req->collectionIds()) {
         m_engine->removeCollection(id, &err);
         errorMap.insert(i, err);
         i++;
     }
-    QOrganizerItemManagerEngine::updateCollectionRemoveRequest(req, err, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateCollectionRemoveRequest(req, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void OrganizerAsynchProcess::handleCollectionSaveRequest(QOrganizerCollectionSaveRequest *req)
 {
-    QOrganizerItemManager::Error err = QOrganizerItemManager::NoError;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error err = QOrganizerManager::NoError;
+    QMap<int, QOrganizerManager::Error> errorMap;
     QList<QOrganizerCollection> collections = req->collections();
     QList<QOrganizerCollection> retn;
     int collectionsCount = collections.count();
@@ -385,5 +385,5 @@ void OrganizerAsynchProcess::handleCollectionSaveRequest(QOrganizerCollectionSav
         retn << collection;
         errorMap.insert(i, err);
     }
-    QOrganizerItemManagerEngine::updateCollectionSaveRequest(req, retn, err, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateCollectionSaveRequest(req, retn, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
diff --git a/plugins/organizer/maemo5/qorganizerasynchprocess.h b/plugins/organizer/maemo5/qorganizerasynchprocess.h
index 695bc98ae4..17aca3a418 100644
--- a/plugins/organizer/maemo5/qorganizerasynchprocess.h
+++ b/plugins/organizer/maemo5/qorganizerasynchprocess.h
@@ -69,10 +69,10 @@ class OrganizerRequestTimeoutTimer : public QObject
     Q_OBJECT
 
 public:
-    OrganizerRequestTimeoutTimer(QOrganizerItemAbstractRequest *req, int msecs);
+    OrganizerRequestTimeoutTimer(QOrganizerAbstractRequest *req, int msecs);
     ~OrganizerRequestTimeoutTimer();
 
-    QOrganizerItemAbstractRequest *request() const;
+    QOrganizerAbstractRequest *request() const;
 
 private Q_SLOTS:
     void internalTimeout();
@@ -82,7 +82,7 @@ Q_SIGNALS:
 
 private:
     QTimer* m_timeoutTimer;
-    QOrganizerItemAbstractRequest *m_req;
+    QOrganizerAbstractRequest *m_req;
 };
 
 
@@ -94,17 +94,17 @@ public:
     OrganizerAsynchProcess(QOrganizerItemMaemo5Engine *engine);
     ~OrganizerAsynchProcess();
 
-    void requestDestroyed(QOrganizerItemAbstractRequest *req);
-    bool addRequest(QOrganizerItemAbstractRequest *req);
-    bool cancelRequest(QOrganizerItemAbstractRequest *req);
-    bool waitForRequestFinished(QOrganizerItemAbstractRequest *req, int msecs);
+    void requestDestroyed(QOrganizerAbstractRequest *req);
+    bool addRequest(QOrganizerAbstractRequest *req);
+    bool cancelRequest(QOrganizerAbstractRequest *req);
+    bool waitForRequestFinished(QOrganizerAbstractRequest *req, int msecs);
 
 protected:
     void processRequest();
     void run();
 
 private:
-    bool waitForRequestFinished(QOrganizerItemAbstractRequest *req);
+    bool waitForRequestFinished(QOrganizerAbstractRequest *req);
 
     void handleItemFetchRequest(QOrganizerItemFetchRequest *req);
     void handleItemFetchForExportRequest(QOrganizerItemFetchForExportRequest *req);
@@ -124,9 +124,9 @@ private Q_SLOTS:
 
 private:
     QOrganizerItemMaemo5Engine* m_engine;
-    QQueue<QOrganizerItemAbstractRequest *> m_requestQueue;
+    QQueue<QOrganizerAbstractRequest *> m_requestQueue;
     QList<OrganizerRequestTimeoutTimer *> m_timers;
-    QSet<QOrganizerItemAbstractRequest *> m_activeRequests;
+    QSet<QOrganizerAbstractRequest *> m_activeRequests;
     QMutex m_mainMutex;
     QMutex m_timeoutMutex;
     bool m_quitNow;
diff --git a/plugins/organizer/maemo5/qorganizeritemtransform.cpp b/plugins/organizer/maemo5/qorganizeritemtransform.cpp
index 549b75e5e6..3a48c3a745 100644
--- a/plugins/organizer/maemo5/qorganizeritemtransform.cpp
+++ b/plugins/organizer/maemo5/qorganizeritemtransform.cpp
@@ -381,9 +381,9 @@ void OrganizerItemTransform::fillInCommonCComponentDetails(QOrganizerItem *item,
     }
 }
 
-CComponent* OrganizerItemTransform::createCComponent(CCalendar *cal, const QOrganizerItem *item, QOrganizerItemManager::Error *error)
+CComponent* OrganizerItemTransform::createCComponent(CCalendar *cal, const QOrganizerItem *item, QOrganizerManager::Error *error)
 {
-    *error = QOrganizerItemManager::InvalidItemTypeError;
+    *error = QOrganizerManager::InvalidItemTypeError;
 
     QOrganizerItemLocalId itemId = item->localId();
 
@@ -400,7 +400,7 @@ CComponent* OrganizerItemTransform::createCComponent(CCalendar *cal, const QOrga
     if (item->type() == QOrganizerItemType::TypeEvent
         || item->type() == QOrganizerItemType::TypeEventOccurrence) {
 
-        *error = QOrganizerItemManager::NoError;
+        *error = QOrganizerManager::NoError;
 
         CEvent *cevent = cal->getEvent(itemIdStr.toStdString(), calError);
         if (!cevent) {
@@ -453,7 +453,7 @@ CComponent* OrganizerItemTransform::createCComponent(CCalendar *cal, const QOrga
     else if (item->type() == QOrganizerItemType::TypeTodo
             || item->type() == QOrganizerItemType::TypeTodoOccurrence) {
 
-        *error = QOrganizerItemManager::NoError;
+        *error = QOrganizerManager::NoError;
 
         CTodo *ctodo = cal->getTodo(itemIdStr.toStdString(), calError);
         if (!ctodo) {
@@ -507,7 +507,7 @@ CComponent* OrganizerItemTransform::createCComponent(CCalendar *cal, const QOrga
         retn = ctodo;
     }
     else if (item->type() == QOrganizerItemType::TypeJournal) {
-        *error = QOrganizerItemManager::NoError;
+        *error = QOrganizerManager::NoError;
         CJournal *cjournal = cal->getJournal(itemIdStr.toStdString(), calError);
         if (!cjournal) {
             // Event did not existed in calendar, create a new CEvent with an empty ID
@@ -586,9 +586,9 @@ CComponent* OrganizerItemTransform::createCComponent(CCalendar *cal, const QOrga
     return retn;
 }
 
-CRecurrence* OrganizerItemTransform::createCRecurrence(const QOrganizerItem* item, QOrganizerItemManager::Error *error)
+CRecurrence* OrganizerItemTransform::createCRecurrence(const QOrganizerItem* item, QOrganizerManager::Error *error)
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
 
     // Only the event and todo types contain recurrence information
     if (item->type() == QOrganizerItemType::TypeEvent) {
@@ -596,13 +596,13 @@ CRecurrence* OrganizerItemTransform::createCRecurrence(const QOrganizerItem* ite
         const QOrganizerEvent *event = static_cast<const QOrganizerEvent *>(item);
 
         // Add recurrence rules
-        QSet<QOrganizerItemRecurrenceRule> recurrenceRules = event->recurrenceRules();
-        foreach (QOrganizerItemRecurrenceRule rule, recurrenceRules)
-            m_recTransformer.addQOrganizerItemRecurrenceRule(rule);
+        QSet<QOrganizerRecurrenceRule> recurrenceRules = event->recurrenceRules();
+        foreach (QOrganizerRecurrenceRule rule, recurrenceRules)
+            m_recTransformer.addQOrganizerRecurrenceRule(rule);
 
         // Add exception rules
-        QSet<QOrganizerItemRecurrenceRule> exceptionRules = event->exceptionRules();
-        foreach (QOrganizerItemRecurrenceRule rule, exceptionRules)
+        QSet<QOrganizerRecurrenceRule> exceptionRules = event->exceptionRules();
+        foreach (QOrganizerRecurrenceRule rule, exceptionRules)
             m_recTransformer.addQOrganizerItemExceptionRule(rule);
 
         // Add recurrence dates
@@ -613,7 +613,7 @@ CRecurrence* OrganizerItemTransform::createCRecurrence(const QOrganizerItem* ite
             // recurrence rule, no date must be set 6 years or more after
             // the current event's date. Otherwise setting a correct rule would be impossible.
             if (recDate >= dateLimit)
-                *error = QOrganizerItemManager::NotSupportedError;
+                *error = QOrganizerManager::NotSupportedError;
 
             // Still set the date, let the caller decise what to do
             m_recTransformer.addQOrganizerItemRecurrenceDate(recDate);
@@ -626,7 +626,7 @@ CRecurrence* OrganizerItemTransform::createCRecurrence(const QOrganizerItem* ite
             // exception rule, no date must be set 6 years or more after
             // the current event's date. Otherwise setting a correct rule would be impossible.
             if (exceptionDate >= dateLimit)
-                *error = QOrganizerItemManager::NotSupportedError;
+                *error = QOrganizerManager::NotSupportedError;
 
             // Still set the date, let the caller decise what to do
             m_recTransformer.addQOrganizerItemExceptionDate(exceptionDate);
@@ -652,13 +652,13 @@ QPair<qint32, qint32> OrganizerItemTransform::modifyAlarmEvent(CCalendar *cal, Q
             QDateTime reminderDateTime;
             QDateTime startDateTime;
             if (item->type() == QOrganizerItemType::TypeEvent || item->type() == QOrganizerItemType::TypeEventOccurrence) {
-                startDateTime = item->detail<QOrganizerEventTimeRange>().startDateTime();
+                startDateTime = item->detail<QOrganizerEventTime>().startDateTime();
             }
             else if (item->type() == QOrganizerItemType::TypeTodo || item->type() == QOrganizerItemType::TypeTodoOccurrence) {
-                startDateTime = item->detail<QOrganizerTodoTimeRange>().startDateTime();
+                startDateTime = item->detail<QOrganizerTodoTime>().startDateTime();
             }
             else if (item->type() == QOrganizerItemType::TypeJournal) {
-                startDateTime = item->detail<QOrganizerJournalTimeRange>().entryDateTime();
+                startDateTime = item->detail<QOrganizerJournalTime>().entryDateTime();
             }
 
             // XXX Shouldn't this check to see if the reminder is valid - if invalid, delete the alarm event?
@@ -683,11 +683,11 @@ QPair<qint32, qint32> OrganizerItemTransform::modifyAlarmEvent(CCalendar *cal, Q
     return QPair<qint32, qint32>(oldCookie, newCookie);
 }
 
-QOrganizerItemManager::Error OrganizerItemTransform::calErrorToManagerError(int calError) const
+QOrganizerManager::Error OrganizerItemTransform::calErrorToManagerError(int calError) const
 {
     switch(calError) {
         case CALENDAR_OPERATION_SUCCESSFUL:
-            return QOrganizerItemManager::NoError;
+            return QOrganizerManager::NoError;
 
         case CALENDAR_SYSTEM_ERROR:
         case CALENDAR_DATABASE_ERROR:
@@ -702,43 +702,43 @@ QOrganizerItemManager::Error OrganizerItemTransform::calErrorToManagerError(int
         case CALENDAR_INVALID_ICSFILE:
         case CALENDAR_SCHEMA_CHANGED:
         case CALENDAR_IMPORT_INCOMPLETE:
-            return QOrganizerItemManager::UnspecifiedError;
+            return QOrganizerManager::UnspecifiedError;
 
         case CALENDAR_MEMORY_ERROR:
-            return QOrganizerItemManager::OutOfMemoryError;
+            return QOrganizerManager::OutOfMemoryError;
 
         case CALENDAR_FILE_ERROR:
         case CALENDAR_DOESNOT_EXISTS:
         case CALENDAR_NONE_INDB:
         case NO_DUPLICATE_ITEM:
         case CALENDAR_FETCH_NOITEMS:
-            return QOrganizerItemManager::DoesNotExistError;
+            return QOrganizerManager::DoesNotExistError;
 
         case CALENDAR_DISK_FULL:
         case CALENDAR_DB_FULL:
-            return QOrganizerItemManager::LimitReachedError;
+            return QOrganizerManager::LimitReachedError;
 
         case CALENDAR_INVALID_ARG_ERROR:
-            return QOrganizerItemManager::BadArgumentError;
+            return QOrganizerManager::BadArgumentError;
 
         case CALENDAR_ALREADY_EXISTS:
         case CALENDAR_ENTRY_DUPLICATED:
-            return QOrganizerItemManager::AlreadyExistsError;
+            return QOrganizerManager::AlreadyExistsError;
 
         case CALENDAR_CANNOT_BE_DELETED:
         case EXT_ITEM_RETAINED:
         case LOCAL_ITEM_RETAINED:
-            return QOrganizerItemManager::PermissionsError;
+            return QOrganizerManager::PermissionsError;
 
         case CALENDAR_DB_LOCKED:
-            return QOrganizerItemManager::LockedError;
+            return QOrganizerManager::LockedError;
 
         case CALENDAR_ICS_COMPONENT_INVALID:
         case CALENDAR_BATCH_ADD_INVALID:
-            return QOrganizerItemManager::InvalidDetailError;
+            return QOrganizerManager::InvalidDetailError;
 
         default:
-            return QOrganizerItemManager::UnspecifiedError;
+            return QOrganizerManager::UnspecifiedError;
     }
 }
 
diff --git a/plugins/organizer/maemo5/qorganizeritemtransform.h b/plugins/organizer/maemo5/qorganizeritemtransform.h
index 755ece0b8d..163b1ae28d 100644
--- a/plugins/organizer/maemo5/qorganizeritemtransform.h
+++ b/plugins/organizer/maemo5/qorganizeritemtransform.h
@@ -85,16 +85,16 @@ public: // transform functions
 
     // conversions between CComponent and QOrganizerItem (common details for all items)
     void fillInCommonCComponentDetails(QOrganizerItem *item, CComponent *component, bool setId = true);
-    CComponent* createCComponent(CCalendar *cal, const QOrganizerItem *item, QOrganizerItemManager::Error *error);
+    CComponent* createCComponent(CCalendar *cal, const QOrganizerItem *item, QOrganizerManager::Error *error);
 
     // recurrence information conversions
-    CRecurrence* createCRecurrence(const QOrganizerItem *item, QOrganizerItemManager::Error *error);
+    CRecurrence* createCRecurrence(const QOrganizerItem *item, QOrganizerManager::Error *error);
 
     // alarm setting
     QPair<qint32, qint32> modifyAlarmEvent(CCalendar *cal, QOrganizerItem *item, CComponent *component);
 
     // error code conversion
-    QOrganizerItemManager::Error calErrorToManagerError(int calError) const;
+    QOrganizerManager::Error calErrorToManagerError(int calError) const;
 
     // calendar (collection) metadata conversions
     QString fromCalendarColour(CalendarColour calendarColour);
diff --git a/plugins/organizer/maemo5/qorganizermaemo5.cpp b/plugins/organizer/maemo5/qorganizermaemo5.cpp
index 080f541d7e..7d27ba7a0b 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5.cpp
+++ b/plugins/organizer/maemo5/qorganizermaemo5.cpp
@@ -226,7 +226,7 @@ uint QOrganizerCollectionMaemo5EngineLocalId::hash() const
     return QT_PREPEND_NAMESPACE(qHash)(m_localCollectionId);
 }
 
-QOrganizerItemManagerEngine* QOrganizerItemMaemo5Factory::engine(const QMap<QString, QString> &parameters, QOrganizerItemManager::Error *error)
+QOrganizerManagerEngine* QOrganizerItemMaemo5Factory::engine(const QMap<QString, QString> &parameters, QOrganizerManager::Error *error)
 {
     Q_UNUSED(parameters);
     Q_UNUSED(error);
@@ -305,98 +305,98 @@ int QOrganizerItemMaemo5Engine::managerVersion() const
     return 1;
 }
 
-QList<QOrganizerItem> QOrganizerItemMaemo5Engine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemMaemo5Engine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(fetchHint);
     QMutexLocker locker(&m_operationMutex);
     return internalItemInstances(generator, periodStart, periodEnd, maxCount, error);
 }
 
-QList<QOrganizerItemLocalId> QOrganizerItemMaemo5Engine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerItemManager::Error *error) const
+QList<QOrganizerItemLocalId> QOrganizerItemMaemo5Engine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerManager::Error *error) const
 {
     QMutexLocker locker(&m_operationMutex);
     return internalItemIds(startDate, endDate, filter, sortOrders, error);
 }
 
-QList<QOrganizerItem> QOrganizerItemMaemo5Engine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const
+QList<QOrganizerItem> QOrganizerItemMaemo5Engine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const
 {
     QMutexLocker locker(&m_operationMutex);
     return internalItems(startDate, endDate, filter, sortOrders, fetchHint, false, error);
 }
 
-QList<QOrganizerItem> QOrganizerItemMaemo5Engine::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const
+QList<QOrganizerItem> QOrganizerItemMaemo5Engine::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const
 {
     QMutexLocker locker(&m_operationMutex);
     return internalItems(startDate, endDate, filter, sortOrders, fetchHint, true, error);
 }
 
-QOrganizerItem QOrganizerItemMaemo5Engine::item(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const
+QOrganizerItem QOrganizerItemMaemo5Engine::item(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const
 {
     QMutexLocker locker(&m_operationMutex);
     return internalItem(itemId, fetchHint, error);
 }
 
-bool QOrganizerItemMaemo5Engine::saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo5Engine::saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     QMutexLocker locker(&m_operationMutex);
     return internalSaveItems(items, errorMap, error);
 }
 
-bool QOrganizerItemMaemo5Engine::removeItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerItemManager::Error> *errorMap, QOrganizerItemManager::Error *error)
+bool QOrganizerItemMaemo5Engine::removeItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error)
 {
     QMutexLocker locker(&m_operationMutex);
     return internalRemoveItems(itemIds, errorMap, error);
 }
 
-QOrganizerCollection QOrganizerItemMaemo5Engine::defaultCollection(QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemMaemo5Engine::defaultCollection(QOrganizerManager::Error* error) const
 {
     QMutexLocker locker(&m_operationMutex);
     return internalDefaultCollection(error);
 }
 
-QOrganizerCollection QOrganizerItemMaemo5Engine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemMaemo5Engine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const
 {
     QMutexLocker locker(&m_operationMutex);
     return internalCollection(collectionId, error);
 }
 
-QList<QOrganizerCollection> QOrganizerItemMaemo5Engine::collections(QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollection> QOrganizerItemMaemo5Engine::collections(QOrganizerManager::Error* error) const
 {
     QMutexLocker locker(&m_operationMutex);
     return internalCollections(error);
 }
 
-bool QOrganizerItemMaemo5Engine::saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo5Engine::saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error)
 {
     QMutexLocker locker(&m_operationMutex);
     return internalSaveCollection(collection, error);
 }
 
-bool QOrganizerItemMaemo5Engine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo5Engine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error)
 {
     QMutexLocker locker(&m_operationMutex);
     return internalRemoveCollection(collectionId, error);
 }
 
-QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QOrganizerItem &generator, const QDateTime &periodStart, const QDateTime &periodEnd, int maxCount, QOrganizerItemManager::Error *error) const
+QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QOrganizerItem &generator, const QDateTime &periodStart, const QDateTime &periodEnd, int maxCount, QOrganizerManager::Error *error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     int calError = CALENDAR_OPERATION_SUCCESSFUL;
     QList<QOrganizerItem> retn;
 
     if (periodStart > periodEnd)
     {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return retn;
     }
 
     // get the generator's calendar (or the default calendar, if the generator collection id is not set)
     QOrganizerCollectionLocalId collectionLocalId = generator.collectionId().localId();
     CCalendar *cal = getCalendar(collectionLocalId, error);
-    if (*error != QOrganizerItemManager::NoError)
+    if (*error != QOrganizerManager::NoError)
         return retn;
     if (!cal) {
-        *error = QOrganizerItemManager::UnspecifiedError;
+        *error = QOrganizerManager::UnspecifiedError;
         return retn;
     }
 
@@ -406,7 +406,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QO
     {
         CEvent *cevent = d->m_dbAccess->getEvent(cal, nativeId, calError);
         *error = d->m_itemTransformer.calErrorToManagerError(calError);
-        if (cevent && *error == QOrganizerItemManager::NoError)
+        if (cevent && *error == QOrganizerManager::NoError)
         {
             // Get event instance times
             std::vector< std::time_t > eventInstanceDates;
@@ -448,7 +448,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QO
             QString eventType = QOrganizerItemType::TypeEvent;
             std::vector<CEvent*> occurrenceCandidates = d->m_dbAccess->getEvents(cal->getCalendarId(), cevent->getGUid(), calError);
             *error = d->m_itemTransformer.calErrorToManagerError(calError);
-            if (*error == QOrganizerItemManager::NoError) {
+            if (*error == QOrganizerManager::NoError) {
                 std::vector<CEvent*>::iterator occCand;
                 for (occCand = occurrenceCandidates.begin(); occCand != occurrenceCandidates.end(); ++occCand) {
                     CEvent* coccurrenceCandidate = *occCand;
@@ -466,7 +466,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QO
                         // parent resolving must be verified to work.
                         if (instanceStartDate >= periodStart && instanceStartDate <= periodEnd) {
                             if (isOccurrence(cal, coccurrenceCandidate, eventType, error)) {
-                                if (*error == QOrganizerItemManager::NoError) {
+                                if (*error == QOrganizerManager::NoError) {
                                     QOrganizerEventOccurrence eventOcc =
                                             d->m_itemTransformer.convertCEventToQEventOccurrence(coccurrenceCandidate, instanceStartDate, instanceEndDate, parentLocalId);
                                     d->m_itemTransformer.fillInCommonCComponentDetails(&eventOcc, coccurrenceCandidate);
@@ -495,7 +495,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QO
     {
         CTodo* ctodo = d->m_dbAccess->getTodo(cal, nativeId, calError);
         *error = d->m_itemTransformer.calErrorToManagerError(calError);
-        if (ctodo && *error == QOrganizerItemManager::NoError)
+        if (ctodo && *error == QOrganizerManager::NoError)
         {
             // In Maemo5, only one occurrence per todo. It has the same id as the parent
             QDateTime instanceStartDate = QDateTime::fromTime_t(ctodo->getDateStart());
@@ -517,7 +517,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QO
     else
     {
         // Other item types can't have occurrences
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
     }
 
     cleanupCal(cal);
@@ -525,7 +525,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItemInstances(const QO
     return retn;
 }
 
-QList<QOrganizerItemLocalId> QOrganizerItemMaemo5Engine::internalItemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerItemManager::Error *error) const
+QList<QOrganizerItemLocalId> QOrganizerItemMaemo5Engine::internalItemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerManager::Error *error) const
 {
     QList<QOrganizerItem> clist = internalItems(startDate, endDate, filter, sortOrders, fetchMinimalData(), true, error);
 
@@ -537,9 +537,9 @@ QList<QOrganizerItemLocalId> QOrganizerItemMaemo5Engine::internalItemIds(const Q
     return ids;
 }
 
-QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, bool forExport, QOrganizerItemManager::Error *error) const
+QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, bool forExport, QOrganizerManager::Error *error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     int calError = CALENDAR_OPERATION_SUCCESSFUL;
     QList<QOrganizerItemLocalId> localIds;
 
@@ -549,7 +549,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime&
     if (collectionIds.empty()) {
         // use all calendars if no collection filter is specified
         QSet<QOrganizerCollectionLocalId> localIds = internalCollectionIds(error).toSet();
-        if (*error != QOrganizerItemManager::NoError)
+        if (*error != QOrganizerManager::NoError)
             return QList<QOrganizerItem>();
 
         foreach(QOrganizerCollectionLocalId localId, localIds) {
@@ -561,10 +561,10 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime&
     }
 
     foreach (QOrganizerCollectionId collectionId, collectionIds) {
-        CCalendar *cal = d->m_mcInstance->getCalendarById(static_cast<int>(static_cast<QOrganizerCollectionMaemo5EngineLocalId *>(QOrganizerItemManagerEngine::engineLocalCollectionId(collectionId.localId()))->m_localCollectionId), calError);
+        CCalendar *cal = d->m_mcInstance->getCalendarById(static_cast<int>(static_cast<QOrganizerCollectionMaemo5EngineLocalId *>(QOrganizerManagerEngine::engineLocalCollectionId(collectionId.localId()))->m_localCollectionId), calError);
 
         *error = d->m_itemTransformer.calErrorToManagerError(calError);
-        if (*error != QOrganizerItemManager::NoError)
+        if (*error != QOrganizerManager::NoError)
             return QList<QOrganizerItem>();
 
         std::vector<std::string>::const_iterator id;
@@ -574,7 +574,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime&
         d->m_dbAccess->getIdList(cal, E_EVENT, calError, eventIds);
         //std::vector<std::string> eventIds = cal->getIdList(E_EVENT, calError);
         *error = d->m_itemTransformer.calErrorToManagerError(calError);
-        if (*error != QOrganizerItemManager::NoError)
+        if (*error != QOrganizerManager::NoError)
             return QList<QOrganizerItem>();
         for (id = eventIds.begin(); id != eventIds.end(); ++id)
             localIds << QOrganizerItemLocalId(new QOrganizerItemMaemo5EngineLocalId(QString::fromStdString(*id).toUInt()));
@@ -584,7 +584,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime&
         d->m_dbAccess->getIdList(cal, E_TODO, calError, todoIds);
         //std::vector<std::string> todoIds = cal->getIdList(E_TODO, calError);
         *error = d->m_itemTransformer.calErrorToManagerError(calError);
-        if (*error != QOrganizerItemManager::NoError)
+        if (*error != QOrganizerManager::NoError)
             return QList<QOrganizerItem>();
         for (id = todoIds.begin(); id != todoIds.end(); ++id)
             localIds << QOrganizerItemLocalId(new QOrganizerItemMaemo5EngineLocalId(QString::fromStdString(*id).toUInt()));
@@ -594,7 +594,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime&
         d->m_dbAccess->getIdList(cal, E_JOURNAL, calError, journalIds);
         //std::vector<std::string> journalIds = cal->getIdList(E_JOURNAL, calError);
         *error = d->m_itemTransformer.calErrorToManagerError(calError);
-        if (*error != QOrganizerItemManager::NoError)
+        if (*error != QOrganizerManager::NoError)
             return QList<QOrganizerItem>();
         for (id = journalIds.begin(); id != journalIds.end(); ++id)
             localIds << QOrganizerItemLocalId(new QOrganizerItemMaemo5EngineLocalId(QString::fromStdString(*id).toUInt()));
@@ -607,12 +607,12 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime&
     QList<QOrganizerItem> filteredAndSorted;
     foreach(const QOrganizerItemLocalId& id, localIds) {
         QOrganizerItem item = internalFetchItem(id, fetchHint, error, true);
-        if (*error == QOrganizerItemManager::NoError) {
+        if (*error == QOrganizerManager::NoError) {
             if (item.type() == QOrganizerItemType::TypeEvent) {
                 internalAddOccurances(&filteredAndSorted, item, startDate, endDate, filter, sortOrders, forExport, error);
             } else
-                if (QOrganizerItemManagerEngine::testFilter(filter, item) && QOrganizerItemManagerEngine::isItemBetweenDates(item, startDate, endDate)) {
-                    QOrganizerItemManagerEngine::addSorted(&filteredAndSorted, item, sortOrders);
+                if (QOrganizerManagerEngine::testFilter(filter, item) && QOrganizerManagerEngine::isItemBetweenDates(item, startDate, endDate)) {
+                    QOrganizerManagerEngine::addSorted(&filteredAndSorted, item, sortOrders);
                 }
         } else
             return QList<QOrganizerItem>();
@@ -621,14 +621,14 @@ QList<QOrganizerItem> QOrganizerItemMaemo5Engine::internalItems(const QDateTime&
     return filteredAndSorted;
 }
 
-void QOrganizerItemMaemo5Engine::internalAddOccurances(QList<QOrganizerItem>* sorted, QOrganizerItem& item, const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, bool forExport, QOrganizerItemManager::Error *error) const
+void QOrganizerItemMaemo5Engine::internalAddOccurances(QList<QOrganizerItem>* sorted, QOrganizerItem& item, const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, bool forExport, QOrganizerManager::Error *error) const
 {
     CCalendar *cal = d->m_mcInstance->getDefaultCalendar();
     std::string nativeId = QString::number(readItemLocalId(item.localId())).toStdString();
     int calError = CALENDAR_OPERATION_SUCCESSFUL;
     CEvent *cevent = d->m_dbAccess->getEvent(cal, nativeId, calError);
     *error = d->m_itemTransformer.calErrorToManagerError(calError);
-    if (cevent && *error == QOrganizerItemManager::NoError)
+    if (cevent && *error == QOrganizerManager::NoError)
     {
         if (containsRecurrenceInformation(cevent)) {
             // Get event instance times
@@ -642,8 +642,8 @@ void QOrganizerItemMaemo5Engine::internalAddOccurances(QList<QOrganizerItem>* so
 
             if (dontGenerateOccurrences || eventInstanceDates.size() > 0) {
                 if (forExport) {
-                    if (QOrganizerItemManagerEngine::testFilter(filter, item)) {
-                        QOrganizerItemManagerEngine::addSorted(sorted, item, sortOrders);
+                    if (QOrganizerManagerEngine::testFilter(filter, item)) {
+                        QOrganizerManagerEngine::addSorted(sorted, item, sortOrders);
                     }
                 } else {
                     time_t generatorDuration = cevent->getDateEnd() - cevent->getDateStart();
@@ -661,31 +661,31 @@ void QOrganizerItemMaemo5Engine::internalAddOccurances(QList<QOrganizerItem>* so
                         // Set the collection id
                         eventOcc.setCollectionId(item.collectionId());
 
-                        if (QOrganizerItemManagerEngine::testFilter(filter, eventOcc) && QOrganizerItemManagerEngine::isItemBetweenDates(eventOcc, startDate, endDate))
-                            QOrganizerItemManagerEngine::addSorted(sorted, eventOcc, sortOrders);
+                        if (QOrganizerManagerEngine::testFilter(filter, eventOcc) && QOrganizerManagerEngine::isItemBetweenDates(eventOcc, startDate, endDate))
+                            QOrganizerManagerEngine::addSorted(sorted, eventOcc, sortOrders);
                     }
                 }
             }
         } else {
-            if (QOrganizerItemManagerEngine::testFilter(filter, item) && QOrganizerItemManagerEngine::isItemBetweenDates(item, startDate, endDate))
-                QOrganizerItemManagerEngine::addSorted(sorted, item, sortOrders);
+            if (QOrganizerManagerEngine::testFilter(filter, item) && QOrganizerManagerEngine::isItemBetweenDates(item, startDate, endDate))
+                QOrganizerManagerEngine::addSorted(sorted, item, sortOrders);
         }
     }
 }
 
-QOrganizerItem QOrganizerItemMaemo5Engine::internalItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const
+QOrganizerItem QOrganizerItemMaemo5Engine::internalItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const
 {
     return internalFetchItem(itemId, fetchHint, error, true);
 }
 
-bool QOrganizerItemMaemo5Engine::internalSaveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo5Engine::internalSaveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     if (!items || items->isEmpty()) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QOrganizerCollectionId completeCollectionId;
     completeCollectionId.setManagerUri(managerUri());
     // we set the local id of the collection separately for each item.
@@ -693,30 +693,30 @@ bool QOrganizerItemMaemo5Engine::internalSaveItems(QList<QOrganizerItem>* items,
     bool success = true;
     QOrganizerItemChangeSet cs;
 
-    QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error tempError = QOrganizerManager::NoError;
     for (int i = 0; i < items->size(); ++i) {
         QOrganizerItem curr = items->at(i);
         QOrganizerCollectionLocalId collectionId = curr.collectionLocalId();
         CCalendar *cal = getCalendar(collectionId, &tempError);
-        if (tempError != QOrganizerItemManager::NoError) {
+        if (tempError != QOrganizerManager::NoError) {
             // unable to get the calendar to save this item in.
             if (errorMap) {
-                errorMap->insert(i, QOrganizerItemManager::InvalidCollectionError);
+                errorMap->insert(i, QOrganizerManager::InvalidCollectionError);
             }
             *error = tempError;
         }
         completeCollectionId.setLocalId(collectionId);
 
-        tempError = QOrganizerItemManager::NoError;
+        tempError = QOrganizerManager::NoError;
         int calError = doSaveItem(cal, &curr, cs, &tempError);
 
-        if (calError != CALENDAR_OPERATION_SUCCESSFUL || tempError != QOrganizerItemManager::NoError) {
+        if (calError != CALENDAR_OPERATION_SUCCESSFUL || tempError != QOrganizerManager::NoError) {
             success = false;
             curr.setId(QOrganizerItemId()); // clear IDs
             curr.setCollectionId(QOrganizerCollectionId());
             if (errorMap) {
-                if (tempError == QOrganizerItemManager::NoError)
-                    tempError = QOrganizerItemManager::UnspecifiedError;
+                if (tempError == QOrganizerManager::NoError)
+                    tempError = QOrganizerManager::UnspecifiedError;
                 errorMap->insert(i, tempError);
                 *error = tempError;
             }
@@ -735,9 +735,9 @@ bool QOrganizerItemMaemo5Engine::internalSaveItems(QList<QOrganizerItem>* items,
     return success;
 }
 
-bool QOrganizerItemMaemo5Engine::internalRemoveItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerItemManager::Error> *errorMap, QOrganizerItemManager::Error *error)
+bool QOrganizerItemMaemo5Engine::internalRemoveItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error)
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     CCalendar* cal = d->m_mcInstance->getDefaultCalendar();
     bool success = true;
     QOrganizerItemChangeSet cs;
@@ -748,7 +748,7 @@ bool QOrganizerItemMaemo5Engine::internalRemoveItems(const QList<QOrganizerItemL
         QOrganizerItemLocalId currId = idsToDelete.at(i);
 
         QOrganizerItem currItem = internalFetchItem(currId, fetchMinimalData(), error, false);
-        if (*error == QOrganizerItemManager::NoError) {
+        if (*error == QOrganizerManager::NoError) {
             // Item exists
             QString itemId = QString::number(readItemLocalId(currItem.localId()));
             int calError = CALENDAR_OPERATION_SUCCESSFUL;
@@ -757,7 +757,7 @@ bool QOrganizerItemMaemo5Engine::internalRemoveItems(const QList<QOrganizerItemL
                 CEvent* cevent = d->m_dbAccess->getEvent(cal, itemId.toStdString(), calError);
                 if (calError == CALENDAR_OPERATION_SUCCESSFUL) {
                     bool parentItem = isParent(cal, cevent, QOrganizerItemType::TypeEvent, error);
-                    if (parentItem && *error == QOrganizerItemManager::NoError) {
+                    if (parentItem && *error == QOrganizerManager::NoError) {
                         std::vector<CEvent*> eventsWithGuid = d->m_dbAccess->getEvents(cal->getCalendarId(), cevent->getGUid(), calError);
                         *error = d->m_itemTransformer.calErrorToManagerError(calError);
                         if (calError == CALENDAR_OPERATION_SUCCESSFUL) {
@@ -811,17 +811,17 @@ bool QOrganizerItemMaemo5Engine::internalRemoveItems(const QList<QOrganizerItemL
     return success;
 }
 
-QOrganizerCollection QOrganizerItemMaemo5Engine::internalDefaultCollection(QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemMaemo5Engine::internalDefaultCollection(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     CCalendar *cal = d->m_mcInstance->getDefaultCalendar(); // TODO do we need to release this cal ptr?
     QOrganizerCollectionLocalId defaultCollectionId = makeCollectionLocalId(cal->getCalendarId());
     return internalCollection(defaultCollectionId, error);
 }
 
-QOrganizerCollection QOrganizerItemMaemo5Engine::internalCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemMaemo5Engine::internalCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QList<QOrganizerCollection> allCollections = internalCollections(error);
     foreach (const QOrganizerCollection& collection, allCollections) {
         if (collection.localId() == collectionId) {
@@ -829,17 +829,17 @@ QOrganizerCollection QOrganizerItemMaemo5Engine::internalCollection(const QOrgan
         }
     }
 
-    *error = QOrganizerItemManager::DoesNotExistError;
+    *error = QOrganizerManager::DoesNotExistError;
     return QOrganizerCollection();
 }
 
-QList<QOrganizerCollectionLocalId> QOrganizerItemMaemo5Engine::internalCollectionIds(QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollectionLocalId> QOrganizerItemMaemo5Engine::internalCollectionIds(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QList<QOrganizerCollectionLocalId> retn;
 
     // Append the default calendar id
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     CCalendar *cal = d->m_mcInstance->getDefaultCalendar(); // TODO do we need to release this cal ptr?
     QOrganizerCollectionLocalId defaultCollectionId = makeCollectionLocalId(cal->getCalendarId());
     retn << defaultCollectionId;
@@ -859,9 +859,9 @@ QList<QOrganizerCollectionLocalId> QOrganizerItemMaemo5Engine::internalCollectio
     return retn;
 }
 
-QList<QOrganizerCollection> QOrganizerItemMaemo5Engine::internalCollections(QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollection> QOrganizerItemMaemo5Engine::internalCollections(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QList<QOrganizerCollection> retn;
 
     // Fetch all the available collection ids
@@ -931,10 +931,10 @@ QList<QOrganizerCollection> QOrganizerItemMaemo5Engine::internalCollections(QOrg
     return retn;
 }
 
-bool QOrganizerItemMaemo5Engine::internalSaveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo5Engine::internalSaveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error)
 {
     if (!collection) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
@@ -942,13 +942,13 @@ bool QOrganizerItemMaemo5Engine::internalSaveCollection(QOrganizerCollection* co
     {
         if (!collection->id().localId().isNull()) {
             // Do not allow to save other manager's collection with local id set
-            *error = QOrganizerItemManager::BadArgumentError;
+            *error = QOrganizerManager::BadArgumentError;
             return false;
         }
     }
 
     QList<QOrganizerCollectionLocalId> collIds = internalCollectionIds(error);
-    if (*error != QOrganizerItemManager::NoError)
+    if (*error != QOrganizerManager::NoError)
         return false;
 
     QString calName = ""; // default value
@@ -1000,7 +1000,7 @@ bool QOrganizerItemMaemo5Engine::internalSaveCollection(QOrganizerCollection* co
             oldCalendar = 0;
         }
         if (calExistStatus != CALENDAR_DOESNOT_EXISTS) {
-            *error = QOrganizerItemManager::AlreadyExistsError;
+            *error = QOrganizerManager::AlreadyExistsError;
             return false;
         }
 
@@ -1018,8 +1018,8 @@ bool QOrganizerItemMaemo5Engine::internalSaveCollection(QOrganizerCollection* co
 
         if (!newCalendar) {
             *error = d->m_itemTransformer.calErrorToManagerError(calError);
-            if (*error == QOrganizerItemManager::NoError)
-                *error = QOrganizerItemManager::UnspecifiedError;
+            if (*error == QOrganizerManager::NoError)
+                *error = QOrganizerManager::UnspecifiedError;
             return false;
         }
         if (calError != CALENDAR_OPERATION_SUCCESSFUL) {
@@ -1059,7 +1059,7 @@ bool QOrganizerItemMaemo5Engine::internalSaveCollection(QOrganizerCollection* co
             return false;
         }
         else if (!ok) {
-            *error = QOrganizerItemManager::UnspecifiedError;
+            *error = QOrganizerManager::UnspecifiedError;
             return false;
         }
     }
@@ -1067,7 +1067,7 @@ bool QOrganizerItemMaemo5Engine::internalSaveCollection(QOrganizerCollection* co
     return true;
 }
 
-bool QOrganizerItemMaemo5Engine::internalRemoveCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo5Engine::internalRemoveCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error)
 {
     int calError = CALENDAR_OPERATION_SUCCESSFUL;
     bool ok = d->m_mcInstance->deleteCalendar(static_cast<int>(readCollectionLocalId(collectionId)), calError);
@@ -1076,36 +1076,36 @@ bool QOrganizerItemMaemo5Engine::internalRemoveCollection(const QOrganizerCollec
     return ok;
 }
 
-bool QOrganizerItemMaemo5Engine::startRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemMaemo5Engine::startRequest(QOrganizerAbstractRequest* req)
 {
     d->m_asynchProcess->addRequest(req);
     return true;
 }
 
-bool QOrganizerItemMaemo5Engine::cancelRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemMaemo5Engine::cancelRequest(QOrganizerAbstractRequest* req)
 {
     return d->m_asynchProcess->cancelRequest(req);
 }
 
-bool QOrganizerItemMaemo5Engine::waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs)
+bool QOrganizerItemMaemo5Engine::waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs)
 {
     return d->m_asynchProcess->waitForRequestFinished(req, msecs);
 }
 
-void QOrganizerItemMaemo5Engine::requestDestroyed(QOrganizerItemAbstractRequest* req)
+void QOrganizerItemMaemo5Engine::requestDestroyed(QOrganizerAbstractRequest* req)
 {
     return d->m_asynchProcess->requestDestroyed(req);
 }
 
-bool QOrganizerItemMaemo5Engine::hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString &itemType) const
+bool QOrganizerItemMaemo5Engine::hasFeature(QOrganizerManager::ManagerFeature feature, const QString &itemType) const
 {
     Q_UNUSED(itemType);
     switch(feature) {
-        case QOrganizerItemManager::MutableDefinitions:
+        case QOrganizerManager::MutableDefinitions:
             return false;
-        case QOrganizerItemManager::Anonymous:
+        case QOrganizerManager::Anonymous:
             return false;
-        case QOrganizerItemManager::ChangeLogs:
+        case QOrganizerManager::ChangeLogs:
             return false;
     }
     return false;
@@ -1138,15 +1138,15 @@ QStringList QOrganizerItemMaemo5Engine::supportedItemTypes() const
     return retn;
 }
 
-void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerItem *checkItem, QOrganizerItemManager::Error *error)
+void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerItem *checkItem, QOrganizerManager::Error *error)
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
 
     // Check local id
     if (!checkItem->localId().isNull()) {
         // Don't allow saving with local id defined unless the item is from this manager.
         if (checkItem->id().managerUri() != managerUri()) {
-            *error = QOrganizerItemManager::BadArgumentError;
+            *error = QOrganizerManager::BadArgumentError;
             return;
         }
     }
@@ -1169,13 +1169,13 @@ void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerI
     if (eventOccurrence) {
         // Original date must be set
         if (eventOccurrence->originalDate() == QDate()) {
-            *error = QOrganizerItemManager::InvalidOccurrenceError;
+            *error = QOrganizerManager::InvalidOccurrenceError;
             return;
         }
 
         // Either parent id or GUID (or both) must be set
         if (eventOccurrence->parentLocalId().isNull() && eventOccurrence->guid().isEmpty()) {
-            *error = QOrganizerItemManager::InvalidOccurrenceError;
+            *error = QOrganizerManager::InvalidOccurrenceError;
             return;
         }
 
@@ -1183,11 +1183,11 @@ void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerI
         QOrganizerItem parent;
         if (!eventOccurrence->parentLocalId().isNull()) {
             parent = internalItem(eventOccurrence->parentLocalId(), fetchMinimalData(), error);
-            if (*error != QOrganizerItemManager::NoError)
+            if (*error != QOrganizerManager::NoError)
                 return;
 
             if (parent.type() != QOrganizerItemType::TypeEvent) {
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
                 return;
             }
         }
@@ -1201,11 +1201,11 @@ void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerI
             for (int i = 0; i < numberOfEvents; ++i)
                 delete eventsWithGuid[i];
 
-            if (*error != QOrganizerItemManager::NoError)
+            if (*error != QOrganizerManager::NoError)
                 return;
 
             if (!numberOfEvents) {
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
                 return;
             }
         }
@@ -1213,7 +1213,7 @@ void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerI
         // If both parent ID and GUID are set, they must be consistent
         if (!eventOccurrence->parentLocalId().isNull() && !eventOccurrence->guid().isEmpty()) {
             if (eventOccurrence->guid() != parent.guid()) {
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
                 return;
             }
         }
@@ -1223,20 +1223,20 @@ void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerI
     if (todoOccurrence) {
         // Original date must be set
         if (todoOccurrence->originalDate() == QDate()) {
-            *error = QOrganizerItemManager::InvalidOccurrenceError;
+            *error = QOrganizerManager::InvalidOccurrenceError;
             return;
         }
 
         // Either parent id or GUID (or both) must be set
         if (todoOccurrence->parentLocalId().isNull() && todoOccurrence->guid().isEmpty()) {
-            *error = QOrganizerItemManager::InvalidOccurrenceError;
+            *error = QOrganizerManager::InvalidOccurrenceError;
             return;
         }
 
         if (!todoOccurrence->parentLocalId().isNull()) {
             // Parent ID must point to this occurrence due to restrictions in Maemo5 todos
             if (todoOccurrence->parentLocalId() != todoOccurrence->localId()) {
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
                 return;
             }
         }
@@ -1249,32 +1249,32 @@ void QOrganizerItemMaemo5Engine::checkItemIdValidity(CCalendar *cal, QOrganizerI
             for (int i = 0; i < numberOfTodos; ++i)
                 delete todosWithGuid[i];
 
-            if (*error != QOrganizerItemManager::NoError)
+            if (*error != QOrganizerManager::NoError)
                 return;
 
             if (!numberOfTodos) {
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
                 return;
             }
         }
     }
 }
 
-int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item, QOrganizerItemChangeSet &cs, QOrganizerItemManager::Error *error)
+int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item, QOrganizerItemChangeSet &cs, QOrganizerManager::Error *error)
 {
     int calError = CALENDAR_OPERATION_SUCCESSFUL;
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
 
     // Check item validity
     checkItemIdValidity(cal, item, error);
-    if (*error != QOrganizerItemManager::NoError)
+    if (*error != QOrganizerManager::NoError)
         return calError;
 
     // Returns InvalidItemTypeError if the type won't be recognized later
-    *error = QOrganizerItemManager::InvalidItemTypeError;
+    *error = QOrganizerManager::InvalidItemTypeError;
 
     CComponent *component = d->m_itemTransformer.createCComponent(cal, item, error);
-    if (!component || *error != QOrganizerItemManager::NoError) {
+    if (!component || *error != QOrganizerManager::NoError) {
         delete component;
         return calError;
     }
@@ -1294,7 +1294,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
             cal->modifyEvent(cevent, calError);
             d->m_dbCache->invalidate();
             *error = d->m_itemTransformer.calErrorToManagerError(calError);
-            if (*error == QOrganizerItemManager::NoError) {
+            if (*error == QOrganizerManager::NoError) {
                 // Modify alarm to contain the reminder information
                 // (must always be done only after the component is saved)
                 QPair<qint32, qint32> cookieChange = d->m_itemTransformer.modifyAlarmEvent(cal, item, component);
@@ -1339,7 +1339,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
                     cs.insertAddedItem(item->localId());
 
                 calError = CALENDAR_OPERATION_SUCCESSFUL; // reset the error
-                *error = QOrganizerItemManager::NoError; // reset the error
+                *error = QOrganizerManager::NoError; // reset the error
             }
         }
 
@@ -1351,7 +1351,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
         QOrganizerEventOccurrence *eventOccurrence = static_cast<QOrganizerEventOccurrence *>(item);
 
         QOrganizerItem parentItem = parentOf(cal, eventOccurrence, error);
-        if (*error == QOrganizerItemManager::NoError) {
+        if (*error == QOrganizerManager::NoError) {
             if (!parentItem.localId().isNull()) {
                 // parent item found, cast it to event
                 QOrganizerEvent *parentEvent = static_cast<QOrganizerEvent *>(&parentItem);
@@ -1363,7 +1363,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
             else {
                 // Event occurrence without a parent item fails,
                 // but this should not happen after passing the validity check...
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
             }
         }
 
@@ -1399,7 +1399,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
             cal->modifyTodo(ctodo, calError);
             d->m_dbCache->invalidate();
             *error = d->m_itemTransformer.calErrorToManagerError(calError);
-            if (*error == QOrganizerItemManager::NoError) {
+            if (*error == QOrganizerManager::NoError) {
                 // Modify alarm to contain the reminder information
                 // (must always be done only after the component is saved)
                 QPair<qint32, qint32> cookieChange = d->m_itemTransformer.modifyAlarmEvent(cal, item, component);
@@ -1444,7 +1444,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
                     cs.insertAddedItem(item->localId());
 
                 calError = CALENDAR_OPERATION_SUCCESSFUL; // reset the error
-                *error = QOrganizerItemManager::NoError; // reset the error
+                *error = QOrganizerManager::NoError; // reset the error
             }
         }
 
@@ -1463,7 +1463,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
             cal->modifyJournal(cjournal, calError);
             d->m_dbCache->invalidate();
             *error = d->m_itemTransformer.calErrorToManagerError(calError);
-            if (*error == QOrganizerItemManager::NoError) {
+            if (*error == QOrganizerManager::NoError) {
                 // Modify alarm to contain the reminder information
                 // (must always be done only after the component is saved)
                 QPair<qint32, qint32> cookieChange = d->m_itemTransformer.modifyAlarmEvent(cal, item, component);
@@ -1508,7 +1508,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
                     cs.insertAddedItem(item->localId());
 
                 calError = CALENDAR_OPERATION_SUCCESSFUL; // reset the error
-                *error = QOrganizerItemManager::NoError; // reset the error
+                *error = QOrganizerManager::NoError; // reset the error
             }
         }
 
@@ -1519,7 +1519,7 @@ int QOrganizerItemMaemo5Engine::doSaveItem(CCalendar *cal, QOrganizerItem *item,
     return calError;
 }
 
-int QOrganizerItemMaemo5Engine::saveEventOccurrence(CCalendar *cal, QOrganizerEventOccurrence *occurrence, QOrganizerEvent *parent, QOrganizerItemChangeSet &cs, QOrganizerItemManager::Error *error)
+int QOrganizerItemMaemo5Engine::saveEventOccurrence(CCalendar *cal, QOrganizerEventOccurrence *occurrence, QOrganizerEvent *parent, QOrganizerItemChangeSet &cs, QOrganizerManager::Error *error)
 {
     int calError = CALENDAR_OPERATION_SUCCESSFUL;
 
@@ -1592,10 +1592,10 @@ int QOrganizerItemMaemo5Engine::saveEventOccurrence(CCalendar *cal, QOrganizerEv
     calError = CALENDAR_OPERATION_SUCCESSFUL;
     CComponent *component = d->m_itemTransformer.createCComponent(cal, occurrence, error);
     if (!component) {
-        *error = QOrganizerItemManager::UnspecifiedError;
+        *error = QOrganizerManager::UnspecifiedError;
         return calError;
     }
-    if (*error != QOrganizerItemManager::NoError) {
+    if (*error != QOrganizerManager::NoError) {
         delete component;
         return calError;
     }
@@ -1611,7 +1611,7 @@ int QOrganizerItemMaemo5Engine::saveEventOccurrence(CCalendar *cal, QOrganizerEv
             *error = d->m_itemTransformer.calErrorToManagerError(calError);
             return calError;
         }
-        if (*error != QOrganizerItemManager::NoError) {
+        if (*error != QOrganizerManager::NoError) {
             // saving the parent modifications failed
             // we must not save the occurrence either
             delete component;
@@ -1636,7 +1636,7 @@ int QOrganizerItemMaemo5Engine::saveEventOccurrence(CCalendar *cal, QOrganizerEv
         *error = d->m_itemTransformer.calErrorToManagerError(calError);
         if (calError != CALENDAR_OPERATION_SUCCESSFUL && parentModified) {
             // occurrence saving failed, we must undo the parent changes too
-            QOrganizerItemManager::Error ignoreError;
+            QOrganizerManager::Error ignoreError;
             doSaveItem(cal, &parentBackup, cs, &ignoreError);
         }
     }
@@ -1673,11 +1673,11 @@ int QOrganizerItemMaemo5Engine::saveEventOccurrence(CCalendar *cal, QOrganizerEv
                 cs.insertAddedItem(occurrence->localId());
 
             calError = CALENDAR_OPERATION_SUCCESSFUL; // reset the error
-            *error = QOrganizerItemManager::NoError; // reset the error
+            *error = QOrganizerManager::NoError; // reset the error
         }
         else if (parentModified) {
             // occurrence saving failed, we must undo the parent changes too
-            QOrganizerItemManager::Error ignoreError;
+            QOrganizerManager::Error ignoreError;
             doSaveItem(cal, &parentBackup, cs, &ignoreError);
         }
     }
@@ -1704,7 +1704,7 @@ void QOrganizerItemMaemo5Engine::insertOccurenceSortedByStartDate(QOrganizerItem
     }
 }
 
-QOrganizerItem QOrganizerItemMaemo5Engine::parentOf(CCalendar *cal, QOrganizerItem *occurrence, QOrganizerItemManager::Error *error) const
+QOrganizerItem QOrganizerItemMaemo5Engine::parentOf(CCalendar *cal, QOrganizerItem *occurrence, QOrganizerManager::Error *error) const
 {
     // the occurrence is supposed be valid when this method becomes called
     QOrganizerItemLocalId parentLocalId;
@@ -1727,7 +1727,7 @@ QOrganizerItem QOrganizerItemMaemo5Engine::parentOf(CCalendar *cal, QOrganizerIt
                 QOrganizerItemLocalId candidateLocalId(new QOrganizerItemMaemo5EngineLocalId(QString::fromStdString((*pCand)->getId()).toUInt()));
 
                 QOrganizerItem parentCandidate = internalFetchItem(candidateLocalId, fetchMinimalData(), error, false);
-                if (*error == QOrganizerItemManager::NoError) {
+                if (*error == QOrganizerManager::NoError) {
                     // parent candidate must be an event here as events were requested from the GUID mapper
                     QOrganizerEvent *parentCandidateEvent = static_cast<QOrganizerEvent *>(&parentCandidate);
 
@@ -1749,7 +1749,7 @@ QOrganizerItem QOrganizerItemMaemo5Engine::parentOf(CCalendar *cal, QOrganizerIt
 
                             QList<QOrganizerItem> parentCandidateOccurrences =
                                     internalItemInstances(*parentCandidateEvent, periodStart, periodEnd, 0, error);
-                            if (*error != QOrganizerItemManager::NoError)
+                            if (*error != QOrganizerManager::NoError)
                                 return QOrganizerItem(); // error occured
 
                             // Because the period was set, it's enough to just check if we got any
@@ -1760,10 +1760,10 @@ QOrganizerItem QOrganizerItemMaemo5Engine::parentOf(CCalendar *cal, QOrganizerIt
                         }
                     }
                 }
-                else if (*error == QOrganizerItemManager::DoesNotExistError) {
+                else if (*error == QOrganizerManager::DoesNotExistError) {
                     // Tried to get an item that does not exist.
                     // It is not a serious error here, so just reset the error.
-                    *error = QOrganizerItemManager::NoError;
+                    *error = QOrganizerManager::NoError;
                 }
             }
 
@@ -1815,7 +1815,7 @@ QOrganizerItem QOrganizerItemMaemo5Engine::parentOf(CCalendar *cal, QOrganizerIt
     return internalFetchItem(parentLocalId, fetchMinimalData(), error, false);
 }
 
-QOrganizerItem QOrganizerItemMaemo5Engine::internalFetchItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error, bool fetchOccurrences) const
+QOrganizerItem QOrganizerItemMaemo5Engine::internalFetchItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error, bool fetchOccurrences) const
 {
     Q_UNUSED(fetchHint); // there are never large binary blobs etc. attached to maemo5 calendar items
 
@@ -1851,7 +1851,7 @@ QOrganizerItem QOrganizerItemMaemo5Engine::internalFetchItem(const QOrganizerIte
         if (fetchOccurrences) {
             QString type = QOrganizerItemType::TypeEvent;
             isOcc = isOccurrence(cal, cevent, type, error);
-            if (*error != QOrganizerItemManager::NoError) {
+            if (*error != QOrganizerManager::NoError) {
                 delete cevent;
                 cleanupCal(cal);
                 return QOrganizerItem();
@@ -1875,7 +1875,7 @@ QOrganizerItem QOrganizerItemMaemo5Engine::internalFetchItem(const QOrganizerIte
 
             // resolve and set the parent event
             QOrganizerItem parent = parentOf(cal, &retn, error);
-            if (*error != QOrganizerItemManager::NoError) {
+            if (*error != QOrganizerManager::NoError) {
                 delete cevent;
                 cleanupCal(cal);
                 return QOrganizerItem();
@@ -1936,15 +1936,15 @@ QOrganizerItem QOrganizerItemMaemo5Engine::internalFetchItem(const QOrganizerIte
 
     // In an error situation return an invalid item
     cleanupCal(cal);
-    *error = QOrganizerItemManager::DoesNotExistError;
+    *error = QOrganizerManager::DoesNotExistError;
     return QOrganizerItem();
 }
 
-bool QOrganizerItemMaemo5Engine::isOccurrence(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerItemManager::Error *error) const
+bool QOrganizerItemMaemo5Engine::isOccurrence(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerManager::Error *error) const
 {
     // checks if a native event or todo is actually an occurrence
 
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QString guid = QString::fromStdString(ccomponent->getGUid());
     if (guid.isEmpty())
         return false; // possible items with no GUID are never considered as occurrences
@@ -2008,9 +2008,9 @@ bool QOrganizerItemMaemo5Engine::isOccurrence(CCalendar *cal, CComponent *ccompo
     }
 }
 
-bool QOrganizerItemMaemo5Engine::isParent(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerItemManager::Error *error) const
+bool QOrganizerItemMaemo5Engine::isParent(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerManager::Error *error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QString guid = QString::fromStdString(ccomponent->getGUid());
     if (guid.isEmpty())
         return false; // possible items with no GUID are never parents
@@ -2025,7 +2025,7 @@ bool QOrganizerItemMaemo5Engine::isParent(CCalendar *cal, CComponent *ccomponent
             // Multiple events with GUID found => if this one is not an occurrence
             // then it has to be a parent
             bool isOcc = isOccurrence(cal, ccomponent, QOrganizerItemType::TypeEvent, error);
-            if (!isOcc && *error == QOrganizerItemManager::NoError)
+            if (!isOcc && *error == QOrganizerManager::NoError)
                 retValue = true;
         }
 
@@ -2068,7 +2068,7 @@ void QOrganizerItemMaemo5Engine::cleanupCal(CCalendar *cal) const
         delete cal; // The default calendar should not be deleted
 }
 
-CCalendar* QOrganizerItemMaemo5Engine::getCalendar(QOrganizerCollectionLocalId collectionId, QOrganizerItemManager::Error *error) const
+CCalendar* QOrganizerItemMaemo5Engine::getCalendar(QOrganizerCollectionLocalId collectionId, QOrganizerManager::Error *error) const
 {
     CCalendar *cal = 0;
     int calError = CALENDAR_OPERATION_SUCCESSFUL;
@@ -2079,7 +2079,7 @@ CCalendar* QOrganizerItemMaemo5Engine::getCalendar(QOrganizerCollectionLocalId c
         cal = d->m_mcInstance->getCalendarById(readCollectionLocalId(collectionId), calError);
 
     if (!cal || calError != CALENDAR_OPERATION_SUCCESSFUL)
-        *error = QOrganizerItemManager::InvalidCollectionError;
+        *error = QOrganizerManager::InvalidCollectionError;
 
     return cal;
 }
diff --git a/plugins/organizer/maemo5/qorganizermaemo5_p.h b/plugins/organizer/maemo5/qorganizermaemo5_p.h
index f9b6658dfc..ecaaf6e41b 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5_p.h
+++ b/plugins/organizer/maemo5/qorganizermaemo5_p.h
@@ -66,13 +66,13 @@
 #include <QTimer>
 
 #include "qorganizeritem.h"
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanagerengine.h"
-#include "qorganizeritemmanagerenginefactory.h"
+#include "qorganizermanager.h"
+#include "qorganizermanagerengine.h"
+#include "qorganizermanagerenginefactory.h"
 #include "qorganizeritemenginelocalid.h"
 #include "qorganizercollectionenginelocalid.h"
 #include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemchangeset.h"
 
 #include "qorganizeritemtransform.h"
@@ -90,12 +90,12 @@
 #include <CRecurrence.h>
 
 
-class QOrganizerItemMaemo5Factory : public QObject, public QOrganizerItemManagerEngineFactory
+class QOrganizerItemMaemo5Factory : public QObject, public QOrganizerManagerEngineFactory
 {
   Q_OBJECT
-  Q_INTERFACES(QtMobility::QOrganizerItemManagerEngineFactory)
+  Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
-    QOrganizerItemManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerItemManager::Error*);
+    QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error*);
     QOrganizerItemEngineLocalId* createItemEngineLocalId() const;
     QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId() const;
     QString managerName() const;
@@ -138,7 +138,7 @@ public:
     OrganizerDbCache* m_dbCache;
 };
 
-class QOrganizerItemMaemo5Engine : public QOrganizerItemManagerEngine
+class QOrganizerItemMaemo5Engine : public QOrganizerManagerEngine
 {
     Q_OBJECT
 
@@ -150,75 +150,75 @@ public:
     QMap<QString, QString> managerParameters() const;
     int managerVersion() const;
 
-    QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerItemManager::Error *error) const;
+    QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerManager::Error *error) const;
 
-    QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const;
-    QList<QOrganizerItem> itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const;
-    QOrganizerItem item(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const;
+    QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const;
+    QList<QOrganizerItem> itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const;
+    QOrganizerItem item(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const;
 
-    bool saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
-    bool removeItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerItemManager::Error> *errorMap, QOrganizerItemManager::Error *error);
+    bool saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
+    bool removeItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error);
 
     /* Collections - every item belongs to exactly one collection */
-    QOrganizerCollection defaultCollection(QOrganizerItemManager::Error* error) const;
-    QOrganizerCollection collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerCollection> collections(QOrganizerItemManager::Error* error) const;
-    bool saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error);
-    bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error);
+    QOrganizerCollection defaultCollection(QOrganizerManager::Error* error) const;
+    QOrganizerCollection collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const;
+    QList<QOrganizerCollection> collections(QOrganizerManager::Error* error) const;
+    bool saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error);
+    bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error);
 
     /* Capabilities reporting */
-    bool hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString &itemType) const;
+    bool hasFeature(QOrganizerManager::ManagerFeature feature, const QString &itemType) const;
     bool isFilterSupported(const QOrganizerItemFilter &filter) const;
     QList<int> supportedDataTypes() const;
     QStringList supportedItemTypes() const;
 
     /* Asynchronous Request Support */
-    void requestDestroyed(QOrganizerItemAbstractRequest *req);
-    bool startRequest(QOrganizerItemAbstractRequest *req);
-    bool cancelRequest(QOrganizerItemAbstractRequest *req);
-    bool waitForRequestFinished(QOrganizerItemAbstractRequest *req, int msecs);
+    void requestDestroyed(QOrganizerAbstractRequest *req);
+    bool startRequest(QOrganizerAbstractRequest *req);
+    bool cancelRequest(QOrganizerAbstractRequest *req);
+    bool waitForRequestFinished(QOrganizerAbstractRequest *req, int msecs);
 
 public Q_SLOTS:
     void dataChanged();
 
 private:
-    QList<QOrganizerItem> internalItemInstances(const QOrganizerItem &generator, const QDateTime &periodStart, const QDateTime &periodEnd, int maxCount, QOrganizerItemManager::Error *error) const;
-    QList<QOrganizerItemLocalId> internalItemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerItemManager::Error *error) const;
+    QList<QOrganizerItem> internalItemInstances(const QOrganizerItem &generator, const QDateTime &periodStart, const QDateTime &periodEnd, int maxCount, QOrganizerManager::Error *error) const;
+    QList<QOrganizerItemLocalId> internalItemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, QOrganizerManager::Error *error) const;
 
-    QList<QOrganizerItem> internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, bool forExport, QOrganizerItemManager::Error *error) const;
-    void internalAddOccurances(QList<QOrganizerItem>* sorted, QOrganizerItem& item, const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, bool forExport, QOrganizerItemManager::Error *error) const;
-    QOrganizerItem internalItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error) const;
+    QList<QOrganizerItem> internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, const QOrganizerItemFetchHint &fetchHint, bool forExport, QOrganizerManager::Error *error) const;
+    void internalAddOccurances(QList<QOrganizerItem>* sorted, QOrganizerItem& item, const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter &filter, const QList<QOrganizerItemSortOrder> &sortOrders, bool forExport, QOrganizerManager::Error *error) const;
+    QOrganizerItem internalItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error) const;
 
-    bool internalSaveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
-    bool internalRemoveItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerItemManager::Error> *errorMap, QOrganizerItemManager::Error *error);
+    bool internalSaveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
+    bool internalRemoveItems(const QList<QOrganizerItemLocalId> &itemIds, QMap<int, QOrganizerManager::Error> *errorMap, QOrganizerManager::Error *error);
 
     /* Collections - every item belongs to exactly one collection */
-    QOrganizerCollection internalDefaultCollection(QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerCollection> internalCollections(QOrganizerItemManager::Error* error) const;
-    QOrganizerCollection internalCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const;
-    bool internalSaveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error);
-    bool internalRemoveCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error);
+    QOrganizerCollection internalDefaultCollection(QOrganizerManager::Error* error) const;
+    QList<QOrganizerCollection> internalCollections(QOrganizerManager::Error* error) const;
+    QOrganizerCollection internalCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const;
+    bool internalSaveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error);
+    bool internalRemoveCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error);
     // helper function
-    QList<QOrganizerCollectionLocalId> internalCollectionIds(QOrganizerItemManager::Error* error) const;
+    QList<QOrganizerCollectionLocalId> internalCollectionIds(QOrganizerManager::Error* error) const;
 
     // single item saving implementation
-    void checkItemIdValidity(CCalendar *cal, QOrganizerItem *checkItem, QOrganizerItemManager::Error *error);
-    int doSaveItem(CCalendar *cal, QOrganizerItem *item, QOrganizerItemChangeSet &cs, QOrganizerItemManager::Error *error);
+    void checkItemIdValidity(CCalendar *cal, QOrganizerItem *checkItem, QOrganizerManager::Error *error);
+    int doSaveItem(CCalendar *cal, QOrganizerItem *item, QOrganizerItemChangeSet &cs, QOrganizerManager::Error *error);
 
     // saving the occurrences
-    int saveEventOccurrence(CCalendar *cal, QOrganizerEventOccurrence *occurrence, QOrganizerEvent *parent, QOrganizerItemChangeSet &cs, QOrganizerItemManager::Error *error);
+    int saveEventOccurrence(CCalendar *cal, QOrganizerEventOccurrence *occurrence, QOrganizerEvent *parent, QOrganizerItemChangeSet &cs, QOrganizerManager::Error *error);
     void insertOccurenceSortedByStartDate(QOrganizerItem *occurrence, QList<QOrganizerItem> &target) const;
 
     // getting the parent (base) item of an exception item (event occurrence or todo occurrence)
-    QOrganizerItem parentOf(CCalendar *cal, QOrganizerItem *occurence, QOrganizerItemManager::Error *error) const;
+    QOrganizerItem parentOf(CCalendar *cal, QOrganizerItem *occurence, QOrganizerManager::Error *error) const;
 
     // internal fetch item
-    QOrganizerItem internalFetchItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerItemManager::Error *error, bool fetchOccurrences) const;
+    QOrganizerItem internalFetchItem(const QOrganizerItemLocalId &itemId, const QOrganizerItemFetchHint &fetchHint, QOrganizerManager::Error *error, bool fetchOccurrences) const;
 
     // identifying native item as an occurrence
-    bool isOccurrence(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerItemManager::Error *error) const;
-    bool isParent(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerItemManager::Error *error) const;
+    bool isOccurrence(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerManager::Error *error) const;
+    bool isParent(CCalendar *cal, CComponent *ccomponent, QString typeStr, QOrganizerManager::Error *error) const;
     bool containsRecurrenceInformation(CComponent *ccomponent) const;
 
     // returns a fetch hint for fetching minimal amount of information
@@ -228,7 +228,7 @@ private:
     void cleanupCal(CCalendar *cal) const;
 
     // get calendar
-    CCalendar* getCalendar(QOrganizerCollectionLocalId collectionId, QOrganizerItemManager::Error *error) const;
+    CCalendar* getCalendar(QOrganizerCollectionLocalId collectionId, QOrganizerManager::Error *error) const;
 
     // extract possible collection ids from the filters
     QSet<QOrganizerCollectionId> extractCollectionIds(const QOrganizerItemFilter& filter) const;
diff --git a/plugins/organizer/maemo5/qorganizermaemo5ids_p.h b/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
index 9bf11b57f2..891ead4048 100644
--- a/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
+++ b/plugins/organizer/maemo5/qorganizermaemo5ids_p.h
@@ -115,7 +115,7 @@ inline QOrganizerItemLocalId makeItemLocalId(quint32 id) {
 
 inline quint32 readItemLocalId(const QOrganizerItemLocalId& id) {
     return static_cast<QOrganizerItemMaemo5EngineLocalId*>(
-            QOrganizerItemManagerEngine::engineLocalItemId(id))->m_localItemId;
+            QOrganizerManagerEngine::engineLocalItemId(id))->m_localItemId;
 }
 
 inline QOrganizerCollectionLocalId makeCollectionLocalId(quint32 id) {
@@ -124,7 +124,7 @@ inline QOrganizerCollectionLocalId makeCollectionLocalId(quint32 id) {
 
 inline quint32 readCollectionLocalId(const QOrganizerCollectionLocalId& id) {
     return static_cast<QOrganizerCollectionMaemo5EngineLocalId*>(
-            QOrganizerItemManagerEngine::engineLocalCollectionId(id))->m_localCollectionId;
+            QOrganizerManagerEngine::engineLocalCollectionId(id))->m_localCollectionId;
 }
 
 #endif
diff --git a/plugins/organizer/maemo5/qorganizerrecurrencetransform.cpp b/plugins/organizer/maemo5/qorganizerrecurrencetransform.cpp
index 92c27f4264..522409209d 100644
--- a/plugins/organizer/maemo5/qorganizerrecurrencetransform.cpp
+++ b/plugins/organizer/maemo5/qorganizerrecurrencetransform.cpp
@@ -131,7 +131,7 @@ CRecurrence* OrganizerRecurrenceTransform::crecurrence(bool *success) const
     return retn;
 }
 
-void OrganizerRecurrenceTransform::addQOrganizerItemRecurrenceRule(const QOrganizerItemRecurrenceRule& rule)
+void OrganizerRecurrenceTransform::addQOrganizerRecurrenceRule(const QOrganizerRecurrenceRule& rule)
 {
     QString icalRule = qrecurrenceRuleToIcalRecurrenceRule(rule);
 
@@ -146,7 +146,7 @@ void OrganizerRecurrenceTransform::addQOrganizerItemRecurrenceRule(const QOrgani
     m_rtype = m_rtype ? ( ruleRtype < m_rtype ? ruleRtype : m_rtype ) : ruleRtype;
 }
 
-void OrganizerRecurrenceTransform::addQOrganizerItemExceptionRule(const QOrganizerItemRecurrenceRule& rule)
+void OrganizerRecurrenceTransform::addQOrganizerItemExceptionRule(const QOrganizerRecurrenceRule& rule)
 {
     QString icalRule = qrecurrenceRuleToIcalRecurrenceRule(rule);
 
@@ -163,7 +163,7 @@ void OrganizerRecurrenceTransform::addQOrganizerItemRecurrenceDate(const QDate &
     m_vRecDateList.push_back(QString::number(QDateTime(date, QTime(0, 0, 0)).toTime_t()).toStdString());
 
     if (!m_rtype)
-        m_rtype = qfrequencyToRtype(QOrganizerItemRecurrenceRule::Yearly);
+        m_rtype = qfrequencyToRtype(QOrganizerRecurrenceRule::Yearly);
 }
 
 void OrganizerRecurrenceTransform::addQOrganizerItemExceptionDate(const QDate &date)
@@ -172,7 +172,7 @@ void OrganizerRecurrenceTransform::addQOrganizerItemExceptionDate(const QDate &d
     m_vExceptionDateList.push_back(QString::number(QDateTime(date, QTime(0, 0, 0)).toTime_t()).toStdString());
 }
 
-QString OrganizerRecurrenceTransform::qrecurrenceRuleToIcalRecurrenceRule(const QOrganizerItemRecurrenceRule& rule) const
+QString OrganizerRecurrenceTransform::qrecurrenceRuleToIcalRecurrenceRule(const QOrganizerRecurrenceRule& rule) const
 {
     QStringList icalRule;
 
@@ -185,7 +185,7 @@ QString OrganizerRecurrenceTransform::qrecurrenceRuleToIcalRecurrenceRule(const
 
     icalRule << qintervalToIcalInterval(rule.interval());
 
-    QSet<QOrganizerItemRecurrenceRule::Month> months(rule.monthsOfYear());
+    QSet<QOrganizerRecurrenceRule::Month> months(rule.monthsOfYear());
     if (!months.isEmpty())
         icalRule << qmonthsToIcalByMonth(months);
 
@@ -217,14 +217,14 @@ QString OrganizerRecurrenceTransform::qrecurrenceRuleToIcalRecurrenceRule(const
     return icalRule.join(";");
 }
 
-QString OrganizerRecurrenceTransform::qfrequencyToIcalFrequency(QOrganizerItemRecurrenceRule::Frequency frequency) const
+QString OrganizerRecurrenceTransform::qfrequencyToIcalFrequency(QOrganizerRecurrenceRule::Frequency frequency) const
 {
     switch( frequency )
     {
-    case QOrganizerItemRecurrenceRule::Daily: return QString("FREQ=DAILY");
-    case QOrganizerItemRecurrenceRule::Weekly: return QString("FREQ=WEEKLY");
-    case QOrganizerItemRecurrenceRule::Monthly: return QString("FREQ=MONTHLY");
-    case QOrganizerItemRecurrenceRule::Yearly: return QString("FREQ=YEARLY");
+    case QOrganizerRecurrenceRule::Daily: return QString("FREQ=DAILY");
+    case QOrganizerRecurrenceRule::Weekly: return QString("FREQ=WEEKLY");
+    case QOrganizerRecurrenceRule::Monthly: return QString("FREQ=MONTHLY");
+    case QOrganizerRecurrenceRule::Yearly: return QString("FREQ=YEARLY");
     default: return QString("FREQ=WEEKLY"); // invalid frequency, assume weekly
     }
 }
@@ -276,10 +276,10 @@ QString OrganizerRecurrenceTransform::qdaysOfYearToIcalByYearDay(const QSet<int>
     return QString("BYYEARDAY=") + listOfNumbers(daysOfYear);
 }
 
-QString OrganizerRecurrenceTransform::qmonthsToIcalByMonth(const QSet<QOrganizerItemRecurrenceRule::Month> &months) const
+QString OrganizerRecurrenceTransform::qmonthsToIcalByMonth(const QSet<QOrganizerRecurrenceRule::Month> &months) const
 {
     QSet<int> monthList;
-    foreach (QOrganizerItemRecurrenceRule::Month month, months)
+    foreach (QOrganizerRecurrenceRule::Month month, months)
         monthList << static_cast<int>(month);
     return QString("BYMONTH=") + listOfNumbers(monthList);
 }
@@ -307,7 +307,7 @@ QString OrganizerRecurrenceTransform::listOfNumbers(const QSet<int> &list) const
     return slist.join(",");
 }
 
-int OrganizerRecurrenceTransform::qfrequencyToRtype(QOrganizerItemRecurrenceRule::Frequency frequency) const
+int OrganizerRecurrenceTransform::qfrequencyToRtype(QOrganizerRecurrenceRule::Frequency frequency) const
 {
     // The recursion types the native calendar application
     // uses are found by experiment:
@@ -318,10 +318,10 @@ int OrganizerRecurrenceTransform::qfrequencyToRtype(QOrganizerItemRecurrenceRule
 
     switch( frequency )
     {
-    case QOrganizerItemRecurrenceRule::Daily: return NATIVE_CAL_APP_DAILY;
-    case QOrganizerItemRecurrenceRule::Weekly: return NATIVE_CAL_APP_WEEKLY;
-    case QOrganizerItemRecurrenceRule::Monthly: return NATIVE_CAL_APP_MONTHLY;
-    case QOrganizerItemRecurrenceRule::Yearly: return NATIVE_CAL_APP_YEARLY;
+    case QOrganizerRecurrenceRule::Daily: return NATIVE_CAL_APP_DAILY;
+    case QOrganizerRecurrenceRule::Weekly: return NATIVE_CAL_APP_WEEKLY;
+    case QOrganizerRecurrenceRule::Monthly: return NATIVE_CAL_APP_MONTHLY;
+    case QOrganizerRecurrenceRule::Yearly: return NATIVE_CAL_APP_YEARLY;
     default: return NATIVE_CAL_APP_YEARLY;
     }
 }
@@ -344,7 +344,7 @@ void OrganizerRecurrenceTransform::transformToQrecurrence(CRecurrence *crecurren
         CRecurrenceRule *rule = *i;
         if (rule)
         {
-            QOrganizerItemRecurrenceRule qrule(icalRecurrenceRuleToQrecurrenceRule(rule));
+            QOrganizerRecurrenceRule qrule(icalRecurrenceRuleToQrecurrenceRule(rule));
             if (rule->getRuleType() == RECURRENCE_RULE)
                 m_lRecurrenceRules << qrule;
             else if(rule->getRuleType() == EXCEPTION_RULE)
@@ -365,12 +365,12 @@ void OrganizerRecurrenceTransform::transformToQrecurrence(CRecurrence *crecurren
         m_lExceptionDates << QDateTime::fromTime_t(QString::fromStdString(*exceptionDate).toInt()).date();
 }
 
-QSet<QOrganizerItemRecurrenceRule> OrganizerRecurrenceTransform::recurrenceRules() const
+QSet<QOrganizerRecurrenceRule> OrganizerRecurrenceTransform::recurrenceRules() const
 {
     return m_lRecurrenceRules;
 }
 
-QSet<QOrganizerItemRecurrenceRule> OrganizerRecurrenceTransform::exceptionRules() const
+QSet<QOrganizerRecurrenceRule> OrganizerRecurrenceTransform::exceptionRules() const
 {
     return m_lExceptionRules;
 }
@@ -385,9 +385,9 @@ QSet<QDate> OrganizerRecurrenceTransform::exceptionDates() const
     return m_lExceptionDates;
 }
 
-QOrganizerItemRecurrenceRule OrganizerRecurrenceTransform::icalRecurrenceRuleToQrecurrenceRule(CRecurrenceRule *rule ) const
+QOrganizerRecurrenceRule OrganizerRecurrenceTransform::icalRecurrenceRuleToQrecurrenceRule(CRecurrenceRule *rule ) const
 {
-    QOrganizerItemRecurrenceRule retn;
+    QOrganizerRecurrenceRule retn;
     // Parse rrule
     if (!rule->rruleParser(rule->getRrule()))
         return retn; // parsing failed
@@ -407,11 +407,11 @@ QOrganizerItemRecurrenceRule OrganizerRecurrenceTransform::icalRecurrenceRuleToQ
 
     retn.setInterval(rule->getInterval());
 
-    QSet<QOrganizerItemRecurrenceRule::Month> qMonths;
+    QSet<QOrganizerRecurrenceRule::Month> qMonths;
     std::vector< short > months = rule->getMonth();
     std::vector< short >::const_iterator month;
     for (month = months.begin(); month != months.end(); ++month)
-        qMonths << static_cast<QOrganizerItemRecurrenceRule::Month>(*month);
+        qMonths << static_cast<QOrganizerRecurrenceRule::Month>(*month);
     retn.setMonthsOfYear(qMonths);
 
     QSet<Qt::DayOfWeek> qDaysOfWeek;
@@ -462,17 +462,17 @@ QOrganizerItemRecurrenceRule OrganizerRecurrenceTransform::icalRecurrenceRuleToQ
     return retn;
 }
 
-QOrganizerItemRecurrenceRule::Frequency OrganizerRecurrenceTransform::icalFrequencyToQfrequency(FREQUENCY frequency) const
+QOrganizerRecurrenceRule::Frequency OrganizerRecurrenceTransform::icalFrequencyToQfrequency(FREQUENCY frequency) const
 {
     switch( frequency )
     {
-    case DAILY_RECURRENCE: return QOrganizerItemRecurrenceRule::Daily;
-    case WEEKLY_RECURRENCE: return QOrganizerItemRecurrenceRule::Weekly;
-    case MONTHLY_RECURRENCE: return QOrganizerItemRecurrenceRule::Monthly;
-    case YEARLY_RECURRENCE: return QOrganizerItemRecurrenceRule::Yearly;
+    case DAILY_RECURRENCE: return QOrganizerRecurrenceRule::Daily;
+    case WEEKLY_RECURRENCE: return QOrganizerRecurrenceRule::Weekly;
+    case MONTHLY_RECURRENCE: return QOrganizerRecurrenceRule::Monthly;
+    case YEARLY_RECURRENCE: return QOrganizerRecurrenceRule::Yearly;
     default:
         // No corresponding frequencies defined for the rest of cases
-        return QOrganizerItemRecurrenceRule::Daily;
+        return QOrganizerRecurrenceRule::Daily;
     }
 }
 
diff --git a/plugins/organizer/maemo5/qorganizerrecurrencetransform.h b/plugins/organizer/maemo5/qorganizerrecurrencetransform.h
index dc9265ac20..0893704a77 100644
--- a/plugins/organizer/maemo5/qorganizerrecurrencetransform.h
+++ b/plugins/organizer/maemo5/qorganizerrecurrencetransform.h
@@ -70,8 +70,8 @@ public: // Conversion from QRecurrence to CRecurrence
     void beginTransformToCrecurrence();
 
     // set rules and dates
-    void addQOrganizerItemRecurrenceRule(const QOrganizerItemRecurrenceRule &rule);
-    void addQOrganizerItemExceptionRule(const QOrganizerItemRecurrenceRule &rule);
+    void addQOrganizerRecurrenceRule(const QOrganizerRecurrenceRule &rule);
+    void addQOrganizerItemExceptionRule(const QOrganizerRecurrenceRule &rule);
     void addQOrganizerItemRecurrenceDate(const QDate &date);
     void addQOrganizerItemExceptionDate(const QDate &date);
 
@@ -83,15 +83,15 @@ public: // Conversion from CRecurrence to QRecurrence
     void transformToQrecurrence(CRecurrence *crecurrence);
 
     // get rules and dates
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules() const;
-    QSet<QOrganizerItemRecurrenceRule> exceptionRules() const;
+    QSet<QOrganizerRecurrenceRule> recurrenceRules() const;
+    QSet<QOrganizerRecurrenceRule> exceptionRules() const;
     QSet<QDate> recurrenceDates() const;
     QSet<QDate> exceptionDates() const;
 
 private:
     // qrule -> crule conversions
-    QString qrecurrenceRuleToIcalRecurrenceRule(const QOrganizerItemRecurrenceRule &rule) const;
-    QString qfrequencyToIcalFrequency(QOrganizerItemRecurrenceRule::Frequency frequency) const;
+    QString qrecurrenceRuleToIcalRecurrenceRule(const QOrganizerRecurrenceRule &rule) const;
+    QString qfrequencyToIcalFrequency(QOrganizerRecurrenceRule::Frequency frequency) const;
     QString qcountToIcalCount(int count) const;
     QString qintervalToIcalInterval(int interval) const;
     QString qendDateToIcalUntil(QDate endDate) const;
@@ -100,15 +100,15 @@ private:
     QString qweekdayToIcalWeekday(Qt::DayOfWeek dayOfWeek) const;
     QString qdaysOfMonthToIcalByMonthDay(const QSet<int> &daysOfMonth) const;
     QString qdaysOfYearToIcalByYearDay(const QSet<int> &daysOfYear) const;
-    QString qmonthsToIcalByMonth(const QSet<QOrganizerItemRecurrenceRule::Month> &months) const;
+    QString qmonthsToIcalByMonth(const QSet<QOrganizerRecurrenceRule::Month> &months) const;
     QString qweeksOfYearToIcalByWeekNo(const QSet<int> &weeksOfYear) const;
     QString qpositionsToIcalBySetPos(const QSet<int> &positions) const;
     QString listOfNumbers(const QSet<int> &list) const;
-    int qfrequencyToRtype(QOrganizerItemRecurrenceRule::Frequency frequency) const;
+    int qfrequencyToRtype(QOrganizerRecurrenceRule::Frequency frequency) const;
 
     // crule -> qrule conversions
-    QOrganizerItemRecurrenceRule icalRecurrenceRuleToQrecurrenceRule(CRecurrenceRule *rule) const;
-    QOrganizerItemRecurrenceRule::Frequency icalFrequencyToQfrequency(FREQUENCY frequency) const;
+    QOrganizerRecurrenceRule icalRecurrenceRuleToQrecurrenceRule(CRecurrenceRule *rule) const;
+    QOrganizerRecurrenceRule::Frequency icalFrequencyToQfrequency(FREQUENCY frequency) const;
     Qt::DayOfWeek icalWeekdayToQdayOfWeek(short weekday, bool *status = 0) const;
     Qt::DayOfWeek icalRecurrenceTypeWeekdayToQdayOfWeek(const QString& weekday) const;
 
@@ -123,8 +123,8 @@ private:
     std::vector< std::string > m_vExceptionDateList; // exception dates
 
     // CRecurrence -> QRecurrence
-    QSet<QOrganizerItemRecurrenceRule> m_lRecurrenceRules;
-    QSet<QOrganizerItemRecurrenceRule> m_lExceptionRules;
+    QSet<QOrganizerRecurrenceRule> m_lRecurrenceRules;
+    QSet<QOrganizerRecurrenceRule> m_lExceptionRules;
     QSet<QDate> m_lRecurrenceDates;
     QSet<QDate> m_lExceptionDates;
 };
diff --git a/plugins/organizer/maemo5/tsrc/tst_maemo5om/tst_maemo5om.cpp b/plugins/organizer/maemo5/tsrc/tst_maemo5om/tst_maemo5om.cpp
index f67af6ae12..0078a3ec28 100644
--- a/plugins/organizer/maemo5/tsrc/tst_maemo5om/tst_maemo5om.cpp
+++ b/plugins/organizer/maemo5/tsrc/tst_maemo5om/tst_maemo5om.cpp
@@ -90,13 +90,13 @@ private slots:  // Test cases
     void testReminders();
 
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
 };
 
 
 void tst_Maemo5Om::init()
 {
-    m_om = new QOrganizerItemManager(managerName);
+    m_om = new QOrganizerManager(managerName);
     // Remove all organizer items first (Note: ignores possible errors)
     m_om->removeItems(m_om->itemIds());
 }
@@ -132,7 +132,7 @@ void tst_Maemo5Om::addSimpleItem()
 
     // Save
     QVERIFY(m_om->saveItem(&event1));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event1.id().localId().isNull());
     QVERIFY(event1.id().managerUri().contains(managerName));
     QVERIFY(!event1.guid().isEmpty());
@@ -148,7 +148,7 @@ void tst_Maemo5Om::addSimpleItem()
     QList<QOrganizerItem> items;
     items.append(event2);
     QVERIFY(m_om->saveItems(&items));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     foreach (QOrganizerItem item, items) {
         QVERIFY(!item.id().localId().isNull());
         QVERIFY(item.id().managerUri().contains(managerName));
@@ -166,7 +166,7 @@ void tst_Maemo5Om::addSimpleItem()
     QList<QOrganizerItem> items2;
     items2.append(event3);
     QVERIFY(m_om->saveItems(&items));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(m_om->errorMap().count() == 0);
     foreach ( QOrganizerItem item2, items ) {
         QVERIFY(!item2.id().localId().isNull());
@@ -191,14 +191,14 @@ void tst_Maemo5Om::removeSimpleItem()
 
     // Save
     QVERIFY(m_om->saveItem(&event));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event.id().localId().isNull());
     QVERIFY(event.id().managerUri().contains(managerName));
     QVERIFY(!event.guid().isEmpty());
 
     // Remove
     QVERIFY(m_om->removeItem(event.id().localId()));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
 
     // Try to fetch back, should fail
     QOrganizerItem fetchItem = m_om->item(event.id().localId());
@@ -239,7 +239,7 @@ void tst_Maemo5Om::addEvent() {
 
     // Save event
     QVERIFY(m_om->saveItem(&event));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event.id().localId().isNull());
     QVERIFY(event.id().managerUri().contains(managerName));
 
@@ -279,7 +279,7 @@ void tst_Maemo5Om::addTodo() {
 
     // Save todo
     QVERIFY(m_om->saveItem(&todo));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!todo.id().localId().isNull());
     QVERIFY(todo.id().managerUri().contains(managerName));
 
@@ -309,7 +309,7 @@ void tst_Maemo5Om::addJournal() {
 
     // Save journal
     QVERIFY(m_om->saveItem(&journal));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!journal.id().localId().isNull());
     QVERIFY(journal.id().managerUri().contains(managerName));
 
@@ -335,11 +335,11 @@ void tst_Maemo5Om::addEventWithRecurrence()
     event.setDescription("A weekly recurring event");
 
     // Create recurrence
-    QOrganizerItemRecurrenceRule recurrenceRule;
+    QOrganizerRecurrenceRule recurrenceRule;
     recurrenceRule.setLimit(10);
-    recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Weekly);
 
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules;
+    QSet<QOrganizerRecurrenceRule> recurrenceRules;
     recurrenceRules << recurrenceRule;
 
     // Set recurrence
@@ -347,7 +347,7 @@ void tst_Maemo5Om::addEventWithRecurrence()
 
     // Save event
     QVERIFY(m_om->saveItem(&event));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event.id().localId().isNull());
     QVERIFY(event.id().managerUri().contains(managerName));
     QVERIFY(!event.guid().isEmpty());
@@ -375,10 +375,10 @@ void tst_Maemo5Om::addEventExceptions()
     event.setDisplayLabel(QLatin1String("meeting"));
     event.setStartDateTime(QDateTime(QDate(2010, 1, 1), QTime(11, 0, 0)));
     event.setEndDateTime(QDateTime(QDate(2010, 1, 1), QTime(12, 0, 0)));
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
     rrule.setLimit(3);
-    event.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rrule);
+    event.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rrule);
     QVERIFY(m_om->saveItem(&event));
     QVERIFY(!event.localId().isNull());
     event = m_om->item(event.localId());
@@ -434,9 +434,9 @@ void tst_Maemo5Om::addEventExceptionWithGuid()
     christmas.setStartDateTime(QDateTime(QDate(2009, 12, 25), QTime(0, 0, 0)));
     christmas.setEndDateTime(QDateTime(QDate(2009, 12, 26), QTime(0, 0, 0)));
     christmas.setDisplayLabel(QLatin1String("Christmas"));
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-    christmas.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rrule);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+    christmas.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rrule);
     QVERIFY(m_om->saveItem(&christmas));
     QVERIFY(!christmas.id().managerUri().isEmpty());
     QVERIFY(!christmas.id().localId().isNull());
@@ -446,7 +446,7 @@ void tst_Maemo5Om::addEventExceptionWithGuid()
     newYearsDay.setStartDateTime(QDateTime(QDate(2010, 1, 1), QTime(0, 0, 0)));
     newYearsDay.setEndDateTime(QDateTime(QDate(2010, 1, 2), QTime(0, 0, 0)));
     newYearsDay.setDisplayLabel(QLatin1String("New Years Day"));
-    newYearsDay.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rrule);
+    newYearsDay.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rrule);
     QVERIFY(m_om->saveItem(&newYearsDay));
 
     QOrganizerTodo report;
@@ -464,13 +464,13 @@ void tst_Maemo5Om::addEventExceptionWithGuid()
     exception.setDisplayLabel(QLatin1String("Christmas"));
     exception.addComment(QLatin1String("With the in-laws"));
     QVERIFY(!m_om->saveItem(&exception));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // exception with invalid guid fails
     exception.setId(QOrganizerItemId());
     exception.setGuid(QLatin1String("halloween"));
     QVERIFY(!m_om->saveItem(&exception));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // with the guid set, it should work
     exception.setId(QOrganizerItemId());
@@ -496,19 +496,19 @@ void tst_Maemo5Om::addEventExceptionWithGuid()
     exception2.addComment(QLatin1String("With the in-laws"));
     exception2.setParentLocalId(report.localId()); // report is not an event
     QVERIFY(!m_om->saveItem(&exception2));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // can't set guid to a non-event
     exception2.setGuid(QLatin1String("report"));
     exception2.setParentLocalId(QOrganizerItemLocalId());
     QVERIFY(!m_om->saveItem(&exception2));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // can't make the guid inconsistent with the parentId
     exception2.setParentLocalId(christmas.localId());
     exception2.setGuid(QLatin1String("newyear"));
     QVERIFY(!m_om->saveItem(&exception2));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // with just the parentId set to a valid parent, it should work
     exception2.setGuid(QLatin1String(""));
@@ -527,7 +527,7 @@ void tst_Maemo5Om::addEventExceptionWithGuid()
     exception3.setParentLocalId(christmas.localId());
     exception3.setGuid(QLatin1String("christmas"));
     QVERIFY(!m_om->saveItem(&exception3));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // with original date, guid and parentId set and consistent, and localId=0, it should work
     exception3.setOriginalDate(QDate(2012, 12, 25));
@@ -548,11 +548,11 @@ void tst_Maemo5Om::removeEventWithRecurrence()
     event.setDescription("A daily recurring event");
 
     // Create recurrence
-    QOrganizerItemRecurrenceRule recurrenceRule;
+    QOrganizerRecurrenceRule recurrenceRule;
     recurrenceRule.setLimit(20);
-    recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
 
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules;
+    QSet<QOrganizerRecurrenceRule> recurrenceRules;
     recurrenceRules << recurrenceRule;
 
     // Set recurrence
@@ -560,7 +560,7 @@ void tst_Maemo5Om::removeEventWithRecurrence()
 
     // Save event
     QVERIFY(m_om->saveItem(&event));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event.id().localId().isNull());
     QVERIFY(event.id().managerUri().contains(managerName));
     QVERIFY(!event.guid().isEmpty());
@@ -583,7 +583,7 @@ void tst_Maemo5Om::removeEventWithRecurrence()
 
     // Remove event
     QVERIFY(m_om->removeItem(event.id().localId()));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
 
     // Fetch all event instances
     instances = m_om->itemInstances(event, QDateTime(QDate(2010,1,1), QTime(0,0,0)), QDateTime(QDate(2010,12,31), QTime(23,59,59)), 0);
@@ -603,11 +603,11 @@ void tst_Maemo5Om::removeEventExceptions()
     event.setDescription("A daily recurring event");
 
     // Create recurrence
-    QOrganizerItemRecurrenceRule recurrenceRule;
+    QOrganizerRecurrenceRule recurrenceRule;
     recurrenceRule.setLimit(10);
-    recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
 
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules;
+    QSet<QOrganizerRecurrenceRule> recurrenceRules;
     recurrenceRules << recurrenceRule;
 
     // Set recurrence
@@ -615,7 +615,7 @@ void tst_Maemo5Om::removeEventExceptions()
 
     // Save event
     QVERIFY(m_om->saveItem(&event));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event.id().localId().isNull());
     QVERIFY(event.id().managerUri().contains(managerName));
     QVERIFY(!event.guid().isEmpty());
@@ -674,14 +674,14 @@ void tst_Maemo5Om::addWithIllegalParameters()
 {
     // Save with null pointer as item
     QVERIFY(!m_om->saveItem(0));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::BadArgumentError);
+    QCOMPARE(m_om->error(), QOrganizerManager::BadArgumentError);
 
     QVERIFY(!m_om->saveItems(0));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::BadArgumentError);
+    QCOMPARE(m_om->error(), QOrganizerManager::BadArgumentError);
 
     QList<QOrganizerItem> items;
     QVERIFY(!m_om->saveItems(&items));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::BadArgumentError);
+    QCOMPARE(m_om->error(), QOrganizerManager::BadArgumentError);
 }
 
 void tst_Maemo5Om::getItemIds()
@@ -787,11 +787,11 @@ void tst_Maemo5Om::getItemInstances()
     event.setDescription("A daily recurring event");
 
     // Create recurrence
-    QOrganizerItemRecurrenceRule recurrenceRule;
+    QOrganizerRecurrenceRule recurrenceRule;
     recurrenceRule.setLimit(15);
-    recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
 
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules;
+    QSet<QOrganizerRecurrenceRule> recurrenceRules;
     recurrenceRules << recurrenceRule;
 
     // Set recurrence
@@ -799,7 +799,7 @@ void tst_Maemo5Om::getItemInstances()
 
     // Save event
     QVERIFY(m_om->saveItem(&event));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event.id().localId().isNull());
     QVERIFY(event.id().managerUri().contains(managerName));
     QVERIFY(!event.guid().isEmpty());
@@ -814,7 +814,7 @@ void tst_Maemo5Om::getItemInstances()
         occ.setDisplayLabel("getItemInstances");
         occ.setDescription("Exception occurrence");
         QVERIFY(m_om->saveItem(&occ));
-        QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+        QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     }
 
     // Get all the instances occurring in January 2010
@@ -845,7 +845,7 @@ void tst_Maemo5Om::setRecurrenceDates()
 
     // Save event
     QVERIFY(m_om->saveItem(&event));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event.id().localId().isNull());
     QVERIFY(event.id().managerUri().contains(managerName));
     QVERIFY(!event.guid().isEmpty());
@@ -998,7 +998,7 @@ void tst_Maemo5Om::saveItemsToNewCollection()
 
     // Save
     QVERIFY(m_om->saveItem(&event1));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!event1.id().localId().isNull());
     QVERIFY(event1.id().managerUri().contains(managerName));
     QVERIFY(!event1.guid().isEmpty());
@@ -1020,7 +1020,7 @@ void tst_Maemo5Om::saveItemsToNewCollection()
     QList<QOrganizerItem> items;
     items.append(event2);
     QVERIFY(m_om->saveItems(&items));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     foreach (QOrganizerItem item, items) {
         QVERIFY(!item.id().localId().isNull());
         QVERIFY(item.id().managerUri().contains(managerName));
@@ -1039,7 +1039,7 @@ void tst_Maemo5Om::saveItemsToNewCollection()
     QList<QOrganizerItem> items2;
     items2.append(event3);
     QVERIFY(m_om->saveItems(&items2));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(m_om->errorMap().count() == 0);
     foreach ( QOrganizerItem item2, items ) {
         QVERIFY(!item2.id().localId().isNull());
@@ -1056,11 +1056,11 @@ void tst_Maemo5Om::saveItemsToNewCollection()
     recurrenceEvent.setCollectionId(newCollection.id());
 
     // Create recurrence
-    QOrganizerItemRecurrenceRule recurrenceRule;
+    QOrganizerRecurrenceRule recurrenceRule;
     recurrenceRule.setLimit(10);
-    recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Weekly);
 
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules;
+    QSet<QOrganizerRecurrenceRule> recurrenceRules;
     recurrenceRules << recurrenceRule;
 
     // Set recurrence
@@ -1068,7 +1068,7 @@ void tst_Maemo5Om::saveItemsToNewCollection()
 
     // Save event
     QVERIFY(m_om->saveItem(&recurrenceEvent));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(!recurrenceEvent.id().localId().isNull());
     QVERIFY(recurrenceEvent.id().managerUri().contains(managerName));
     QVERIFY(!recurrenceEvent.guid().isEmpty());
@@ -1084,7 +1084,7 @@ void tst_Maemo5Om::saveItemsToNewCollection()
 
     // Save event occurrence - NOTE should automatically be saved in the parent's collection
     QVERIFY(m_om->saveItem(&recurrenceEventOccurrence));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QCOMPARE(recurrenceEventOccurrence.collectionId(), newCollection.id());
 
     // Try to fetch items
@@ -1199,7 +1199,7 @@ void tst_Maemo5Om::asynchronousSaveAndFetch()
     saveRequest.start();
 
     // Wait until the request processing begins (otherwise waitForFinished returns immediately)
-    while (saveRequest.state() == QOrganizerItemAbstractRequest::InactiveState)
+    while (saveRequest.state() == QOrganizerAbstractRequest::InactiveState)
         QThread::yieldCurrentThread();
 
     // Wait for request finished (should return true as there's no timeout)
@@ -1224,7 +1224,7 @@ void tst_Maemo5Om::asynchronousSaveAndFetch()
     fetchRequest.start();
 
     // Wait until the request processing begins (otherwise waitForFinished returns immediately)
-    while (fetchRequest.state() == QOrganizerItemAbstractRequest::InactiveState)
+    while (fetchRequest.state() == QOrganizerAbstractRequest::InactiveState)
         QThread::yieldCurrentThread();
 
     // Wait for request finished (should return true as there's no timeout)
@@ -1289,9 +1289,9 @@ void tst_Maemo5Om::consecutiveAsynchronousRequests()
     saveRequest3.start();
 
     // Wait until the request processing begins (otherwise waitForFinished returns immediately)
-    while (saveRequest1.state() == QOrganizerItemAbstractRequest::InactiveState ||
-           saveRequest2.state() == QOrganizerItemAbstractRequest::InactiveState ||
-           saveRequest3.state() == QOrganizerItemAbstractRequest::InactiveState) {
+    while (saveRequest1.state() == QOrganizerAbstractRequest::InactiveState ||
+           saveRequest2.state() == QOrganizerAbstractRequest::InactiveState ||
+           saveRequest3.state() == QOrganizerAbstractRequest::InactiveState) {
         QThread::yieldCurrentThread();
     }
 
@@ -1338,7 +1338,7 @@ void tst_Maemo5Om::deleteRequest()
     fetchRequest2->start();
 
     // Wait until the first request processing begins
-    while (fetchRequest1->state() == QOrganizerItemAbstractRequest::InactiveState)
+    while (fetchRequest1->state() == QOrganizerAbstractRequest::InactiveState)
         QThread::yieldCurrentThread();
 
     // Delete both requests
diff --git a/plugins/organizer/maemo6/qorganizermaemo6.cpp b/plugins/organizer/maemo6/qorganizermaemo6.cpp
index 46f5137d47..e7040957f3 100644
--- a/plugins/organizer/maemo6/qorganizermaemo6.cpp
+++ b/plugins/organizer/maemo6/qorganizermaemo6.cpp
@@ -45,7 +45,7 @@
 
 //QTM_USE_NAMESPACE
 
-QOrganizerItemManagerEngine* QOrganizerItemMaemo6Factory::engine(const QMap<QString, QString>& parameters, QOrganizerItemManager::Error* error)
+QOrganizerManagerEngine* QOrganizerItemMaemo6Factory::engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error)
 {
     Q_UNUSED(parameters);
 
@@ -102,7 +102,7 @@ int QOrganizerItemMaemo6Engine::managerVersion() const
     return 1;
 }
 
-QList<QOrganizerItem> QOrganizerItemMaemo6Engine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemMaemo6Engine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -125,7 +125,7 @@ QList<QOrganizerItem> QOrganizerItemMaemo6Engine::itemInstances(const QOrganizer
     */
 
     QOrganizerItemLocalId generatorId = generator.localId();
-    QString kId = static_cast<Maemo6ItemLocalId*>(QOrganizerItemManagerEngine::engineLocalItemId(generatorId))->toString();
+    QString kId = static_cast<Maemo6ItemLocalId*>(QOrganizerManagerEngine::engineLocalItemId(generatorId))->toString();
     Incidence* generatorIncidence = d->m_calendarBackend.incidence(kId);
     Incidence::List generatorList;
     generatorList.append(generatorIncidence);
@@ -163,15 +163,15 @@ QList<QOrganizerItem> QOrganizerItemMaemo6Engine::itemInstances(const QOrganizer
     return instances;
 }
 
-QList<QOrganizerItemLocalId> QOrganizerItemMaemo6Engine::itemIds(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItemLocalId> QOrganizerItemMaemo6Engine::itemIds(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const
 {
     QList<QOrganizerItem> ret = items(filter, sortOrders, QOrganizerItemFetchHint(), error);
 
     // TODO: we don't have to sort again since items() has done it for us
-    return QOrganizerItemManagerEngine::sortItems(ret, sortOrders);
+    return QOrganizerManagerEngine::sortItems(ret, sortOrders);
 }
 
-QList<QOrganizerItem> QOrganizerItemMaemo6Engine::items(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemMaemo6Engine::items(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(fetchHint);
     // TODO: optimise by using our own filters
@@ -192,20 +192,20 @@ QList<QOrganizerItem> QOrganizerItemMaemo6Engine::items(const QOrganizerItemFilt
 
     // Now filter them
     foreach(const QOrganizerItem& item, partiallyFilteredItems) {
-        if (QOrganizerItemManagerEngine::testFilter(filter, item)) {
-            QOrganizerItemManagerEngine::addSorted(&ret, item, sortOrders);
+        if (QOrganizerManagerEngine::testFilter(filter, item)) {
+            QOrganizerManagerEngine::addSorted(&ret, item, sortOrders);
         }
     }
 
     return ret;
 }
 
-QOrganizerItem QOrganizerItemMaemo6Engine::item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QOrganizerItem QOrganizerItemMaemo6Engine::item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(fetchHint);
     Incidence* theIncidence = incidence(itemId);
     if (!theIncidence) {
-        *error = QOrganizerItemManager::DoesNotExistError;
+        *error = QOrganizerManager::DoesNotExistError;
         return QOrganizerItem();
     }
     IncidenceToItemConverter converter(managerUri());
@@ -213,24 +213,24 @@ QOrganizerItem QOrganizerItemMaemo6Engine::item(const QOrganizerItemLocalId& ite
     if (converter.convertIncidenceToItem(theIncidence, &item)) {
         return item;
     } else {
-        *error = QOrganizerItemManager::DoesNotExistError;
+        *error = QOrganizerManager::DoesNotExistError;
         return QOrganizerItem();
     }
 }
 
-bool QOrganizerItemMaemo6Engine::saveItems(QList<QOrganizerItem>* items, const QOrganizerCollectionLocalId& collectionId, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo6Engine::saveItems(QList<QOrganizerItem>* items, const QOrganizerCollectionLocalId& collectionId, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     if (!items || collectionId != QOrganizerCollectionLocalId()) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
     }
 
     /*
         TODO
         The item passed in should be validated according to the schema.
     */
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     for (int i = 0; i < items->size(); i++) {
-        QOrganizerItemManager::Error thisError;
+        QOrganizerManager::Error thisError;
         QOrganizerItem item = items->at(i);
         if (saveItem(&item, &thisError)) {
             items->replace(i, item);
@@ -239,10 +239,10 @@ bool QOrganizerItemMaemo6Engine::saveItems(QList<QOrganizerItem>* items, const Q
             errorMap->insert(i, thisError);
         }
     }
-    return *error == QOrganizerItemManager::NoError;
+    return *error == QOrganizerManager::NoError;
 }
 
-bool QOrganizerItemMaemo6Engine::saveItem(QOrganizerItem* item,  QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo6Engine::saveItem(QOrganizerItem* item,  QOrganizerManager::Error* error)
 {
     // ensure that the organizeritem's details conform to their definitions
     if (!validateItem(*item, error)) {
@@ -263,69 +263,69 @@ bool QOrganizerItemMaemo6Engine::saveItem(QOrganizerItem* item,  QOrganizerItemM
     return false;
 }
 
-bool QOrganizerItemMaemo6Engine::removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo6Engine::removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     for (int i = 0; i < itemIds.size(); i++) {
         QOrganizerItemLocalId id = itemIds[i];
         Incidence* theIncidence = incidence(id);
         if (!theIncidence) {
-            *error = QOrganizerItemManager::DoesNotExistError;
-            errorMap->insert(i, QOrganizerItemManager::DoesNotExistError);
+            *error = QOrganizerManager::DoesNotExistError;
+            errorMap->insert(i, QOrganizerManager::DoesNotExistError);
             continue;
         }
         if (!d->m_calendarBackend.deleteIncidence(theIncidence)) {
-            *error = QOrganizerItemManager::UnspecifiedError;
-            errorMap->insert(i, QOrganizerItemManager::UnspecifiedError);
+            *error = QOrganizerManager::UnspecifiedError;
+            errorMap->insert(i, QOrganizerManager::UnspecifiedError);
         }
     }
-    return *error == QOrganizerItemManager::NoError;
+    return *error == QOrganizerManager::NoError;
 }
 
-QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemMaemo6Engine::detailDefinitions(const QString& itemType, QOrganizerItemManager::Error* error) const
+QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemMaemo6Engine::detailDefinitions(const QString& itemType, QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return schemaDefinitions().value(itemType);
 }
 
-QOrganizerItemDetailDefinition QOrganizerItemMaemo6Engine::detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error) const
+QOrganizerItemDetailDefinition QOrganizerItemMaemo6Engine::detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error) const
 {
     /* TODO - the default implementation just calls the base detailDefinitions function.  If that's inefficent, implement this */
-    return QOrganizerItemManagerEngine::detailDefinition(definitionId, itemType, error);
+    return QOrganizerManagerEngine::detailDefinition(definitionId, itemType, error);
 }
 
-bool QOrganizerItemMaemo6Engine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo6Engine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerManager::Error* error)
 {
     /* TODO - if you support adding custom fields, do that here.  Otherwise call the base functionality. */
-    return QOrganizerItemManagerEngine::saveDetailDefinition(def, itemType, error);
+    return QOrganizerManagerEngine::saveDetailDefinition(def, itemType, error);
 }
 
-bool QOrganizerItemMaemo6Engine::removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo6Engine::removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error)
 {
     /* TODO - if you support removing custom fields, do that here.  Otherwise call the base functionality. */
-    return QOrganizerItemManagerEngine::removeDetailDefinition(definitionId, itemType, error);
+    return QOrganizerManagerEngine::removeDetailDefinition(definitionId, itemType, error);
 }
 
-QOrganizerCollectionLocalId QOrganizerItemMaemo6Engine::defaultCollectionId(QOrganizerItemManager::Error* error) const
+QOrganizerCollectionLocalId QOrganizerItemMaemo6Engine::defaultCollectionId(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return QOrganizerCollectionLocalId(0);
 }
 
-QList<QOrganizerCollectionLocalId> QOrganizerItemMaemo6Engine::collectionIds(QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollectionLocalId> QOrganizerItemMaemo6Engine::collectionIds(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QList<QOrganizerCollectionLocalId> retn;
     retn << QOrganizerCollectionLocalId(0);
     return retn;
 }
 
-QList<QOrganizerCollection> QOrganizerItemMaemo6Engine::collections(const QList<QOrganizerCollectionLocalId>& collectionIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollection> QOrganizerItemMaemo6Engine::collections(const QList<QOrganizerCollectionLocalId>& collectionIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(errorMap);
     // XXX TODO: use error map, and fix implementation as per docs.
 
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QOrganizerCollection defaultCollection;
     defaultCollection.setId(QOrganizerCollectionId());
     QList<QOrganizerCollection> retn;
@@ -336,21 +336,21 @@ QList<QOrganizerCollection> QOrganizerItemMaemo6Engine::collections(const QList<
     return retn;
 }
 
-bool QOrganizerItemMaemo6Engine::saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo6Engine::saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error)
 {
     Q_UNUSED(collection)
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
-bool QOrganizerItemMaemo6Engine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMaemo6Engine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error)
 {
     Q_UNUSED(collectionId)
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
-bool QOrganizerItemMaemo6Engine::startRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemMaemo6Engine::startRequest(QOrganizerAbstractRequest* req)
 {
     /*
         TODO
@@ -389,20 +389,20 @@ bool QOrganizerItemMaemo6Engine::startRequest(QOrganizerItemAbstractRequest* req
         Return true if the request can be started, false otherwise.  You can set an error
         in the request if you like.
     */
-    return QOrganizerItemManagerEngine::startRequest(req);
+    return QOrganizerManagerEngine::startRequest(req);
 }
 
-bool QOrganizerItemMaemo6Engine::cancelRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemMaemo6Engine::cancelRequest(QOrganizerAbstractRequest* req)
 {
     /*
         TODO
 
         Cancel an in progress async request.  If not possible, return false from here.
     */
-    return QOrganizerItemManagerEngine::cancelRequest(req);
+    return QOrganizerManagerEngine::cancelRequest(req);
 }
 
-bool QOrganizerItemMaemo6Engine::waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs)
+bool QOrganizerItemMaemo6Engine::waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs)
 {
     /*
         TODO
@@ -416,10 +416,10 @@ bool QOrganizerItemMaemo6Engine::waitForRequestFinished(QOrganizerItemAbstractRe
 
         It's best to avoid processing events, if you can, or at least only process non-UI events.
     */
-    return QOrganizerItemManagerEngine::waitForRequestFinished(req, msecs);
+    return QOrganizerManagerEngine::waitForRequestFinished(req, msecs);
 }
 
-void QOrganizerItemMaemo6Engine::requestDestroyed(QOrganizerItemAbstractRequest* req)
+void QOrganizerItemMaemo6Engine::requestDestroyed(QOrganizerAbstractRequest* req)
 {
     /*
         TODO
@@ -440,23 +440,23 @@ void QOrganizerItemMaemo6Engine::requestDestroyed(QOrganizerItemAbstractRequest*
         ordering problems :D
 
     */
-    return QOrganizerItemManagerEngine::requestDestroyed(req);
+    return QOrganizerManagerEngine::requestDestroyed(req);
 }
 
-bool QOrganizerItemMaemo6Engine::hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& itemType) const
+bool QOrganizerItemMaemo6Engine::hasFeature(QOrganizerManager::ManagerFeature feature, const QString& itemType) const
 {
     // TODO - the answer to the question may depend on the type
     Q_UNUSED(itemType);
     switch(feature) {
-        case QOrganizerItemManager::MutableDefinitions:
+        case QOrganizerManager::MutableDefinitions:
             // TODO If you support save/remove detail definition, return true
             return false;
 
-        case QOrganizerItemManager::Anonymous:
+        case QOrganizerManager::Anonymous:
             // TODO if this engine is anonymous (e.g. no other engine can share the data) return true
             // (mostly for an in memory engine)
             return false;
-        case QOrganizerItemManager::ChangeLogs:
+        case QOrganizerManager::ChangeLogs:
             // TODO if this engine supports filtering by last modified/created/removed timestamps, return true
             return false;
     }
@@ -502,7 +502,7 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMaem
     if (d->m_definitions.isEmpty()) {
         // Loop through default schema definitions
         QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > schema
-                = QOrganizerItemManagerEngine::schemaDefinitions();
+                = QOrganizerManagerEngine::schemaDefinitions();
         foreach (const QString& itemType, schema.keys()) {
             // Only add the item types that we support
             if (itemType == QOrganizerItemType::TypeEvent ||
@@ -524,7 +524,7 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMaem
                         it.key() == QOrganizerItemDescription::DefinitionName ||
                         it.key() == QOrganizerItemDisplayLabel::DefinitionName ||
                         it.key() == QOrganizerItemRecurrence::DefinitionName ||
-                        it.key() == QOrganizerEventTimeRange::DefinitionName ||
+                        it.key() == QOrganizerEventTime::DefinitionName ||
                         it.key() == QOrganizerItemGuid::DefinitionName ||
                         it.key() == QOrganizerItemInstanceOrigin::DefinitionName) {
                         supportedDefinitions.insert(it.key(), it.value());
@@ -539,7 +539,7 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMaem
 
 Incidence* QOrganizerItemMaemo6Engine::incidence(const QOrganizerItemLocalId& itemId) const
 {
-    QString kId = static_cast<Maemo6ItemLocalId*>(QOrganizerItemManagerEngine::engineLocalItemId(itemId))->toString();
+    QString kId = static_cast<Maemo6ItemLocalId*>(QOrganizerManagerEngine::engineLocalItemId(itemId))->toString();
     return d->m_calendarBackend.incidence(kId);
 }
 
@@ -547,7 +547,7 @@ Incidence* QOrganizerItemMaemo6Engine::incidence(const QOrganizerItemLocalId& it
  * Saves \a item to the manager, but doesn't persist the change to disk.
  * Sets \a error appropriately if if couldn't be saved.
  */
-Incidence* QOrganizerItemMaemo6Engine::softSaveItem(QOrganizerItem* item, QOrganizerItemManager::Error* error)
+Incidence* QOrganizerItemMaemo6Engine::softSaveItem(QOrganizerItem* item, QOrganizerManager::Error* error)
 {
     bool itemIsNew = (managerUri() != item->id().managerUri()
             || item->localId().isNull());
@@ -584,14 +584,14 @@ Incidence* QOrganizerItemMaemo6Engine::softSaveItem(QOrganizerItem* item, QOrgan
         QOrganizerJournal* journal = static_cast<QOrganizerJournal*>(item);
         newIncidence = createKJournal(*journal);
     } else {
-        *error = QOrganizerItemManager::InvalidItemTypeError;
+        *error = QOrganizerManager::InvalidItemTypeError;
         return 0;
     }
     if (itemIsNew) {
         if (itemIsOccurrence) {
             Incidence* parentIncidence = incidence(parentLocalId);
             if (!parentIncidence) {
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
                 return 0;
             }
             Incidence* detachedIncidence = d->m_calendarBackend.dissociateOccurrence(
@@ -607,7 +607,7 @@ Incidence* QOrganizerItemMaemo6Engine::softSaveItem(QOrganizerItem* item, QOrgan
         } else {
             Incidence* oldIncidence = incidence(item->localId());
             if (!oldIncidence) {
-                *error = QOrganizerItemManager::DoesNotExistError;
+                *error = QOrganizerManager::DoesNotExistError;
                 return 0;
             }
             QString uid = oldIncidence->uid();
@@ -617,7 +617,7 @@ Incidence* QOrganizerItemMaemo6Engine::softSaveItem(QOrganizerItem* item, QOrgan
         }
     }
     d->m_calendarBackend.addIncidence(newIncidence);
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return newIncidence;
 }
 
@@ -693,7 +693,7 @@ void QOrganizerItemMaemo6Engine::convertQRecurrenceToKRecurrence(
         kRecurrence->deleteRRule(rrule);
     }
 
-    foreach (const QOrganizerItemRecurrenceRule& rrule, qRecurrence.recurrenceRules()) {
+    foreach (const QOrganizerRecurrenceRule& rrule, qRecurrence.recurrenceRules()) {
         RecurrenceRule* krrule = createKRecurrenceRule(kRecurrence, rrule);
         kRecurrence->addRRule(krrule);
     }
@@ -701,20 +701,20 @@ void QOrganizerItemMaemo6Engine::convertQRecurrenceToKRecurrence(
 
 RecurrenceRule* QOrganizerItemMaemo6Engine::createKRecurrenceRule(
         Recurrence* kRecurrence,
-        const QOrganizerItemRecurrenceRule& qRRule)
+        const QOrganizerRecurrenceRule& qRRule)
 {
     RecurrenceRule* kRRule = kRecurrence->defaultRRule(true);
     switch (qRRule.frequency()) {
-        case QOrganizerItemRecurrenceRule::Daily:
+        case QOrganizerRecurrenceRule::Daily:
             kRRule->setRecurrenceType(RecurrenceRule::rDaily);
             break;
-        case QOrganizerItemRecurrenceRule::Weekly:
+        case QOrganizerRecurrenceRule::Weekly:
             kRRule->setRecurrenceType(RecurrenceRule::rWeekly);
             break;
-        case QOrganizerItemRecurrenceRule::Monthly:
+        case QOrganizerRecurrenceRule::Monthly:
             kRRule->setRecurrenceType(RecurrenceRule::rMonthly);
             break;
-        case QOrganizerItemRecurrenceRule::Yearly:
+        case QOrganizerRecurrenceRule::Yearly:
             kRRule->setRecurrenceType(RecurrenceRule::rYearly);
             break;
     }
@@ -735,7 +735,7 @@ RecurrenceRule* QOrganizerItemMaemo6Engine::createKRecurrenceRule(
     kRRule->setByWeekNumbers(qRRule.weeksOfYear());
 
     QList<int> months;
-    foreach (QOrganizerItemRecurrenceRule::Month month, qRRule.months()) {
+    foreach (QOrganizerRecurrenceRule::Month month, qRRule.months()) {
         months.append((int)month);
     }
     kRRule->setByMonths(months);
diff --git a/plugins/organizer/maemo6/qorganizermaemo6.h b/plugins/organizer/maemo6/qorganizermaemo6.h
index 76a7e71d58..894fe6b6cc 100644
--- a/plugins/organizer/maemo6/qorganizermaemo6.h
+++ b/plugins/organizer/maemo6/qorganizermaemo6.h
@@ -68,11 +68,11 @@
 #include <extendedcalendar.h>
 
 #include "qorganizeritem.h"
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanagerengine.h"
-#include "qorganizeritemmanagerenginefactory.h"
+#include "qorganizermanager.h"
+#include "qorganizermanagerengine.h"
+#include "qorganizermanagerenginefactory.h"
 #include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemchangeset.h"
 
 QTM_BEGIN_NAMESPACE
@@ -81,18 +81,18 @@ class QOrganizerTodo;
 class QOrganizerNote;
 class QOrganizerJournal;
 class QOrganizerItemRecurrence;
-class QOrganizerItemRecurrenceRule;
+class QOrganizerRecurrenceRule;
 QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
 using namespace KCal;
 
-class QOrganizerItemMaemo6Factory : public QObject, public QOrganizerItemManagerEngineFactory
+class QOrganizerItemMaemo6Factory : public QObject, public QOrganizerManagerEngineFactory
 {
   Q_OBJECT
-  Q_INTERFACES(QtMobility::QOrganizerItemManagerEngineFactory)
+  Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
-    QOrganizerItemManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerItemManager::Error*);
+    QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error*);
     QString managerName() const;
     QOrganizerItemEngineLocalId* createItemEngineLocalId() const;
     QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId() const;
@@ -117,7 +117,7 @@ public:
     ExtendedCalendar m_calendarBackend;
 };
 
-class QOrganizerItemMaemo6Engine : public QOrganizerItemManagerEngine
+class QOrganizerItemMaemo6Engine : public QOrganizerManagerEngine
 {
     Q_OBJECT
 
@@ -129,45 +129,45 @@ public:
     QMap<QString, QString> managerParameters() const;
     int managerVersion() const;
 
-    QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerItemLocalId> itemIds(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerItem> items(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    QOrganizerItem item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
+    QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, QOrganizerManager::Error* error) const;
+    QList<QOrganizerItemLocalId> itemIds(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const;
+    QList<QOrganizerItem> items(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    QOrganizerItem item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
 
-    bool saveItems(QList<QOrganizerItem>* items, const QOrganizerCollectionLocalId& collectionId, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
-    bool saveItem(QOrganizerItem* item, QOrganizerItemManager::Error* error);
-    bool removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
+    bool saveItems(QList<QOrganizerItem>* items, const QOrganizerCollectionLocalId& collectionId, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
+    bool saveItem(QOrganizerItem* item, QOrganizerManager::Error* error);
+    bool removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
 
     /* Definitions - Accessors and Mutators */
-    QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& itemType, QOrganizerItemManager::Error* error) const;
-    QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error) const;
-    bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerItemManager::Error* error);
-    bool removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error);
+    QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& itemType, QOrganizerManager::Error* error) const;
+    QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error) const;
+    bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerManager::Error* error);
+    bool removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error);
 
     /* Collections - every item belongs to exactly one collection */
-    QOrganizerCollectionLocalId defaultCollectionId(QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerCollectionLocalId> collectionIds(QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerCollection> collections(const QList<QOrganizerCollectionLocalId>& collectionIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error) const;
-    bool saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error);
-    bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error);
+    QOrganizerCollectionLocalId defaultCollectionId(QOrganizerManager::Error* error) const;
+    QList<QOrganizerCollectionLocalId> collectionIds(QOrganizerManager::Error* error) const;
+    QList<QOrganizerCollection> collections(const QList<QOrganizerCollectionLocalId>& collectionIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error) const;
+    bool saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error);
+    bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error);
 
     /* Capabilities reporting */
-    bool hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& itemType) const;
+    bool hasFeature(QOrganizerManager::ManagerFeature feature, const QString& itemType) const;
     bool isFilterSupported(const QOrganizerItemFilter& filter) const;
     QList<int> supportedDataTypes() const;
     QStringList supportedItemTypes() const;
 
     /* Asynchronous Request Support */
-    void requestDestroyed(QOrganizerItemAbstractRequest* req);
-    bool startRequest(QOrganizerItemAbstractRequest* req);
-    bool cancelRequest(QOrganizerItemAbstractRequest* req);
-    bool waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs);
+    void requestDestroyed(QOrganizerAbstractRequest* req);
+    bool startRequest(QOrganizerAbstractRequest* req);
+    bool cancelRequest(QOrganizerAbstractRequest* req);
+    bool waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs);
 
 private:
     QOrganizerItemMaemo6Engine();
     QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > schemaDefinitions() const;
     Incidence* incidence(const QOrganizerItemLocalId& itemId) const;
-    Incidence* softSaveItem(QOrganizerItem* item, QOrganizerItemManager::Error* error);
+    Incidence* softSaveItem(QOrganizerItem* item, QOrganizerManager::Error* error);
     Event* createKEvent(const QOrganizerEvent& note);
     Todo* createKTodo(const QOrganizerTodo& note);
     Journal* createKJournal(const QOrganizerJournal& note);
@@ -176,7 +176,7 @@ private:
     void convertQRecurrenceToKRecurrence(const QOrganizerItemRecurrence& qRecurrence,
             Recurrence* kRecurrence);
     RecurrenceRule* createKRecurrenceRule(Recurrence* kRecurrence,
-            const QOrganizerItemRecurrenceRule& rrule);
+            const QOrganizerRecurrenceRule& rrule);
 
     QOrganizerItemMaemo6EngineData* d;
 
diff --git a/plugins/organizer/skeleton/qorganizerskeleton.cpp b/plugins/organizer/skeleton/qorganizerskeleton.cpp
index a19fd87535..95460f1a9f 100644
--- a/plugins/organizer/skeleton/qorganizerskeleton.cpp
+++ b/plugins/organizer/skeleton/qorganizerskeleton.cpp
@@ -44,7 +44,7 @@
 
 //QTM_USE_NAMESPACE
 
-QOrganizerItemManagerEngine* QOrganizerItemSkeletonFactory::engine(const QMap<QString, QString>& parameters, QOrganizerItemManager::Error* error)
+QOrganizerManagerEngine* QOrganizerItemSkeletonFactory::engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error)
 {
     Q_UNUSED(parameters);
     Q_UNUSED(error);
@@ -533,7 +533,7 @@ int QOrganizerItemSkeletonEngine::managerVersion() const
     return 1;
 }
 
-QList<QOrganizerItem> QOrganizerItemSkeletonEngine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemSkeletonEngine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -555,10 +555,10 @@ QList<QOrganizerItem> QOrganizerItemSkeletonEngine::itemInstances(const QOrganiz
         We might change the signature to split up the periodStart + periodEnd / periodStart + maxCount cases.
     */
 
-    return QOrganizerItemManagerEngine::itemInstances(generator, periodStart, periodEnd, maxCount, fetchHint, error);
+    return QOrganizerManagerEngine::itemInstances(generator, periodStart, periodEnd, maxCount, fetchHint, error);
 }
 
-QList<QOrganizerItemLocalId> QOrganizerItemSkeletonEngine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItemLocalId> QOrganizerItemSkeletonEngine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -571,21 +571,21 @@ QList<QOrganizerItemLocalId> QOrganizerItemSkeletonEngine::itemIds(const QDateTi
         If you do have to fetch, consider setting a fetch hint that restricts the information to that needed for filtering/sorting.
     */
 
-    *error = QOrganizerItemManager::NotSupportedError; // TODO <- remove this
+    *error = QOrganizerManager::NotSupportedError; // TODO <- remove this
 
     QList<QOrganizerItem> partiallyFilteredItems; // = ..., your code here.. [TODO]
     QList<QOrganizerItem> ret;
 
     foreach(const QOrganizerItem& item, partiallyFilteredItems) {
-        if (QOrganizerItemManagerEngine::isItemBetweenDates(item, startDate, endDate) && QOrganizerItemManagerEngine::testFilter(filter, item)) {
+        if (QOrganizerManagerEngine::isItemBetweenDates(item, startDate, endDate) && QOrganizerManagerEngine::testFilter(filter, item)) {
             ret.append(item);
         }
     }
 
-    return QOrganizerItemManagerEngine::sortItems(ret, sortOrders);
+    return QOrganizerManagerEngine::sortItems(ret, sortOrders);
 }
 
-QList<QOrganizerItem> QOrganizerItemSkeletonEngine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemSkeletonEngine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -600,14 +600,14 @@ QList<QOrganizerItem> QOrganizerItemSkeletonEngine::items(const QDateTime& start
     */
 
     Q_UNUSED(fetchHint);
-    *error = QOrganizerItemManager::NotSupportedError; // TODO <- remove this
+    *error = QOrganizerManager::NotSupportedError; // TODO <- remove this
 
     QList<QOrganizerItem> partiallyFilteredItems; // = ..., your code here.. [TODO]
     QList<QOrganizerItem> ret;
 
     foreach(const QOrganizerItem& item, partiallyFilteredItems) {
-        if (QOrganizerItemManagerEngine::isItemBetweenDates(item, startDate, endDate) && QOrganizerItemManagerEngine::testFilter(filter, item)) {
-            QOrganizerItemManagerEngine::addSorted(&ret, item, sortOrders);
+        if (QOrganizerManagerEngine::isItemBetweenDates(item, startDate, endDate) && QOrganizerManagerEngine::testFilter(filter, item)) {
+            QOrganizerManagerEngine::addSorted(&ret, item, sortOrders);
         }
     }
 
@@ -621,7 +621,7 @@ QList<QOrganizerItem> QOrganizerItemSkeletonEngine::items(const QDateTime& start
     return ret;
 }
 
-QOrganizerItem QOrganizerItemSkeletonEngine::item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QOrganizerItem QOrganizerItemSkeletonEngine::item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -632,10 +632,10 @@ QOrganizerItem QOrganizerItemSkeletonEngine::item(const QOrganizerItemLocalId& i
         fetch at least what is mentioned in the fetch hint).
 
     */
-    return QOrganizerItemManagerEngine::item(itemId, fetchHint, error);
+    return QOrganizerManagerEngine::item(itemId, fetchHint, error);
 }
 
-bool QOrganizerItemSkeletonEngine::saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemSkeletonEngine::saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     /*
         TODO
@@ -654,11 +654,11 @@ bool QOrganizerItemSkeletonEngine::saveItems(QList<QOrganizerItem>* items, QMap<
 
         The item passed in should be validated according to the schema.
     */
-    return QOrganizerItemManagerEngine::saveItems(items, errorMap, error);
+    return QOrganizerManagerEngine::saveItems(items, errorMap, error);
 
 }
 
-bool QOrganizerItemSkeletonEngine::removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemSkeletonEngine::removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     /*
         TODO
@@ -670,35 +670,35 @@ bool QOrganizerItemSkeletonEngine::removeItems(const QList<QOrganizerItemLocalId
 
         DoesNotExistError should be used if the id refers to a non existent item.
     */
-    return QOrganizerItemManagerEngine::removeItems(itemIds, errorMap, error);
+    return QOrganizerManagerEngine::removeItems(itemIds, errorMap, error);
 }
 
-QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemSkeletonEngine::detailDefinitions(const QString& itemType, QOrganizerItemManager::Error* error) const
+QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemSkeletonEngine::detailDefinitions(const QString& itemType, QOrganizerManager::Error* error) const
 {
     /* TODO - once you know what your engine will support, implement this properly.  One way is to call the base version, and add/remove things as needed */
-    return QOrganizerItemManagerEngine::detailDefinitions(itemType, error);
+    return QOrganizerManagerEngine::detailDefinitions(itemType, error);
 }
 
-QOrganizerItemDetailDefinition QOrganizerItemSkeletonEngine::detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error) const
+QOrganizerItemDetailDefinition QOrganizerItemSkeletonEngine::detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error) const
 {
     /* TODO - the default implementation just calls the base detailDefinitions function.  If that's inefficent, implement this */
-    return QOrganizerItemManagerEngine::detailDefinition(definitionId, itemType, error);
+    return QOrganizerManagerEngine::detailDefinition(definitionId, itemType, error);
 }
 
-bool QOrganizerItemSkeletonEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerItemManager::Error* error)
+bool QOrganizerItemSkeletonEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerManager::Error* error)
 {
     /* TODO - if you support adding custom fields, do that here.  Otherwise call the base functionality. */
-    return QOrganizerItemManagerEngine::saveDetailDefinition(def, itemType, error);
+    return QOrganizerManagerEngine::saveDetailDefinition(def, itemType, error);
 }
 
-bool QOrganizerItemSkeletonEngine::removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error)
+bool QOrganizerItemSkeletonEngine::removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error)
 {
     /* TODO - if you support removing custom fields, do that here.  Otherwise call the base functionality. */
-    return QOrganizerItemManagerEngine::removeDetailDefinition(definitionId, itemType, error);
+    return QOrganizerManagerEngine::removeDetailDefinition(definitionId, itemType, error);
 }
 
 
-QOrganizerCollection QOrganizerItemSkeletonEngine::defaultCollection(QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemSkeletonEngine::defaultCollection(QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -710,10 +710,10 @@ QOrganizerCollection QOrganizerItemSkeletonEngine::defaultCollection(QOrganizerI
         There is always at least one collection in a manager, and all items are
         saved in exactly one collection.
      */
-    return QOrganizerItemManagerEngine::defaultCollection(error);
+    return QOrganizerManagerEngine::defaultCollection(error);
 }
 
-QOrganizerCollection QOrganizerItemSkeletonEngine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemSkeletonEngine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -722,10 +722,10 @@ QOrganizerCollection QOrganizerItemSkeletonEngine::collection(const QOrganizerCo
         Prior to saving items, clients will set which collection the item will/should
         be saved by calling item->setCollectionId().
      */
-    return QOrganizerItemManagerEngine::collection(collectionId, error);
+    return QOrganizerManagerEngine::collection(collectionId, error);
 }
 
-QList<QOrganizerCollection> QOrganizerItemSkeletonEngine::collections(QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollection> QOrganizerItemSkeletonEngine::collections(QOrganizerManager::Error* error) const
 {
     /*
         TODO
@@ -735,10 +735,10 @@ QList<QOrganizerCollection> QOrganizerItemSkeletonEngine::collections(QOrganizer
         collections, others will not.  A collection can have properties
         like colour, description, perhaps a priority, etc etc.
      */
-    return QOrganizerItemManagerEngine::collections(error);
+    return QOrganizerManagerEngine::collections(error);
 }
 
-bool QOrganizerItemSkeletonEngine::saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error)
+bool QOrganizerItemSkeletonEngine::saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error)
 {
     /*
         TODO
@@ -747,10 +747,10 @@ bool QOrganizerItemSkeletonEngine::saveCollection(QOrganizerCollection* collecti
         mutable collections.  If the backend does support mutable collections, it
         should report that it supports the MutableCollections manager feature.
      */
-    return QOrganizerItemManagerEngine::saveCollection(collection, error);
+    return QOrganizerManagerEngine::saveCollection(collection, error);
 }
 
-bool QOrganizerItemSkeletonEngine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error)
+bool QOrganizerItemSkeletonEngine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error)
 {
     /*
         TODO
@@ -766,10 +766,10 @@ bool QOrganizerItemSkeletonEngine::removeCollection(const QOrganizerCollectionLo
         the backend may decide whether to fail (with a permissions error) or to
         succeed and arbitrarily choose another collection to be the default collection.
      */
-    return QOrganizerItemManagerEngine::removeCollection(collectionId, error);
+    return QOrganizerManagerEngine::removeCollection(collectionId, error);
 }
 
-bool QOrganizerItemSkeletonEngine::startRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemSkeletonEngine::startRequest(QOrganizerAbstractRequest* req)
 {
     /*
         TODO
@@ -808,20 +808,20 @@ bool QOrganizerItemSkeletonEngine::startRequest(QOrganizerItemAbstractRequest* r
         Return true if the request can be started, false otherwise.  You can set an error
         in the request if you like.
     */
-    return QOrganizerItemManagerEngine::startRequest(req);
+    return QOrganizerManagerEngine::startRequest(req);
 }
 
-bool QOrganizerItemSkeletonEngine::cancelRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemSkeletonEngine::cancelRequest(QOrganizerAbstractRequest* req)
 {
     /*
         TODO
 
         Cancel an in progress async request.  If not possible, return false from here.
     */
-    return QOrganizerItemManagerEngine::cancelRequest(req);
+    return QOrganizerManagerEngine::cancelRequest(req);
 }
 
-bool QOrganizerItemSkeletonEngine::waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs)
+bool QOrganizerItemSkeletonEngine::waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs)
 {
     /*
         TODO
@@ -835,10 +835,10 @@ bool QOrganizerItemSkeletonEngine::waitForRequestFinished(QOrganizerItemAbstract
 
         It's best to avoid processing events, if you can, or at least only process non-UI events.
     */
-    return QOrganizerItemManagerEngine::waitForRequestFinished(req, msecs);
+    return QOrganizerManagerEngine::waitForRequestFinished(req, msecs);
 }
 
-void QOrganizerItemSkeletonEngine::requestDestroyed(QOrganizerItemAbstractRequest* req)
+void QOrganizerItemSkeletonEngine::requestDestroyed(QOrganizerAbstractRequest* req)
 {
     /*
         TODO
@@ -859,23 +859,23 @@ void QOrganizerItemSkeletonEngine::requestDestroyed(QOrganizerItemAbstractReques
         ordering problems :D
 
     */
-    return QOrganizerItemManagerEngine::requestDestroyed(req);
+    return QOrganizerManagerEngine::requestDestroyed(req);
 }
 
-bool QOrganizerItemSkeletonEngine::hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& itemType) const
+bool QOrganizerItemSkeletonEngine::hasFeature(QOrganizerManager::ManagerFeature feature, const QString& itemType) const
 {
     // TODO - the answer to the question may depend on the type
     Q_UNUSED(itemType);
     switch(feature) {
-        case QOrganizerItemManager::MutableDefinitions:
+        case QOrganizerManager::MutableDefinitions:
             // TODO If you support save/remove detail definition, return true
             return false;
 
-        case QOrganizerItemManager::Anonymous:
+        case QOrganizerManager::Anonymous:
             // TODO if this engine is anonymous (e.g. no other engine can share the data) return true
             // (mostly for an in memory engine)
             return false;
-        case QOrganizerItemManager::ChangeLogs:
+        case QOrganizerManager::ChangeLogs:
             // TODO if this engine supports filtering by last modified/created/removed timestamps, return true
             return false;
     }
diff --git a/plugins/organizer/skeleton/qorganizerskeleton_p.h b/plugins/organizer/skeleton/qorganizerskeleton_p.h
index 3fadee158a..6d8d85aefa 100644
--- a/plugins/organizer/skeleton/qorganizerskeleton_p.h
+++ b/plugins/organizer/skeleton/qorganizerskeleton_p.h
@@ -65,23 +65,23 @@
 #include <QObject>
 
 #include "qorganizeritem.h"
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanagerengine.h"
-#include "qorganizeritemmanagerenginefactory.h"
+#include "qorganizermanager.h"
+#include "qorganizermanagerengine.h"
+#include "qorganizermanagerenginefactory.h"
 #include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemchangeset.h"
 #include "qorganizeritemenginelocalid.h"
 #include "qorganizercollectionenginelocalid.h"
 
 QTM_USE_NAMESPACE
 
-class QOrganizerItemSkeletonFactory : public QObject, public QOrganizerItemManagerEngineFactory
+class QOrganizerItemSkeletonFactory : public QObject, public QOrganizerManagerEngineFactory
 {
   Q_OBJECT
-  Q_INTERFACES(QtMobility::QOrganizerItemManagerEngineFactory)
+  Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
-    QOrganizerItemManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerItemManager::Error*);
+    QOrganizerManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error*);
     QOrganizerItemEngineLocalId* createItemEngineLocalId() const;
     QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId() const;
     QString managerName() const;
@@ -166,7 +166,7 @@ public:
     }
 };
 
-class QOrganizerItemSkeletonEngine : public QOrganizerItemManagerEngine
+class QOrganizerItemSkeletonEngine : public QOrganizerManagerEngine
 {
     Q_OBJECT
 
@@ -180,38 +180,38 @@ public:
     QMap<QString, QString> managerParameters() const;
     int managerVersion() const;
 
-    QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    QOrganizerItem item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
+    QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const;
+    QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    QOrganizerItem item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
 
-    bool saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
-    bool removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
+    bool saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
+    bool removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
 
     /* Definitions - Accessors and Mutators */
-    QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& itemType, QOrganizerItemManager::Error* error) const;
-    QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error) const;
-    bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerItemManager::Error* error);
-    bool removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error);
+    QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& itemType, QOrganizerManager::Error* error) const;
+    QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error) const;
+    bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerManager::Error* error);
+    bool removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error);
 
     /* Collections - every item belongs to exactly one collection */
-    QOrganizerCollection defaultCollection(QOrganizerItemManager::Error* error) const;
-    QOrganizerCollection collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const;
-    QList<QOrganizerCollection> collections(QOrganizerItemManager::Error* error) const;
-    bool saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error);
-    bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error);
+    QOrganizerCollection defaultCollection(QOrganizerManager::Error* error) const;
+    QOrganizerCollection collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const;
+    QList<QOrganizerCollection> collections(QOrganizerManager::Error* error) const;
+    bool saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error);
+    bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error);
 
     /* Capabilities reporting */
-    bool hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& itemType) const;
+    bool hasFeature(QOrganizerManager::ManagerFeature feature, const QString& itemType) const;
     bool isFilterSupported(const QOrganizerItemFilter& filter) const;
     QList<int> supportedDataTypes() const;
     QStringList supportedItemTypes() const;
 
     /* Asynchronous Request Support */
-    void requestDestroyed(QOrganizerItemAbstractRequest* req);
-    bool startRequest(QOrganizerItemAbstractRequest* req);
-    bool cancelRequest(QOrganizerItemAbstractRequest* req);
-    bool waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs);
+    void requestDestroyed(QOrganizerAbstractRequest* req);
+    bool startRequest(QOrganizerAbstractRequest* req);
+    bool cancelRequest(QOrganizerAbstractRequest* req);
+    bool waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs);
 
 private:
     QOrganizerItemSkeletonEngineData* d;
diff --git a/plugins/organizer/symbian/organizeritemrequestserviceprovider.cpp b/plugins/organizer/symbian/organizeritemrequestserviceprovider.cpp
index ad832a82f4..f59b6e60df 100644
--- a/plugins/organizer/symbian/organizeritemrequestserviceprovider.cpp
+++ b/plugins/organizer/symbian/organizeritemrequestserviceprovider.cpp
@@ -81,7 +81,7 @@ COrganizerItemRequestsServiceProvider::~COrganizerItemRequestsServiceProvider()
 
 // Start processing aReq request to be processed asynchronously
 bool COrganizerItemRequestsServiceProvider::StartRequest(
-        QOrganizerItemAbstractRequest* aReq)
+        QOrganizerAbstractRequest* aReq)
 {
     if (!IsActive()) {
         // Store the request to be processed
@@ -90,67 +90,67 @@ bool COrganizerItemRequestsServiceProvider::StartRequest(
         Reset();
 
         switch (iReq->type()) {
-        case QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest:
+        case QOrganizerAbstractRequest::DetailDefinitionRemoveRequest:
             {
                 // Special case, removing detail definitions not supported
-                QOrganizerItemManagerEngine::updateDefinitionRemoveRequest(
+                QOrganizerManagerEngine::updateDefinitionRemoveRequest(
                     static_cast<QOrganizerItemDetailDefinitionRemoveRequest *>(iReq),
-                    QOrganizerItemManager::NotSupportedError,
-                    QMap<int, QOrganizerItemManager::Error>(),
-                    QOrganizerItemAbstractRequest::FinishedState);
+                    QOrganizerManager::NotSupportedError,
+                    QMap<int, QOrganizerManager::Error>(),
+                    QOrganizerAbstractRequest::FinishedState);
             }
             return false;
-        case QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest:
+        case QOrganizerAbstractRequest::DetailDefinitionSaveRequest:
             {
                 // Special case, saving detail definitions not supported
-                QOrganizerItemManagerEngine::updateDefinitionSaveRequest(
+                QOrganizerManagerEngine::updateDefinitionSaveRequest(
                     static_cast<QOrganizerItemDetailDefinitionSaveRequest *>(iReq),
                     QList<QOrganizerItemDetailDefinition>(),
-                    QOrganizerItemManager::NotSupportedError,
-                    QMap<int, QOrganizerItemManager::Error>(),
-                    QOrganizerItemAbstractRequest::FinishedState);
+                    QOrganizerManager::NotSupportedError,
+                    QMap<int, QOrganizerManager::Error>(),
+                    QOrganizerAbstractRequest::FinishedState);
             }
             return false;
 #ifndef SYMBIAN_CALENDAR_V2
-        case QOrganizerItemAbstractRequest::CollectionRemoveRequest :
+        case QOrganizerAbstractRequest::CollectionRemoveRequest :
             {
                 // Special case, removing a collection not supported
-                QOrganizerItemManagerEngine::updateCollectionRemoveRequest(
+                QOrganizerManagerEngine::updateCollectionRemoveRequest(
                     static_cast<QOrganizerCollectionRemoveRequest *>(iReq),
-                    QOrganizerItemManager::NotSupportedError,
-                    QMap<int, QOrganizerItemManager::Error>(),
-                    QOrganizerItemAbstractRequest::FinishedState);
+                    QOrganizerManager::NotSupportedError,
+                    QMap<int, QOrganizerManager::Error>(),
+                    QOrganizerAbstractRequest::FinishedState);
             }
             return false;                
-        case QOrganizerItemAbstractRequest::CollectionSaveRequest :
+        case QOrganizerAbstractRequest::CollectionSaveRequest :
             {
                 // Special case, saving a collection not supported
-                QOrganizerItemManagerEngine::updateCollectionSaveRequest(
+                QOrganizerManagerEngine::updateCollectionSaveRequest(
                     static_cast<QOrganizerCollectionSaveRequest *>(iReq),
                     QList<QOrganizerCollection>(),
-                    QOrganizerItemManager::NotSupportedError,
-                    QMap<int, QOrganizerItemManager::Error>(),
-                    QOrganizerItemAbstractRequest::FinishedState);
+                    QOrganizerManager::NotSupportedError,
+                    QMap<int, QOrganizerManager::Error>(),
+                    QOrganizerAbstractRequest::FinishedState);
             }
             return false;
 #else
-        case QOrganizerItemAbstractRequest::CollectionRemoveRequest:       // Fallthrough
-        case QOrganizerItemAbstractRequest::CollectionSaveRequest:         // .
+        case QOrganizerAbstractRequest::CollectionRemoveRequest:       // Fallthrough
+        case QOrganizerAbstractRequest::CollectionSaveRequest:         // .
 #endif
-        case QOrganizerItemAbstractRequest::ItemFetchForExportRequest:     // .
-        case QOrganizerItemAbstractRequest::ItemRemoveRequest:             // .
-        case QOrganizerItemAbstractRequest::ItemSaveRequest:               // .
-        case QOrganizerItemAbstractRequest::ItemFetchRequest:              // .
-        case QOrganizerItemAbstractRequest::ItemLocalIdFetchRequest:       // .
-        case QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest:  // .
-        case QOrganizerItemAbstractRequest::CollectionFetchRequest:
+        case QOrganizerAbstractRequest::ItemFetchForExportRequest:     // .
+        case QOrganizerAbstractRequest::ItemRemoveRequest:             // .
+        case QOrganizerAbstractRequest::ItemSaveRequest:               // .
+        case QOrganizerAbstractRequest::ItemFetchRequest:              // .
+        case QOrganizerAbstractRequest::ItemLocalIdFetchRequest:       // .
+        case QOrganizerAbstractRequest::DetailDefinitionFetchRequest:  // .
+        case QOrganizerAbstractRequest::CollectionFetchRequest:
             {
                 // QWeakPointer is aware if the request object (which is derived from QObject) is deleted.
-                QWeakPointer<QOrganizerItemAbstractRequest> req = aReq;
+                QWeakPointer<QOrganizerAbstractRequest> req = aReq;
 
                 // Change the state of the request and emit signal
-                QOrganizerItemManagerEngine::updateRequestState(aReq,
-                        QOrganizerItemAbstractRequest::ActiveState);
+                QOrganizerManagerEngine::updateRequestState(aReq,
+                        QOrganizerAbstractRequest::ActiveState);
 
                 // Client may delete the request object when state is updated. And because by default
                 // signals are synchronous we might not have a valid request anymore.
@@ -182,57 +182,57 @@ bool COrganizerItemRequestsServiceProvider::CancelRequest()
 void COrganizerItemRequestsServiceProvider::RunL()
 {
     switch (iReq->type()) {
-    case QOrganizerItemAbstractRequest::ItemFetchRequest: 
+    case QOrganizerAbstractRequest::ItemFetchRequest: 
         {
         FetchItems();
         }
         break;
-    case QOrganizerItemAbstractRequest::ItemFetchForExportRequest: 
+    case QOrganizerAbstractRequest::ItemFetchForExportRequest: 
         {
         FetchItemsForExport();
         }
         break;
-    case QOrganizerItemAbstractRequest::ItemLocalIdFetchRequest: 
+    case QOrganizerAbstractRequest::ItemLocalIdFetchRequest: 
         {
         FetchItemIds();
         }
         break;
-    case QOrganizerItemAbstractRequest::ItemRemoveRequest: 
+    case QOrganizerAbstractRequest::ItemRemoveRequest: 
         {
         RemoveItem();
         }
         break;
-    case QOrganizerItemAbstractRequest::ItemSaveRequest: 
+    case QOrganizerAbstractRequest::ItemSaveRequest: 
         {
         SaveItem();
         }
         break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest: 
+    case QOrganizerAbstractRequest::DetailDefinitionFetchRequest: 
         {
         FetchDetailDefinition();
         }
         break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest: 
+    case QOrganizerAbstractRequest::DetailDefinitionRemoveRequest: 
         {
         // Not supported. Already handled at StartRequest()
         }
         break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest: 
+    case QOrganizerAbstractRequest::DetailDefinitionSaveRequest: 
         {
         // Not supported. Already handled at StartRequest()
         }
         break;
-    case QOrganizerItemAbstractRequest::CollectionFetchRequest : 
+    case QOrganizerAbstractRequest::CollectionFetchRequest : 
         {
         FetchCollections();
         }
         break;
-    case QOrganizerItemAbstractRequest::CollectionRemoveRequest :
+    case QOrganizerAbstractRequest::CollectionRemoveRequest :
         {
         RemoveCollections();
         }
         break;
-    case QOrganizerItemAbstractRequest::CollectionSaveRequest :
+    case QOrganizerAbstractRequest::CollectionSaveRequest :
         {
         SaveCollections();
         }
@@ -250,27 +250,27 @@ void COrganizerItemRequestsServiceProvider::FetchItems()
 {
     QOrganizerItemFetchRequest *req = static_cast<QOrganizerItemFetchRequest *>(iReq);
     // Fetch ItemInstancesList
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     QList<QOrganizerItem> itemList = iOrganizerItemManagerEngine.items(
         req->startDate(), req->endDate(), req->filter(), req->sorting(), req->fetchHint(), &error);
 
     // Update the request status
-    QOrganizerItemManagerEngine::updateItemFetchRequest(
-        req, itemList, error, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemFetchRequest(
+        req, itemList, error, QOrganizerAbstractRequest::FinishedState);
 }
 
 // Delete item
 void COrganizerItemRequestsServiceProvider::RemoveItem()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::ItemRemoveRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::ItemRemoveRequest);
     QOrganizerItemRemoveRequest *req = static_cast<QOrganizerItemRemoveRequest *>(iReq);
     QList<QOrganizerItemLocalId> itemIds = req->itemIds();
     Q_ASSERT(iIndex < itemIds.count());
 
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     // Delete an item (emits "itemsRemoved")
     iOrganizerItemManagerEngine.removeItem(itemIds.at(iIndex), &error);
-    if (error != QOrganizerItemManager::NoError)
+    if (error != QOrganizerManager::NoError)
         iErrorMap.insert(iIndex, error);
 
     iIndex++;
@@ -283,20 +283,20 @@ void COrganizerItemRequestsServiceProvider::RemoveItem()
             error = iErrorMap.values().at(0);
 
         // Emit state change
-        QOrganizerItemManagerEngine::updateItemRemoveRequest(
-            req, error, iErrorMap, QOrganizerItemAbstractRequest::FinishedState);
+        QOrganizerManagerEngine::updateItemRemoveRequest(
+            req, error, iErrorMap, QOrganizerAbstractRequest::FinishedState);
     }
 }
 
 // Save item
 void COrganizerItemRequestsServiceProvider::SaveItem()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::ItemSaveRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::ItemSaveRequest);
     QOrganizerItemSaveRequest *req = static_cast<QOrganizerItemSaveRequest *>(iReq);
     QList<QOrganizerItem> items = req->items();
     Q_ASSERT(iIndex < items.count());
 
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     // Validate item before saving
     if (iOrganizerItemManagerEngine.validateItem(items[iIndex], &error))
         {
@@ -304,7 +304,7 @@ void COrganizerItemRequestsServiceProvider::SaveItem()
         iOrganizerItemManagerEngine.saveItem(&(items[iIndex]), &error);
         }
 
-    if (error == QOrganizerItemManager::NoError) {
+    if (error == QOrganizerManager::NoError) {
         // Update item in the list (does not emit resultsAvailable)
         req->setItems(items);
     } else {
@@ -327,8 +327,8 @@ void COrganizerItemRequestsServiceProvider::SaveItem()
         }
 
         // Notify results (emits resultsAvailable and stateChanged)
-        QOrganizerItemManagerEngine::updateItemSaveRequest(
-            req, result, error, iErrorMap, QOrganizerItemAbstractRequest::FinishedState);
+        QOrganizerManagerEngine::updateItemSaveRequest(
+            req, result, error, iErrorMap, QOrganizerAbstractRequest::FinishedState);
     }    
 }
 
@@ -342,12 +342,12 @@ void COrganizerItemRequestsServiceProvider::FetchItemsForExport()
             // Fetch all item ids
             QOrganizerItemFilter filter;
             QList<QOrganizerItemSortOrder> sortOrder;
-            QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+            QOrganizerManager::Error error(QOrganizerManager::NoError);
             iItemIds = iOrganizerItemManagerEngine.itemIds(req->startDate(), req->endDate(), filter, sortOrder, &error);
-            if (error != QOrganizerItemManager::NoError || !iItemIds.count()) {
+            if (error != QOrganizerManager::NoError || !iItemIds.count()) {
                 // Complete with empty list
-                QOrganizerItemManagerEngine::updateItemFetchForExportRequest(
-                    req, QList<QOrganizerItem>(), error, QOrganizerItemAbstractRequest::FinishedState);
+                QOrganizerManagerEngine::updateItemFetchForExportRequest(
+                    req, QList<QOrganizerItem>(), error, QOrganizerAbstractRequest::FinishedState);
             } else {
                 FetchItemsandFilter();
             }
@@ -360,18 +360,18 @@ void COrganizerItemRequestsServiceProvider::FetchItemsForExport()
 // Fetch item local ids
 void COrganizerItemRequestsServiceProvider::FetchItemIds()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::ItemLocalIdFetchRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::ItemLocalIdFetchRequest);
     QOrganizerItemLocalIdFetchRequest *req = static_cast<QOrganizerItemLocalIdFetchRequest *>(iReq);
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     QList<QOrganizerItemLocalId> itemIds = iOrganizerItemManagerEngine.itemIds(req->startDate(), req->endDate(), req->filter(), req->sorting(), &error);
-    QOrganizerItemManagerEngine::updateItemLocalIdFetchRequest(
-        req, itemIds, error, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateItemLocalIdFetchRequest(
+        req, itemIds, error, QOrganizerAbstractRequest::FinishedState);
 }
 
 // Fetch Entries by local Ids
 void COrganizerItemRequestsServiceProvider::FetchItemsByLocalIds()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::ItemFetchForExportRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::ItemFetchForExportRequest);
     QOrganizerItemFetchForExportRequest *req = static_cast<QOrganizerItemFetchForExportRequest *>(iReq);
     Q_ASSERT(req->filter().type() == QOrganizerItemFilter::LocalIdFilter);
     QOrganizerItemLocalIdFilter localIdFilter = req->filter();
@@ -379,7 +379,7 @@ void COrganizerItemRequestsServiceProvider::FetchItemsByLocalIds()
     Q_ASSERT(iIndex < itemIds.count());
 
     QOrganizerItemFetchHint fetchHint;
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     // Fetch the item
     QOrganizerItem item =
         iOrganizerItemManagerEngine.item(localIdFilter.ids().at(iIndex), fetchHint, &error);
@@ -388,39 +388,39 @@ void COrganizerItemRequestsServiceProvider::FetchItemsByLocalIds()
     // TODO: we may need to batch signaling to improve performance,
     // for example "resultsAvailable" for every tenth iteration
     QList<QOrganizerItem> items = req->items();
-    if (error == QOrganizerItemManager::NoError) {
+    if (error == QOrganizerManager::NoError) {
         items << item;
     }
 
     // The first error will be reported
-    if (req->error() != QOrganizerItemManager::NoError)
+    if (req->error() != QOrganizerManager::NoError)
         error = req->error();
 
     iIndex++;
     if (iIndex < itemIds.count()) {
         // Continue until all items fetched; emit new result, no state change
         SelfComplete();
-        QOrganizerItemManagerEngine::updateItemFetchForExportRequest(req, items, error, req->state());
+        QOrganizerManagerEngine::updateItemFetchForExportRequest(req, items, error, req->state());
     } else {
         // Done, emit state change
-        QOrganizerItemManagerEngine::updateItemFetchForExportRequest(
-            req, items, error, QOrganizerItemAbstractRequest::FinishedState);
+        QOrganizerManagerEngine::updateItemFetchForExportRequest(
+            req, items, error, QOrganizerAbstractRequest::FinishedState);
     }
 }
 
 // Fetch items/entries by details
 void COrganizerItemRequestsServiceProvider::FetchItemsandFilter()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::ItemFetchForExportRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::ItemFetchForExportRequest);
     QOrganizerItemFetchForExportRequest *req = static_cast<QOrganizerItemFetchForExportRequest *>(iReq);
     Q_ASSERT(iIndex < iItemIds.count());
 
     // Fetch the item
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     QOrganizerItem item = iOrganizerItemManagerEngine.item(iItemIds.at(iIndex), req->fetchHint(), &error);
 
     QList<QOrganizerItem> items;
-    if (error == QOrganizerItemManager::NoError) {
+    if (error == QOrganizerManager::NoError) {
         // Append the fetched item to the result if it passes the filter
         items.append(item);
         items = iOrganizerItemManagerEngine.slowFilter(items, req->filter(), req->sorting());
@@ -428,18 +428,18 @@ void COrganizerItemRequestsServiceProvider::FetchItemsandFilter()
     items.append(req->items());
 
     // The first error will be reported
-    if (req->error() != QOrganizerItemManager::NoError)
+    if (req->error() != QOrganizerManager::NoError)
         error = req->error();
 
     iIndex++;
     if (iIndex < iItemIds.count()) {
         // Continue until all items fetched; emit new result, no state change
         SelfComplete();
-        QOrganizerItemManagerEngine::updateItemFetchForExportRequest(req, items, error, req->state());
+        QOrganizerManagerEngine::updateItemFetchForExportRequest(req, items, error, req->state());
     } else {
         // Done, emit state change
-        QOrganizerItemManagerEngine::updateItemFetchForExportRequest(
-            req, items, error, QOrganizerItemAbstractRequest::FinishedState);
+        QOrganizerManagerEngine::updateItemFetchForExportRequest(
+            req, items, error, QOrganizerAbstractRequest::FinishedState);
     }
 }
 
@@ -449,8 +449,8 @@ void COrganizerItemRequestsServiceProvider::FetchDetailDefinition()
     QOrganizerItemDetailDefinitionFetchRequest *req = static_cast<QOrganizerItemDetailDefinitionFetchRequest *>(iReq);
 
     QMap<QString, QOrganizerItemDetailDefinition> detailDefinitionMap;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QMap<int, QOrganizerManager::Error> errorMap;
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     int count = req->definitionNames().count();
     
     // As there are no costly IPCs involved in this operation so
@@ -466,7 +466,7 @@ void COrganizerItemRequestsServiceProvider::FetchDetailDefinition()
                 (iOrganizerItemManagerEngine.detailDefinition(
                     stringItem, req->itemType(), &error)));
 
-            if (QOrganizerItemManager::NoError == error) {
+            if (QOrganizerManager::NoError == error) {
                 detailDefinitionMap.insert(stringItem, detailDefinition);
             } else {
                 errorMap.insert(index, error);
@@ -475,83 +475,83 @@ void COrganizerItemRequestsServiceProvider::FetchDetailDefinition()
     }
     
     // Notify results
-    QOrganizerItemManagerEngine::updateDefinitionFetchRequest(
-        req, detailDefinitionMap, error, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+    QOrganizerManagerEngine::updateDefinitionFetchRequest(
+        req, detailDefinitionMap, error, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void COrganizerItemRequestsServiceProvider::FetchCollections()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::CollectionFetchRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::CollectionFetchRequest);
     QOrganizerCollectionFetchRequest *fetchReq = static_cast<QOrganizerCollectionFetchRequest *>(iReq);
 
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     QList<QOrganizerCollection> result = iOrganizerItemManagerEngine.collections(&error);
-    QOrganizerItemManagerEngine::updateCollectionFetchRequest(
+    QOrganizerManagerEngine::updateCollectionFetchRequest(
         fetchReq,
         result,
         error,
-        QOrganizerItemAbstractRequest::FinishedState);
+        QOrganizerAbstractRequest::FinishedState);
 }
 
 void COrganizerItemRequestsServiceProvider::SaveCollections()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::CollectionSaveRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::CollectionSaveRequest);
 
     QOrganizerCollectionSaveRequest *saveReq = static_cast<QOrganizerCollectionSaveRequest *>(iReq);
     QList<QOrganizerCollection> collections = saveReq->collections();
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
+    QMap<int, QOrganizerManager::Error> errorMap;
 
     // Save all collections
     for (int i(0); i < collections.count(); i++) {
         // The following also emits the necessary signals
         iOrganizerItemManagerEngine.saveCollection(&(collections[i]), &error);
-        if (error != QOrganizerItemManager::NoError) {
+        if (error != QOrganizerManager::NoError) {
             errorMap.insert(i, error);
         }
     }
 
     // Notify completion
-    QOrganizerItemManagerEngine::updateCollectionSaveRequest(
+    QOrganizerManagerEngine::updateCollectionSaveRequest(
         saveReq,
         collections,
         error,
         errorMap,
-        QOrganizerItemAbstractRequest::FinishedState);
+        QOrganizerAbstractRequest::FinishedState);
 }
 
 void COrganizerItemRequestsServiceProvider::RemoveCollections()
 {
-    Q_ASSERT(iReq->type() == QOrganizerItemAbstractRequest::CollectionRemoveRequest);
+    Q_ASSERT(iReq->type() == QOrganizerAbstractRequest::CollectionRemoveRequest);
 
     QOrganizerCollectionRemoveRequest *removeReq = static_cast<QOrganizerCollectionRemoveRequest *>(iReq);
     QList<QOrganizerCollectionLocalId> collectionIds = removeReq->collectionIds();
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
+    QMap<int, QOrganizerManager::Error> errorMap;
 
     // Remove all collections
     for (int i(0); i < collectionIds.count(); i++) {
         // The following also emits the necessary signals
         iOrganizerItemManagerEngine.removeCollection(collectionIds.at(i), &error);
-        if (error != QOrganizerItemManager::NoError) {
+        if (error != QOrganizerManager::NoError) {
             errorMap.insert(i, error);
         }
     }
 
     // Notify completion
-    QOrganizerItemManagerEngine::updateCollectionRemoveRequest(
+    QOrganizerManagerEngine::updateCollectionRemoveRequest(
         removeReq,
         error,
         errorMap,
-        QOrganizerItemAbstractRequest::FinishedState);
+        QOrganizerAbstractRequest::FinishedState);
 }
 
 // Called by Cancel()
 void COrganizerItemRequestsServiceProvider::DoCancel()
 {
     // Update the request status
-    QOrganizerItemManagerEngine::updateRequestState(iReq, 
-            QOrganizerItemAbstractRequest::CanceledState);
+    QOrganizerManagerEngine::updateRequestState(iReq, 
+            QOrganizerAbstractRequest::CanceledState);
 }
 
 // Call if RunL leaves
@@ -559,7 +559,7 @@ TInt COrganizerItemRequestsServiceProvider::RunError(TInt aError)
 {
     // Operation not successfull
     // Generate error map
-    QOrganizerItemManager::Error error(QOrganizerItemManager::NoError);
+    QOrganizerManager::Error error(QOrganizerManager::NoError);
     iOrganizerItemManagerEngine.transformError(aError, &error);
     // Insert error map
     iErrorMap.insert(iIndex, error);
diff --git a/plugins/organizer/symbian/organizeritemrequestserviceprovider.h b/plugins/organizer/symbian/organizeritemrequestserviceprovider.h
index da61d2f095..026cffdb26 100644
--- a/plugins/organizer/symbian/organizeritemrequestserviceprovider.h
+++ b/plugins/organizer/symbian/organizeritemrequestserviceprovider.h
@@ -62,7 +62,7 @@ public:
     // Destruction, cleanup
     ~COrganizerItemRequestsServiceProvider();
     // To start an asynchronous request aReq
-    bool StartRequest(QOrganizerItemAbstractRequest* aReq);
+    bool StartRequest(QOrganizerAbstractRequest* aReq);
     // To cancel ongoing iReq request
     bool CancelRequest();
     
@@ -97,9 +97,9 @@ private: // Worker functions
     
 private:
     QOrganizerItemSymbianEngine&            iOrganizerItemManagerEngine;
-    QOrganizerItemAbstractRequest*          iReq; // Request to be processed
+    QOrganizerAbstractRequest*          iReq; // Request to be processed
     QList<QOrganizerItemLocalId>            iItemIds;
-    QMap<int, QOrganizerItemManager::Error> iErrorMap; // Error map
+    QMap<int, QOrganizerManager::Error> iErrorMap; // Error map
     TInt                                    iIndex;
 };
 
diff --git a/plugins/organizer/symbian/organizeritemtransform.cpp b/plugins/organizer/symbian/organizeritemtransform.cpp
index 1a0506a260..53ef7a4d6d 100644
--- a/plugins/organizer/symbian/organizeritemtransform.cpp
+++ b/plugins/organizer/symbian/organizeritemtransform.cpp
@@ -108,7 +108,7 @@ void debugSchemaDefs(const QMap<QString, QMap<QString, QOrganizerItemDetailDefin
 OrganizerItemTransform::OrganizerItemTransform()
 {
     m_detailTransforms.append(new OrganizerItemTypeTransform()); // this must be first always
-    m_detailTransforms.append(new OrganizerEventTimeRangeTransform());
+    m_detailTransforms.append(new OrganizerEventTimeTransform());
     m_detailTransforms.append(new OrganizerItemDescriptionTransform());
     m_detailTransforms.append(new OrganizerItemDisplayLabelTransform());
     m_detailTransforms.append(new OrganizerItemGuidTransform());
@@ -116,9 +116,9 @@ OrganizerItemTransform::OrganizerItemTransform()
     m_detailTransforms.append(new OrganizerItemLocationTransform());
     m_detailTransforms.append(new OrganizerItemPriorityTransform());
     m_detailTransforms.append(new OrganizerItemTimeStampTransform());
-    m_detailTransforms.append(new OrganizerJournalTimeRangeTransform());
+    m_detailTransforms.append(new OrganizerJournalTimeTransform());
     m_detailTransforms.append(new OrganizerTodoProgressTransform());
-    m_detailTransforms.append(new OrganizerTodoTimeRangeTransform());
+    m_detailTransforms.append(new OrganizerTodoTimeTransform());
     m_detailTransforms.append(new OrganizerItemRecurrenceTransform());
 	m_detailTransforms.append(new OrganizerItemReminderTransform());
 }
diff --git a/plugins/organizer/symbian/organizersymbiancollection.cpp b/plugins/organizer/symbian/organizersymbiancollection.cpp
index 5d7a3f0c7f..ebd741286f 100644
--- a/plugins/organizer/symbian/organizersymbiancollection.cpp
+++ b/plugins/organizer/symbian/organizersymbiancollection.cpp
@@ -46,7 +46,7 @@
 #include <calinstanceview.h>
 #include "organizersymbianutils.h"
 #include "qorganizeritemchangeset.h"
-#include "qorganizeritemmanagerengine.h"
+#include "qorganizermanagerengine.h"
 
 using namespace OrganizerSymbianUtils;
 
@@ -156,7 +156,7 @@ OrganizerSymbianCollection::OrganizerSymbianCollection()
     d = new OrganizerSymbianCollectionPrivate();
 }
 
-OrganizerSymbianCollection::OrganizerSymbianCollection(QOrganizerItemManagerEngine *engine)
+OrganizerSymbianCollection::OrganizerSymbianCollection(QOrganizerManagerEngine *engine)
     :d(0)
 {
     d = new OrganizerSymbianCollectionPrivate();
diff --git a/plugins/organizer/symbian/organizersymbiancollection.h b/plugins/organizer/symbian/organizersymbiancollection.h
index f6ed3758ac..eb1df71dc6 100644
--- a/plugins/organizer/symbian/organizersymbiancollection.h
+++ b/plugins/organizer/symbian/organizersymbiancollection.h
@@ -48,7 +48,7 @@
 QTM_USE_NAMESPACE
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManagerEngine;
+class QOrganizerManagerEngine;
 QTM_END_NAMESPACE
 class CCalSession;
 class CCalEntryView;
@@ -68,7 +68,7 @@ public:
     TBool NotifyProgress();
     void CalChangeNotification(RArray<TCalChangeEntry>& aChangeItems);
     
-    QOrganizerItemManagerEngine *m_engine;
+    QOrganizerManagerEngine *m_engine;
     CCalSession *m_calSession;
     CCalEntryView *m_calEntryView;
     CCalInstanceView *m_calInstanceView;
@@ -83,7 +83,7 @@ class OrganizerSymbianCollection
 {
 public:
     OrganizerSymbianCollection();
-    OrganizerSymbianCollection(QOrganizerItemManagerEngine *engine);
+    OrganizerSymbianCollection(QOrganizerManagerEngine *engine);
     OrganizerSymbianCollection(const OrganizerSymbianCollection &other);
     
 #ifdef SYMBIAN_CALENDAR_V2
diff --git a/plugins/organizer/symbian/organizersymbianutils.cpp b/plugins/organizer/symbian/organizersymbianutils.cpp
index 4ba4c28981..d750aaa4a8 100644
--- a/plugins/organizer/symbian/organizersymbianutils.cpp
+++ b/plugins/organizer/symbian/organizersymbianutils.cpp
@@ -135,19 +135,19 @@ QOrganizerItemLocalId toItemLocalId(quint64 collectionId, quint32 itemId)
 TCalLocalUid toTCalLocalUid(const QOrganizerItemLocalId& itemLocalId)
 {
     // TODO: should we have a check for engineLocalIdType here?
-    return static_cast<QOrganizerItemSymbianEngineLocalId*>(QOrganizerItemManagerEngine::engineLocalItemId(itemLocalId))->calLocalUid();
+    return static_cast<QOrganizerItemSymbianEngineLocalId*>(QOrganizerManagerEngine::engineLocalItemId(itemLocalId))->calLocalUid();
 }
 
 quint64 toTCalCollectionId(const QOrganizerItemLocalId& itemLocalId)
 {
     // TODO: should we have a check for engineLocalIdType here?
-    return static_cast<QOrganizerItemSymbianEngineLocalId*>(QOrganizerItemManagerEngine::engineLocalItemId(itemLocalId))->calCollectionId();
+    return static_cast<QOrganizerItemSymbianEngineLocalId*>(QOrganizerManagerEngine::engineLocalItemId(itemLocalId))->calCollectionId();
 }
 
 QOrganizerCollectionLocalId getCollectionLocalId(const QOrganizerItemLocalId& itemLocalId)
 {
     // TODO: should we have a check for engineLocalIdType here?
-    quint64 calCollectionId  = static_cast<QOrganizerItemSymbianEngineLocalId*>(QOrganizerItemManagerEngine::engineLocalItemId(itemLocalId))->calCollectionId();
+    quint64 calCollectionId  = static_cast<QOrganizerItemSymbianEngineLocalId*>(QOrganizerManagerEngine::engineLocalItemId(itemLocalId))->calCollectionId();
     return toCollectionLocalId(calCollectionId);
 }
 
diff --git a/plugins/organizer/symbian/qorganizeritemrequestqueue.cpp b/plugins/organizer/symbian/qorganizeritemrequestqueue.cpp
index 87918ea418..8522abf248 100644
--- a/plugins/organizer/symbian/qorganizeritemrequestqueue.cpp
+++ b/plugins/organizer/symbian/qorganizeritemrequestqueue.cpp
@@ -51,7 +51,7 @@ QOrganizerItemRequestQueue* QOrganizerItemRequestQueue::instance(
 QOrganizerItemRequestQueue::~QOrganizerItemRequestQueue()
 {
     // Cleanup, delete all the pointers from the hash map
-    QMapIterator<QOrganizerItemAbstractRequest*, 
+    QMapIterator<QOrganizerAbstractRequest*, 
     COrganizerItemRequestsServiceProvider*> iter(m_abstractRequestMap);
     // Delete all the asynch requests one by one
     while (iter.hasNext()) {
@@ -65,7 +65,7 @@ QOrganizerItemRequestQueue::~QOrganizerItemRequestQueue()
 }
 
 bool QOrganizerItemRequestQueue::startRequest(
-        QOrganizerItemAbstractRequest* req)
+        QOrganizerAbstractRequest* req)
 {
     // Find m_abstractRequestMap if an asynchronous service provider for request
     // req already exists
@@ -88,7 +88,7 @@ bool QOrganizerItemRequestQueue::startRequest(
 
 // To cancel aReq request
 bool QOrganizerItemRequestQueue::cancelRequest(
-        QOrganizerItemAbstractRequest* req)
+        QOrganizerAbstractRequest* req)
 {
     COrganizerItemRequestsServiceProvider* requestServiceProvider(
             m_abstractRequestMap[req]);
@@ -103,12 +103,12 @@ bool QOrganizerItemRequestQueue::cancelRequest(
 
 // Wait for request to complete 
 bool QOrganizerItemRequestQueue::waitForRequestFinished(
-        QOrganizerItemAbstractRequest* req, int msecs)
+        QOrganizerAbstractRequest* req, int msecs)
 {
     if (!m_abstractRequestMap.keys().contains(req)) 
         return false;
     
-    if (req->state() != QOrganizerItemAbstractRequest::ActiveState)
+    if (req->state() != QOrganizerAbstractRequest::ActiveState)
         return false;
     
     QEventLoop *loop = new QEventLoop(this);
@@ -122,12 +122,12 @@ bool QOrganizerItemRequestQueue::waitForRequestFinished(
     loop->disconnect();
     loop->deleteLater();
 
-    return (req->state() == QOrganizerItemAbstractRequest::FinishedState);
+    return (req->state() == QOrganizerAbstractRequest::FinishedState);
 }
 
 // Request is not more a valid request
 void QOrganizerItemRequestQueue::requestDestroyed(
-        QOrganizerItemAbstractRequest* req)
+        QOrganizerAbstractRequest* req)
 {
     // Get the pointer to the Asynchronous service provider for req request
     COrganizerItemRequestsServiceProvider* requestServiceProvider(
diff --git a/plugins/organizer/symbian/qorganizeritemrequestqueue.h b/plugins/organizer/symbian/qorganizeritemrequestqueue.h
index f19586e19f..8e7f33b0e9 100644
--- a/plugins/organizer/symbian/qorganizeritemrequestqueue.h
+++ b/plugins/organizer/symbian/qorganizeritemrequestqueue.h
@@ -52,7 +52,7 @@
 #include "organizeritemrequestserviceprovider.h"
 
 // Forward declarations
-//class QOrganizerItemAbstractRequest;
+//class QOrganizerAbstractRequest;
 class QOrganizerItemSymbianEngine;
 
 class QOrganizerItemRequestQueue : public QObject
@@ -65,13 +65,13 @@ public:
     // Destructor
     ~QOrganizerItemRequestQueue();
     // To start req request
-    bool startRequest(QOrganizerItemAbstractRequest* req);
+    bool startRequest(QOrganizerAbstractRequest* req);
     // To cancel req request
-    bool cancelRequest(QOrganizerItemAbstractRequest* req);
+    bool cancelRequest(QOrganizerAbstractRequest* req);
     // Wait for request to complete 
-    bool waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs);
+    bool waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs);
     // Request is no more a valid request, removes req from the queue
-    void requestDestroyed(QOrganizerItemAbstractRequest* req);
+    void requestDestroyed(QOrganizerAbstractRequest* req);
 
 private:
     QOrganizerItemRequestQueue(
@@ -79,7 +79,7 @@ private:
 
 private:
     QOrganizerItemSymbianEngine&                m_organizerItemManagerEngine;
-    QMap<QOrganizerItemAbstractRequest*, COrganizerItemRequestsServiceProvider*>m_abstractRequestMap;
+    QMap<QOrganizerAbstractRequest*, COrganizerItemRequestsServiceProvider*>m_abstractRequestMap;
 };
 
 #endif /* QORGANIZERITEMREQUESTQUEUE_H_ */
diff --git a/plugins/organizer/symbian/qorganizersymbian.cpp b/plugins/organizer/symbian/qorganizersymbian.cpp
index 6c5b7ee0b0..3e107d9c42 100644
--- a/plugins/organizer/symbian/qorganizersymbian.cpp
+++ b/plugins/organizer/symbian/qorganizersymbian.cpp
@@ -233,9 +233,9 @@ uint QOrganizerCollectionSymbianEngineLocalId::hash() const
 const TInt KErrInvalidOccurrence(-32768);
 const TInt KErrInvalidItemType(-32769);
 
-QOrganizerItemManagerEngine* QOrganizerItemSymbianFactory::engine(
+QOrganizerManagerEngine* QOrganizerItemSymbianFactory::engine(
     const QMap<QString, QString>& parameters, 
-    QOrganizerItemManager::Error* error)
+    QOrganizerManager::Error* error)
 {
     Q_UNUSED(parameters);
 
@@ -243,9 +243,9 @@ QOrganizerItemManagerEngine* QOrganizerItemSymbianFactory::engine(
     QOrganizerItemSymbianEngine* ret = new QOrganizerItemSymbianEngine();
     TRAPD(err, ret->initializeL());
     QOrganizerItemSymbianEngine::transformError(err, error);
-    if (*error != QOrganizerItemManager::NoError) {
+    if (*error != QOrganizerManager::NoError) {
         // Something went wrong. Return null so that 
-        // QOrganizerItemManagerData::createEngine() will return 
+        // QOrganizerManagerData::createEngine() will return 
         // QOrganizerItemInvalidEngine to the client. This will avoid null 
         // pointer exceptions if the client still tries to access the manager.
         delete ret;
@@ -272,7 +272,7 @@ QString QOrganizerItemSymbianFactory::managerName() const
 Q_EXPORT_PLUGIN2(qtorganizer_symbian, QOrganizerItemSymbianFactory);
 
 QOrganizerItemSymbianEngine::QOrganizerItemSymbianEngine() :
-    QOrganizerItemManagerEngine(),
+    QOrganizerManagerEngine(),
     m_defaultCollection(this),
     m_requestServiceProviderQueue(0)
 {
@@ -354,7 +354,7 @@ QList<QOrganizerItem> QOrganizerItemSymbianEngine::itemInstances(
     const QDateTime& periodEnd,
     int maxCount,
     const QOrganizerItemFetchHint& fetchHint,
-    QOrganizerItemManager::Error* error) const
+    QOrganizerManager::Error* error) const
 {
     QList<QOrganizerItem> itemInstances; 
     TRAPD(err, itemInstancesL(itemInstances, generator, periodStart, periodEnd, maxCount, fetchHint));
@@ -423,7 +423,7 @@ QList<QOrganizerItem> QOrganizerItemSymbianEngine::items(
     const QOrganizerItemFilter& filter,
     const QList<QOrganizerItemSortOrder>& sortOrders,
     const QOrganizerItemFetchHint& fetchHint,
-    QOrganizerItemManager::Error* error) const
+    QOrganizerManager::Error* error) const
 {
     QList<QOrganizerItem> items;
     TRAPD(err, itemsL(items, periodStart, periodEnd, filter, sortOrders, fetchHint));
@@ -534,12 +534,12 @@ QList<QOrganizerItemLocalId> QOrganizerItemSymbianEngine::itemIds(
         const QDateTime& periodEnd,
         const QOrganizerItemFilter& filter,
         const QList<QOrganizerItemSortOrder>& sortOrders,
-        QOrganizerItemManager::Error* error) const
+        QOrganizerManager::Error* error) const
 {
     QList<QOrganizerItemLocalId> ids;
     TRAPD(err, itemIdsL(ids, periodStart, periodEnd, filter, sortOrders))
     transformError(err, error);
-    if (*error != QOrganizerItemManager::NoError) {
+    if (*error != QOrganizerManager::NoError) {
         return QList<QOrganizerItemLocalId>();
     } else {
         return ids;
@@ -617,12 +617,12 @@ QList<QOrganizerItem> QOrganizerItemSymbianEngine::itemsForExport(
     const QOrganizerItemFilter& filter, 
     const QList<QOrganizerItemSortOrder>& sortOrders, 
     const QOrganizerItemFetchHint& fetchHint, 
-    QOrganizerItemManager::Error* error) const
+    QOrganizerManager::Error* error) const
 {
     QList<QOrganizerItem> itemsList;
     TRAPD(err, itemsForExportL(itemsList, periodStart, periodEnd, filter, sortOrders, fetchHint));
     transformError(err, error);
-    if (*error != QOrganizerItemManager::NoError) {
+    if (*error != QOrganizerManager::NoError) {
         return QList<QOrganizerItem>();
     } else {
         return itemsList;
@@ -658,7 +658,7 @@ void QOrganizerItemSymbianEngine::itemsForExportL(QList<QOrganizerItem>& itemsLi
 QOrganizerItem QOrganizerItemSymbianEngine::item(
     const QOrganizerItemLocalId& itemId, 
     const QOrganizerItemFetchHint& fetchHint, 
-    QOrganizerItemManager::Error* error) const
+    QOrganizerManager::Error* error) const
 {
     QOrganizerItem item;
     TRAPD(err, item = itemL(itemId, fetchHint));
@@ -722,8 +722,8 @@ QOrganizerItem QOrganizerItemSymbianEngine::itemL(const QOrganizerItemLocalId& i
 }
 
 bool QOrganizerItemSymbianEngine::saveItems(QList<QOrganizerItem> *items, 
-    QMap<int, QOrganizerItemManager::Error> *errorMap, 
-    QOrganizerItemManager::Error* error)
+    QMap<int, QOrganizerManager::Error> *errorMap, 
+    QOrganizerManager::Error* error)
 {
     // TODO: the performance would be probably better, if we had a separate
     // implementation for the case with a list of items that would save all
@@ -735,14 +735,14 @@ bool QOrganizerItemSymbianEngine::saveItems(QList<QOrganizerItem> *items,
         QOrganizerItem item = items->at(i);
         
         // Validate & save
-        QOrganizerItemManager::Error saveError;
+        QOrganizerManager::Error saveError;
         if (validateItem(item, &saveError)) {
             TRAPD(err, saveItemL(&item, &changeSet));
             transformError(err, &saveError);
         }
         
         // Check error
-        if (saveError != QOrganizerItemManager::NoError) {
+        if (saveError != QOrganizerManager::NoError) {
             *error = saveError;
             if (errorMap)
                 errorMap->insert(i, *error);
@@ -755,11 +755,11 @@ bool QOrganizerItemSymbianEngine::saveItems(QList<QOrganizerItem> *items,
     // Emit changes
     changeSet.emitSignals(this);
     
-    return *error == QOrganizerItemManager::NoError;
+    return *error == QOrganizerManager::NoError;
 }
 
 bool QOrganizerItemSymbianEngine::saveItem(QOrganizerItem* item, 
-    QOrganizerItemManager::Error* error)
+    QOrganizerManager::Error* error)
 {
     // Validate & save
     if (validateItem(*item, error)) {
@@ -768,7 +768,7 @@ bool QOrganizerItemSymbianEngine::saveItem(QOrganizerItem* item,
         transformError(err, error);
         changeSet.emitSignals(this);
     }
-    return *error == QOrganizerItemManager::NoError;
+    return *error == QOrganizerManager::NoError;
 }
 
 void QOrganizerItemSymbianEngine::saveItemL(QOrganizerItem *item, 
@@ -1074,8 +1074,8 @@ CCalEntry* QOrganizerItemSymbianEngine::findParentEntryLC(
 
 bool QOrganizerItemSymbianEngine::removeItems(
     const QList<QOrganizerItemLocalId>& itemIds, 
-    QMap<int, QOrganizerItemManager::Error>* errorMap, 
-    QOrganizerItemManager::Error* error)
+    QMap<int, QOrganizerManager::Error>* errorMap, 
+    QOrganizerManager::Error* error)
 {
     // Note: the performance would be probably better, if we had a separate
     // implementation for the case with a list of item ids that would
@@ -1085,8 +1085,8 @@ bool QOrganizerItemSymbianEngine::removeItems(
 
     for (int i(0); i < itemIds.count(); i++) {
         // Remove
-        QOrganizerItemManager::Error removeError(
-            QOrganizerItemManager::NoError);
+        QOrganizerManager::Error removeError(
+            QOrganizerManager::NoError);
         TRAPD(err, removeItemL(itemIds.at(i)));
         if (err != KErrNone) {
             transformError(err, &removeError);
@@ -1102,12 +1102,12 @@ bool QOrganizerItemSymbianEngine::removeItems(
     // Emit changes
     changeSet.emitSignals(this);
 
-    return *error == QOrganizerItemManager::NoError;
+    return *error == QOrganizerManager::NoError;
 }
 
 bool QOrganizerItemSymbianEngine::removeItem(
     const QOrganizerItemLocalId& organizeritemId, 
-    QOrganizerItemManager::Error* error)
+    QOrganizerManager::Error* error)
 {
     TRAPD(err, removeItemL(organizeritemId));
     if (err != KErrNone) {
@@ -1118,7 +1118,7 @@ bool QOrganizerItemSymbianEngine::removeItem(
         changeSet.insertRemovedItem(organizeritemId);
         changeSet.emitSignals(this);
     }
-    return *error == QOrganizerItemManager::NoError;
+    return *error == QOrganizerManager::NoError;
 }
 
 void QOrganizerItemSymbianEngine::removeItemL(
@@ -1151,12 +1151,12 @@ QList<QOrganizerItem> QOrganizerItemSymbianEngine::slowFilter(
     if (filter.type() == QOrganizerItemFilter::DefaultFilter) {
         // Only sort items.
         foreach(const QOrganizerItem& item, items) {
-            QOrganizerItemManagerEngine::addSorted(&filteredAndSorted, item, sortOrders);
+            QOrganizerManagerEngine::addSorted(&filteredAndSorted, item, sortOrders);
         }
     } else if (filter.type() != QOrganizerItemFilter::InvalidFilter) {
         foreach(const QOrganizerItem& item, items) {
-            if (QOrganizerItemManagerEngine::testFilter(filter, item))
-                QOrganizerItemManagerEngine::addSorted(&filteredAndSorted, item, sortOrders);
+            if (QOrganizerManagerEngine::testFilter(filter, item))
+                QOrganizerManagerEngine::addSorted(&filteredAndSorted, item, sortOrders);
         }
     }
 
@@ -1164,14 +1164,14 @@ QList<QOrganizerItem> QOrganizerItemSymbianEngine::slowFilter(
 }
 
 QOrganizerCollection QOrganizerItemSymbianEngine::defaultCollection(
-    QOrganizerItemManager::Error* error) const
+    QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return m_defaultCollection.toQOrganizerCollectionL();
 }
 
 QList<QOrganizerCollection> QOrganizerItemSymbianEngine::collections(
-    QOrganizerItemManager::Error* error) const
+    QOrganizerManager::Error* error) const
 {
     // Get collections
     QList<QOrganizerCollection> collections;
@@ -1200,7 +1200,7 @@ QList<QOrganizerCollection> QOrganizerItemSymbianEngine::collectionsL() const
 
 bool QOrganizerItemSymbianEngine::saveCollection(
     QOrganizerCollection* collection, 
-    QOrganizerItemManager::Error* error)
+    QOrganizerManager::Error* error)
 {
     bool isNewCollection = true;
     if (!collection->id().localId().isNull())
@@ -1209,7 +1209,7 @@ bool QOrganizerItemSymbianEngine::saveCollection(
     TRAPD(err, saveCollectionL(collection));
     transformError(err, error);
 
-    if (*error == QOrganizerItemManager::NoError) {
+    if (*error == QOrganizerManager::NoError) {
         if (isNewCollection) {
             // Emit changes
             QOrganizerCollectionChangeSet changeSet;
@@ -1220,7 +1220,7 @@ bool QOrganizerItemSymbianEngine::saveCollection(
         // CalendarInfoChangeNotificationL
     }
 
-    return (*error == QOrganizerItemManager::NoError);   
+    return (*error == QOrganizerManager::NoError);   
 }
 
 void QOrganizerItemSymbianEngine::saveCollectionL(
@@ -1300,16 +1300,16 @@ void QOrganizerItemSymbianEngine::saveCollectionL(
 
 bool QOrganizerItemSymbianEngine::removeCollection(
     const QOrganizerCollectionLocalId& collectionId, 
-    QOrganizerItemManager::Error* error)
+    QOrganizerManager::Error* error)
 {
     TRAPD(err, removeCollectionL(collectionId));
     transformError(err, error);
-    if (*error == QOrganizerItemManager::NoError) {
+    if (*error == QOrganizerManager::NoError) {
         QOrganizerCollectionChangeSet collectionChangeSet;
         collectionChangeSet.insertRemovedCollection(collectionId);
         collectionChangeSet.emitSignals(this);
     }
-    return (*error == QOrganizerItemManager::NoError);
+    return (*error == QOrganizerManager::NoError);
 }
 
 void QOrganizerItemSymbianEngine::removeCollectionL(
@@ -1373,11 +1373,11 @@ void QOrganizerItemSymbianEngine::removeCollectionL(
 
 QMap<QString, QOrganizerItemDetailDefinition> 
 QOrganizerItemSymbianEngine::detailDefinitions(
-    const QString& itemType, QOrganizerItemManager::Error* error) const
+    const QString& itemType, QOrganizerManager::Error* error) const
 {
     if (m_definition.isEmpty()) {
         // Get all the detail definitions from the base implementation
-        m_definition = QOrganizerItemManagerEngine::schemaDefinitions();
+        m_definition = QOrganizerManagerEngine::schemaDefinitions();
         
         // Modify the base schema to match backend support
         m_itemTransform.modifyBaseSchemaDefinitions(m_definition);
@@ -1385,16 +1385,16 @@ QOrganizerItemSymbianEngine::detailDefinitions(
     
     // Check if we support the item type
     if (!m_definition.contains(itemType)) {
-        *error = QOrganizerItemManager::NotSupportedError;
+        *error = QOrganizerManager::NotSupportedError;
         return QMap<QString, QOrganizerItemDetailDefinition>();
     }
     
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return m_definition.value(itemType);
 }
 
 bool QOrganizerItemSymbianEngine::startRequest(
-    QOrganizerItemAbstractRequest* req)
+    QOrganizerAbstractRequest* req)
 {
     /*
         This is the entry point to the async API.  The request object describes 
@@ -1436,7 +1436,7 @@ bool QOrganizerItemSymbianEngine::startRequest(
 }
 
 bool QOrganizerItemSymbianEngine::cancelRequest(
-    QOrganizerItemAbstractRequest* req)
+    QOrganizerAbstractRequest* req)
 {
     /*
         Cancel an in progress async request.  If not possible, return false 
@@ -1446,7 +1446,7 @@ bool QOrganizerItemSymbianEngine::cancelRequest(
 }
 
 bool QOrganizerItemSymbianEngine::waitForRequestFinished(
-    QOrganizerItemAbstractRequest* req, int msecs)
+    QOrganizerAbstractRequest* req, int msecs)
 {
     /*
         Wait for a request to complete (up to a max of msecs milliseconds).
@@ -1464,7 +1464,7 @@ bool QOrganizerItemSymbianEngine::waitForRequestFinished(
 }
 
 void QOrganizerItemSymbianEngine::requestDestroyed(
-    QOrganizerItemAbstractRequest* req)
+    QOrganizerAbstractRequest* req)
 {
     /*
         This is called when a request is being deleted.  It lets you know:
@@ -1489,18 +1489,18 @@ void QOrganizerItemSymbianEngine::requestDestroyed(
 }
 
 bool QOrganizerItemSymbianEngine::hasFeature(
-    QOrganizerItemManager::ManagerFeature feature, 
+    QOrganizerManager::ManagerFeature feature, 
     const QString& itemType) const
 {
     Q_UNUSED(itemType);
     switch(feature) {
-        case QOrganizerItemManager::MutableDefinitions:
+        case QOrganizerManager::MutableDefinitions:
             // We don't support save/remove detail definition
             return false;
-        case QOrganizerItemManager::Anonymous:
+        case QOrganizerManager::Anonymous:
             // The engines share the same data
             return false;
-        case QOrganizerItemManager::ChangeLogs:
+        case QOrganizerManager::ChangeLogs:
             // Change logs not supported
             return false;
     }
@@ -1531,7 +1531,7 @@ QStringList QOrganizerItemSymbianEngine::supportedItemTypes() const
 {
     // Lazy initialization
     if (m_definition.isEmpty()) {
-        m_definition = QOrganizerItemManagerEngine::schemaDefinitions();
+        m_definition = QOrganizerManagerEngine::schemaDefinitions();
         m_itemTransform.modifyBaseSchemaDefinitions(m_definition);
     }
     
@@ -1637,76 +1637,76 @@ void QOrganizerItemSymbianEngine::CalendarInfoChangeNotificationL(
 }
 #endif
 
-/*! Transform a Symbian error id to QOrganizerItemManager::Error.
+/*! Transform a Symbian error id to QOrganizerManager::Error.
  *
  * \param symbianError Symbian error.
  * \param QtError Qt error.
  * \return true if there was no error
  *         false if there was an error
 */
-bool QOrganizerItemSymbianEngine::transformError(TInt symbianError, QOrganizerItemManager::Error* qtError)
+bool QOrganizerItemSymbianEngine::transformError(TInt symbianError, QOrganizerManager::Error* qtError)
 {
     switch(symbianError)
     {
         case KErrNone:
         {
-            *qtError = QOrganizerItemManager::NoError;
+            *qtError = QOrganizerManager::NoError;
             break;
         }
         case KErrNotFound:
         {
-            *qtError = QOrganizerItemManager::DoesNotExistError;
+            *qtError = QOrganizerManager::DoesNotExistError;
             break;
         }
         case KErrAlreadyExists:
         {
-            *qtError = QOrganizerItemManager::AlreadyExistsError;
+            *qtError = QOrganizerManager::AlreadyExistsError;
             break;
         }
         case KErrLocked:
         {
-            *qtError = QOrganizerItemManager::LockedError;
+            *qtError = QOrganizerManager::LockedError;
             break;
         }
         case KErrAccessDenied:
         case KErrPermissionDenied:
         {
-            *qtError = QOrganizerItemManager::PermissionsError;
+            *qtError = QOrganizerManager::PermissionsError;
             break;
         }
         case KErrNoMemory:
         {
-            *qtError = QOrganizerItemManager::OutOfMemoryError;
+            *qtError = QOrganizerManager::OutOfMemoryError;
             break;
         }
         case KErrNotSupported:
         {
-            *qtError = QOrganizerItemManager::NotSupportedError;
+            *qtError = QOrganizerManager::NotSupportedError;
             break;
         }
         case KErrArgument:
         {
-            *qtError = QOrganizerItemManager::BadArgumentError;
+            *qtError = QOrganizerManager::BadArgumentError;
             break;
         }
         // KErrInvalidOccurrence is a special error code defined for Qt
         // Organizer API implementation purpose only
         case KErrInvalidOccurrence:
         {
-            *qtError = QOrganizerItemManager::InvalidOccurrenceError;
+            *qtError = QOrganizerManager::InvalidOccurrenceError;
             break;
         }
         case KErrInvalidItemType:
         {
-            *qtError = QOrganizerItemManager::InvalidItemTypeError;
+            *qtError = QOrganizerManager::InvalidItemTypeError;
             break;
         }
         default:
         {
-            *qtError = QOrganizerItemManager::UnspecifiedError;
+            *qtError = QOrganizerManager::UnspecifiedError;
             break;
         }
     }
-    return *qtError == QOrganizerItemManager::NoError;
+    return *qtError == QOrganizerManager::NoError;
 }
 
diff --git a/plugins/organizer/symbian/qorganizersymbian_p.h b/plugins/organizer/symbian/qorganizersymbian_p.h
index 903091398f..fcdf86056c 100644
--- a/plugins/organizer/symbian/qorganizersymbian_p.h
+++ b/plugins/organizer/symbian/qorganizersymbian_p.h
@@ -68,9 +68,9 @@
 #include "qorganizeritem.h"
 #include "qorganizeritemenginelocalid.h"
 #include "qorganizercollectionenginelocalid.h"
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanagerengine.h"
-#include "qorganizeritemmanagerenginefactory.h"
+#include "qorganizermanager.h"
+#include "qorganizermanagerengine.h"
+#include "qorganizermanagerenginefactory.h"
 #include "qorganizeritemchangeset.h"
 
 #include "organizeritemtransform.h"
@@ -157,14 +157,14 @@ private:
 
 
 class QOrganizerItemSymbianFactory : public QObject, 
-public QOrganizerItemManagerEngineFactory
+public QOrganizerManagerEngineFactory
 {
   Q_OBJECT
-  Q_INTERFACES(QtMobility::QOrganizerItemManagerEngineFactory)
+  Q_INTERFACES(QtMobility::QOrganizerManagerEngineFactory)
   public:
-    QOrganizerItemManagerEngine* engine(
+    QOrganizerManagerEngine* engine(
         const QMap<QString, QString>& parameters, 
-        QOrganizerItemManager::Error*);
+        QOrganizerManager::Error*);
     QString managerName() const;
     QOrganizerItemEngineLocalId* createItemEngineLocalId() const;
     QOrganizerCollectionEngineLocalId* createCollectionEngineLocalId() const;
@@ -197,7 +197,7 @@ class QOrganizerItemRequestQueue;
 class CCalCalendarInfo;
 #endif
 
-class QOrganizerItemSymbianEngine : public QOrganizerItemManagerEngine
+class QOrganizerItemSymbianEngine : public QOrganizerManagerEngine
 
 #ifdef SYMBIAN_CALENDAR_V2
                                     ,public MCalFileChangeObserver
@@ -220,19 +220,19 @@ public:
     QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator,
         const QDateTime& periodStart, const QDateTime& periodEnd,
         int maxCount, const QOrganizerItemFetchHint& fetchHint,
-        QOrganizerItemManager::Error* error) const;
+        QOrganizerManager::Error* error) const;
     QList<QOrganizerItem> items(const QDateTime& periodStart,
         const QDateTime& periodEnd,
         const QOrganizerItemFilter& filter, 
         const QList<QOrganizerItemSortOrder>& sortOrders, 
         const QOrganizerItemFetchHint& fetchHint, 
-        QOrganizerItemManager::Error* error) const;
+        QOrganizerManager::Error* error) const;
 
     QList<QOrganizerItemLocalId> itemIds(const QDateTime& periodStart,
         const QDateTime& periodEnd,
         const QOrganizerItemFilter& filter, 
         const QList<QOrganizerItemSortOrder>& sortOrders, 
-        QOrganizerItemManager::Error* error) const;
+        QOrganizerManager::Error* error) const;
     QList<QOrganizerItemLocalId> getIdsModifiedSinceDateL(
         const QDateTime& periodStart,
         const QDateTime& periodEnd,
@@ -248,7 +248,7 @@ public:
         const QOrganizerItemFilter& filter, 
         const QList<QOrganizerItemSortOrder>& sortOrders, 
         const QOrganizerItemFetchHint& fetchHint, 
-        QOrganizerItemManager::Error* error) const;
+        QOrganizerManager::Error* error) const;
     void itemsForExportL(QList<QOrganizerItem>& itemsList, 
         const QDateTime& periodStart,
         const QDateTime& periodEnd,
@@ -257,49 +257,49 @@ public:
         const QOrganizerItemFetchHint& fetchHint) const;
     QOrganizerItem item(const QOrganizerItemLocalId& itemId, 
         const QOrganizerItemFetchHint& fetchHint, 
-        QOrganizerItemManager::Error* error) const;
+        QOrganizerManager::Error* error) const;
 
     bool saveItem(QOrganizerItem* item,
-        QOrganizerItemManager::Error* error);
+        QOrganizerManager::Error* error);
     bool saveItems(QList<QOrganizerItem> *items, 
-        QMap<int, QOrganizerItemManager::Error> *errorMap, 
-        QOrganizerItemManager::Error *error);
+        QMap<int, QOrganizerManager::Error> *errorMap, 
+        QOrganizerManager::Error *error);
 
     bool removeItem(const QOrganizerItemLocalId& organizeritemId, 
-        QOrganizerItemManager::Error* error);
+        QOrganizerManager::Error* error);
     bool removeItems(const QList<QOrganizerItemLocalId> &itemIds, 
-        QMap<int, QOrganizerItemManager::Error> *errorMap, 
-        QOrganizerItemManager::Error *error);
+        QMap<int, QOrganizerManager::Error> *errorMap, 
+        QOrganizerManager::Error *error);
     
     /* Collections - every item belongs to exactly one collection */
     QOrganizerCollection defaultCollection(
-        QOrganizerItemManager::Error* error) const;
+        QOrganizerManager::Error* error) const;
     QList<QOrganizerCollection> collections(
-        QOrganizerItemManager::Error* error) const;
+        QOrganizerManager::Error* error) const;
     QOrganizerCollection collection(
         const QOrganizerCollectionLocalId& collectionId,
-        QOrganizerItemManager::Error* error);
+        QOrganizerManager::Error* error);
     bool saveCollection(QOrganizerCollection* collection, 
-        QOrganizerItemManager::Error* error);
+        QOrganizerManager::Error* error);
     bool removeCollection(const QOrganizerCollectionLocalId& collectionId, 
-        QOrganizerItemManager::Error* error);
+        QOrganizerManager::Error* error);
 
     /* Definitions - Accessors and Mutators */
     QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(
-        const QString& itemType, QOrganizerItemManager::Error* error) const;
+        const QString& itemType, QOrganizerManager::Error* error) const;
 
     /* Capabilities reporting */
-    bool hasFeature(QOrganizerItemManager::ManagerFeature feature, 
+    bool hasFeature(QOrganizerManager::ManagerFeature feature, 
         const QString& itemType) const;
     bool isFilterSupported(const QOrganizerItemFilter& filter) const;
     QList<int> supportedDataTypes() const;
     QStringList supportedItemTypes() const;
 
     /* Asynchronous Request Support */
-    void requestDestroyed(QOrganizerItemAbstractRequest* req);
-    bool startRequest(QOrganizerItemAbstractRequest* req);
-    bool cancelRequest(QOrganizerItemAbstractRequest* req);
-    bool waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs);
+    void requestDestroyed(QOrganizerAbstractRequest* req);
+    bool startRequest(QOrganizerAbstractRequest* req);
+    bool cancelRequest(QOrganizerAbstractRequest* req);
+    bool waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs);
 
 public: // MCalProgressCallBack
     void Progress(TInt aPercentageCompleted);
@@ -316,7 +316,7 @@ public:
     void initializeL();
     /* Util functions */
     static bool transformError(TInt symbianError, 
-        QOrganizerItemManager::Error* qtError);
+        QOrganizerManager::Error* qtError);
     void itemInstancesL(
         QList<QOrganizerItem> &itemInstances,
         const QOrganizerItem &generator,
diff --git a/plugins/organizer/symbian/transform/organizereventtimerangetransform.cpp b/plugins/organizer/symbian/transform/organizereventtimerangetransform.cpp
index 7171ced914..3d7f88fc83 100644
--- a/plugins/organizer/symbian/transform/organizereventtimerangetransform.cpp
+++ b/plugins/organizer/symbian/transform/organizereventtimerangetransform.cpp
@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 #include "organizereventtimerangetransform.h"
-#include "qorganizereventtimerange.h"
+#include "qorganizereventtime.h"
 
-void OrganizerEventTimeRangeTransform::transformToDetailL(const CCalEntry& entry, QOrganizerItem *item)
+void OrganizerEventTimeTransform::transformToDetailL(const CCalEntry& entry, QOrganizerItem *item)
 {
     // pre-condition: type has already been converted
     if (item->type() == QOrganizerItemType::TypeEvent
@@ -50,7 +50,7 @@ void OrganizerEventTimeRangeTransform::transformToDetailL(const CCalEntry& entry
         TCalTime startTime = entry.StartTimeL();
         TCalTime endTime = entry.EndTimeL();
 
-        QOrganizerEventTimeRange range;
+        QOrganizerEventTime range;
         if (startTime.TimeUtcL() != Time::NullTTime())
             range.setStartDateTime(toQDateTimeL(startTime));
 
@@ -67,14 +67,14 @@ void OrganizerEventTimeRangeTransform::transformToDetailL(const CCalEntry& entry
     }
 }
 
-void OrganizerEventTimeRangeTransform::transformToDetailL(const CCalInstance& instance, QOrganizerItem *itemInstance)
+void OrganizerEventTimeTransform::transformToDetailL(const CCalInstance& instance, QOrganizerItem *itemInstance)
 {
     if (itemInstance->type() == QOrganizerItemType::TypeEventOccurrence) // type has already been converted
     {
         TCalTime startTime = instance.StartTimeL();
         TCalTime endTime = instance.EndTimeL();
 
-        QOrganizerEventTimeRange range;
+        QOrganizerEventTime range;
         if (startTime.TimeUtcL() != Time::NullTTime())
             range.setStartDateTime(toQDateTimeL(startTime));
 
@@ -91,11 +91,11 @@ void OrganizerEventTimeRangeTransform::transformToDetailL(const CCalInstance& in
     }
 }
 
-void OrganizerEventTimeRangeTransform::transformToEntryL(const QOrganizerItem& item, CCalEntry* entry)
+void OrganizerEventTimeTransform::transformToEntryL(const QOrganizerItem& item, CCalEntry* entry)
 {
     if (item.type() == QOrganizerItemType::TypeEvent || item.type() == QOrganizerItemType::TypeEventOccurrence)
     {
-        QOrganizerEventTimeRange range = item.detail<QOrganizerEventTimeRange>();
+        QOrganizerEventTime range = item.detail<QOrganizerEventTime>();
         
         // Symbian calendar server makes the client process panic in case there
         // is no start time for an event. As a work-around let's check the
@@ -117,7 +117,7 @@ void OrganizerEventTimeRangeTransform::transformToEntryL(const QOrganizerItem& i
     }
 }
 
-QString OrganizerEventTimeRangeTransform::detailDefinitionName()
+QString OrganizerEventTimeTransform::detailDefinitionName()
 {
-    return QOrganizerEventTimeRange::DefinitionName;
+    return QOrganizerEventTime::DefinitionName;
 }
diff --git a/plugins/organizer/symbian/transform/organizereventtimerangetransform.h b/plugins/organizer/symbian/transform/organizereventtimerangetransform.h
index afe70fdfa2..7c8f5ffe1f 100644
--- a/plugins/organizer/symbian/transform/organizereventtimerangetransform.h
+++ b/plugins/organizer/symbian/transform/organizereventtimerangetransform.h
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#ifndef ORGANIZEREVENTTIMERANGETRANSFORM_H_
-#define ORGANIZEREVENTTIMERANGETRANSFORM_H_
+#ifndef ORGANIZEREVENTTIMETRANSFORM_H_
+#define ORGANIZEREVENTTIMETRANSFORM_H_
 
 #include "organizeritemdetailtransform.h"
 
-class OrganizerEventTimeRangeTransform : public OrganizerItemDetailTransform
+class OrganizerEventTimeTransform : public OrganizerItemDetailTransform
 {
 public:
     void transformToDetailL(const CCalEntry& entry, QOrganizerItem *item);
@@ -53,4 +53,4 @@ public:
     QString detailDefinitionName();
 };
 
-#endif /* ORGANIZEREVENTTIMERANGETRANSFORM_H_ */
+#endif /* ORGANIZEREVENTTIMETRANSFORM_H_ */
diff --git a/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.cpp b/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.cpp
index 96a63f7011..7949603462 100644
--- a/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.cpp
+++ b/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 #include "organizeritemrecurrencetransform.h"
 #include "qorganizeritemrecurrence.h"
-#include "qorganizereventtimerange.h"
-#include "qorganizertodotimerange.h"
+#include "qorganizereventtime.h"
+#include "qorganizertodotime.h"
 
 #include <calrrule.h>
 
@@ -117,12 +117,12 @@ void OrganizerItemRecurrenceTransform::transformToEntryL(const QOrganizerItem& i
     // TODO: Also other item types may have a recurrence item
     QDateTime startDateTime;
     if (QOrganizerItemType::TypeTodo == item.type()) {
-        startDateTime = ((QOrganizerTodoTimeRange)
-            (item.detail(QOrganizerTodoTimeRange::DefinitionName))).
+        startDateTime = ((QOrganizerTodoTime)
+            (item.detail(QOrganizerTodoTime::DefinitionName))).
             startDateTime();
     } else { 
-        startDateTime = ((QOrganizerEventTimeRange)
-            item.detail(QOrganizerEventTimeRange::DefinitionName)).
+        startDateTime = ((QOrganizerEventTime)
+            item.detail(QOrganizerEventTime::DefinitionName)).
             startDateTime();
     }
 
@@ -173,10 +173,10 @@ QSet<QDate> OrganizerItemRecurrenceTransform::toQDatesL(const RArray<TCalTime> &
     return dates;
 }
 
-QSet<QOrganizerItemRecurrenceRule> OrganizerItemRecurrenceTransform::toItemRecurrenceRulesL(const TCalRRule &calrrule) const
+QSet<QOrganizerRecurrenceRule> OrganizerItemRecurrenceTransform::toItemRecurrenceRulesL(const TCalRRule &calrrule) const
 {
-    QSet<QOrganizerItemRecurrenceRule> rrules;
-    QOrganizerItemRecurrenceRule rrule;
+    QSet<QOrganizerRecurrenceRule> rrules;
+    QOrganizerRecurrenceRule rrule;
 
     rrule.setFrequency(toFrequencyL(calrrule.Type()));
 
@@ -229,11 +229,11 @@ QSet<QOrganizerItemRecurrenceRule> OrganizerItemRecurrenceTransform::toItemRecur
     }
     CleanupStack::PopAndDestroy(&tDayOfMonthArray);
 
-    // Convert by-month into QOrganizerItemRecurrenceRule months
+    // Convert by-month into QOrganizerRecurrenceRule months
     RArray<TMonth> byMonth;
     CleanupClosePushL(byMonth);
     calrrule.GetByMonthL(byMonth);
-    QSet<QOrganizerItemRecurrenceRule::Month> months;
+    QSet<QOrganizerRecurrenceRule::Month> months;
     for (TInt i(0); i < byMonth.Count(); i++) {
         months.insert(toMonthL(byMonth[i]));
     }
@@ -263,12 +263,12 @@ QSet<QOrganizerItemRecurrenceRule> OrganizerItemRecurrenceTransform::toItemRecur
     return rrules;
 }
 
-TCalRRule OrganizerItemRecurrenceTransform::toCalRRuleL(QSet<QOrganizerItemRecurrenceRule> recrules, QDateTime startDateTime) const
+TCalRRule OrganizerItemRecurrenceTransform::toCalRRuleL(QSet<QOrganizerRecurrenceRule> recrules, QDateTime startDateTime) const
 {
     TCalRRule calRule;
     if (recrules.count()) {
         // TODO: only taking the first available into account
-        QOrganizerItemRecurrenceRule rrule = recrules.toList().first();
+        QOrganizerRecurrenceRule rrule = recrules.toList().first();
 
         // daysOfYear is not supported by symbian calendar server
         if (!rrule.daysOfYear().isEmpty()) {
@@ -334,7 +334,7 @@ TCalRRule OrganizerItemRecurrenceTransform::toCalRRuleL(QSet<QOrganizerItemRecur
         }
 
         // Set the interval. Values greater than 255 or less than 1 are
-        // ignored by TCalRRule. QOrganizerItemRecurrenceRule::interval()
+        // ignored by TCalRRule. QOrganizerRecurrenceRule::interval()
         // defaults to 1 if it was not set.
         calRule.SetInterval(rrule.interval());
 
@@ -349,41 +349,41 @@ TCalRRule OrganizerItemRecurrenceTransform::toCalRRuleL(QSet<QOrganizerItemRecur
 }
 
 /*
- * Convert TCalRRule type into QOrganizerItemRecurrenceRule frequency.
+ * Convert TCalRRule type into QOrganizerRecurrenceRule frequency.
  */
-QOrganizerItemRecurrenceRule::Frequency OrganizerItemRecurrenceTransform::toFrequencyL(TCalRRule::TType type) const
+QOrganizerRecurrenceRule::Frequency OrganizerItemRecurrenceTransform::toFrequencyL(TCalRRule::TType type) const
 {
     switch (type)
     {
     case TCalRRule::EDaily:
-        return QOrganizerItemRecurrenceRule::Daily;
+        return QOrganizerRecurrenceRule::Daily;
     case TCalRRule::EWeekly:
-        return QOrganizerItemRecurrenceRule::Weekly;
+        return QOrganizerRecurrenceRule::Weekly;
     case TCalRRule::EMonthly:
-        return QOrganizerItemRecurrenceRule::Monthly;
+        return QOrganizerRecurrenceRule::Monthly;
     case TCalRRule::EYearly:
-        return QOrganizerItemRecurrenceRule::Yearly;
+        return QOrganizerRecurrenceRule::Yearly;
     default:
         // Other frequencies types not supported
         User::Leave(KErrNotSupported);
-        return QOrganizerItemRecurrenceRule::Daily; // never happens
+        return QOrganizerRecurrenceRule::Daily; // never happens
     }
 }
 
 /*
- * Convert QOrganizerItemRecurrenceRule frequency into TCalRRule type.
+ * Convert QOrganizerRecurrenceRule frequency into TCalRRule type.
  */
-TCalRRule::TType OrganizerItemRecurrenceTransform::toTypeL(QOrganizerItemRecurrenceRule::Frequency frequency) const
+TCalRRule::TType OrganizerItemRecurrenceTransform::toTypeL(QOrganizerRecurrenceRule::Frequency frequency) const
 {
     switch (frequency)
     {
-    case QOrganizerItemRecurrenceRule::Daily:
+    case QOrganizerRecurrenceRule::Daily:
         return TCalRRule::EDaily;
-    case QOrganizerItemRecurrenceRule::Weekly:
+    case QOrganizerRecurrenceRule::Weekly:
         return TCalRRule::EWeekly;
-    case QOrganizerItemRecurrenceRule::Monthly:
+    case QOrganizerRecurrenceRule::Monthly:
         return TCalRRule::EMonthly;
-    case QOrganizerItemRecurrenceRule::Yearly:
+    case QOrganizerRecurrenceRule::Yearly:
         return TCalRRule::EYearly;
     default:
         // Other frequencies types not supported by symbian calendar server
@@ -471,7 +471,7 @@ void OrganizerItemRecurrenceTransform::toMonthDaysL(QSet<int> daysOfMonth, TCalR
  * Convert months into TMonth array and set it as the "by-month" of the
  * TCalRRule
  */
-void OrganizerItemRecurrenceTransform::toTMonthsL(QSet<QOrganizerItemRecurrenceRule::Month> months, TCalRRule &calRRule) const
+void OrganizerItemRecurrenceTransform::toTMonthsL(QSet<QOrganizerRecurrenceRule::Month> months, TCalRRule &calRRule) const
 {
     if (months.count() > 1) {
         // Symbian recurrence rule only supports one month, all the others
@@ -483,7 +483,7 @@ void OrganizerItemRecurrenceTransform::toTMonthsL(QSet<QOrganizerItemRecurrenceR
     if (months.count()) {
         RArray<TMonth> byMonth;
         CleanupClosePushL(byMonth);
-        foreach (QOrganizerItemRecurrenceRule::Month month, months) {
+        foreach (QOrganizerRecurrenceRule::Month month, months) {
             byMonth.AppendL(toTMonthL(month));
         }
         calRRule.SetByMonth(byMonth);
@@ -539,66 +539,66 @@ TDay OrganizerItemRecurrenceTransform::toTDayL(Qt::DayOfWeek dayOfWeek) const
     return EMonday; // never happens
 }
 
-QOrganizerItemRecurrenceRule::Month OrganizerItemRecurrenceTransform::toMonthL(TMonth month) const
+QOrganizerRecurrenceRule::Month OrganizerItemRecurrenceTransform::toMonthL(TMonth month) const
 {
     switch (month) {
     case EJanuary:
-        return QOrganizerItemRecurrenceRule::January;
+        return QOrganizerRecurrenceRule::January;
     case EFebruary:
-        return QOrganizerItemRecurrenceRule::February;
+        return QOrganizerRecurrenceRule::February;
     case EMarch:
-        return QOrganizerItemRecurrenceRule::March;
+        return QOrganizerRecurrenceRule::March;
     case EApril:
-        return QOrganizerItemRecurrenceRule::April;
+        return QOrganizerRecurrenceRule::April;
     case EMay:
-        return QOrganizerItemRecurrenceRule::May;
+        return QOrganizerRecurrenceRule::May;
     case EJune:
-        return QOrganizerItemRecurrenceRule::June;
+        return QOrganizerRecurrenceRule::June;
     case EJuly:
-        return QOrganizerItemRecurrenceRule::July;
+        return QOrganizerRecurrenceRule::July;
     case EAugust:
-        return QOrganizerItemRecurrenceRule::August;
+        return QOrganizerRecurrenceRule::August;
     case ESeptember:
-        return QOrganizerItemRecurrenceRule::September;
+        return QOrganizerRecurrenceRule::September;
     case EOctober:
-        return QOrganizerItemRecurrenceRule::October;
+        return QOrganizerRecurrenceRule::October;
     case ENovember:
-        return QOrganizerItemRecurrenceRule::November;
+        return QOrganizerRecurrenceRule::November;
     case EDecember:
-        return QOrganizerItemRecurrenceRule::December;
+        return QOrganizerRecurrenceRule::December;
     default:
         // Should never happen
         User::Leave(KErrArgument);
     }
-    return QOrganizerItemRecurrenceRule::January; // never happens
+    return QOrganizerRecurrenceRule::January; // never happens
 }
 
-TMonth OrganizerItemRecurrenceTransform::toTMonthL(QOrganizerItemRecurrenceRule::Month month) const
+TMonth OrganizerItemRecurrenceTransform::toTMonthL(QOrganizerRecurrenceRule::Month month) const
 {
     switch (month) {
-    case QOrganizerItemRecurrenceRule::January:
+    case QOrganizerRecurrenceRule::January:
         return EJanuary;
-    case QOrganizerItemRecurrenceRule::February:
+    case QOrganizerRecurrenceRule::February:
         return EFebruary;
-    case QOrganizerItemRecurrenceRule::March:
+    case QOrganizerRecurrenceRule::March:
         return EMarch;
-    case QOrganizerItemRecurrenceRule::April:
+    case QOrganizerRecurrenceRule::April:
         return EApril;
-    case QOrganizerItemRecurrenceRule::May:
+    case QOrganizerRecurrenceRule::May:
         return EMay;
-    case QOrganizerItemRecurrenceRule::June:
+    case QOrganizerRecurrenceRule::June:
         return EJune;
-    case QOrganizerItemRecurrenceRule::July:
+    case QOrganizerRecurrenceRule::July:
         return EJuly;
-    case QOrganizerItemRecurrenceRule::August:
+    case QOrganizerRecurrenceRule::August:
         return EAugust;
-    case QOrganizerItemRecurrenceRule::September:
+    case QOrganizerRecurrenceRule::September:
         return ESeptember;
-    case QOrganizerItemRecurrenceRule::October:
+    case QOrganizerRecurrenceRule::October:
         return EOctober;
-    case QOrganizerItemRecurrenceRule::November:
+    case QOrganizerRecurrenceRule::November:
         return ENovember;
-    case QOrganizerItemRecurrenceRule::December:
+    case QOrganizerRecurrenceRule::December:
         return EDecember;
     default:
         // Should never happen
diff --git a/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.h b/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.h
index aac47bb944..185d9520c5 100644
--- a/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.h
+++ b/plugins/organizer/symbian/transform/organizeritemrecurrencetransform.h
@@ -42,7 +42,7 @@
 #define ORGANIZERITEMRECURRENCETRANSFORM_H_
 
 #include "organizeritemdetailtransform.h"
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule.h"
 
 #include <calrrule.h>
 
@@ -58,18 +58,18 @@ public:
 private:
     void toTCalTimesL(const QSet<QDate> &dateTimes, RArray<TCalTime> &calDates) const;
     QSet<QDate> toQDatesL(const RArray<TCalTime> &calDates) const;
-    QSet<QOrganizerItemRecurrenceRule> toItemRecurrenceRulesL(const TCalRRule &calrrule) const;
-    TCalRRule toCalRRuleL(QSet<QOrganizerItemRecurrenceRule> recrules, QDateTime startDateTime) const;
-    QOrganizerItemRecurrenceRule::Frequency toFrequencyL(TCalRRule::TType type) const;
-    TCalRRule::TType toTypeL(QOrganizerItemRecurrenceRule::Frequency frequency) const;
+    QSet<QOrganizerRecurrenceRule> toItemRecurrenceRulesL(const TCalRRule &calrrule) const;
+    TCalRRule toCalRRuleL(QSet<QOrganizerRecurrenceRule> recrules, QDateTime startDateTime) const;
+    QOrganizerRecurrenceRule::Frequency toFrequencyL(TCalRRule::TType type) const;
+    TCalRRule::TType toTypeL(QOrganizerRecurrenceRule::Frequency frequency) const;
     void toDaysL(QSet<Qt::DayOfWeek> daysOfWeek, QDateTime startDateTime, TCalRRule &calRRule) const;
     void toDaysOfMonthL(QSet<Qt::DayOfWeek> daysOfWeek, QSet<int> positions, TCalRRule &calRRule) const;
     void toMonthDaysL(QSet<int> daysOfMonth, TCalRRule &calRule) const;
-    void toTMonthsL(QSet<QOrganizerItemRecurrenceRule::Month> months, TCalRRule &calRRule) const;
+    void toTMonthsL(QSet<QOrganizerRecurrenceRule::Month> months, TCalRRule &calRRule) const;
     Qt::DayOfWeek toDayOfWeekL(TDay day) const;
     TDay toTDayL(Qt::DayOfWeek dayOfWeek) const;
-    QOrganizerItemRecurrenceRule::Month toMonthL(TMonth month) const;
-    TMonth toTMonthL(QOrganizerItemRecurrenceRule::Month month) const;
+    QOrganizerRecurrenceRule::Month toMonthL(TMonth month) const;
+    TMonth toTMonthL(QOrganizerRecurrenceRule::Month month) const;
 };
 
 #endif // ORGANIZERITEMRECURRENCETRANSFORM_H_
diff --git a/plugins/organizer/symbian/transform/organizeritemremindertransform.cpp b/plugins/organizer/symbian/transform/organizeritemremindertransform.cpp
index 6e4d67e89a..6f9d433e58 100644
--- a/plugins/organizer/symbian/transform/organizeritemremindertransform.cpp
+++ b/plugins/organizer/symbian/transform/organizeritemremindertransform.cpp
@@ -45,8 +45,8 @@
 #include "qorganizeritemaudiblereminder.h"
 #include "qorganizeritemvisualreminder.h"
 #include "qorganizeritememailreminder.h"
-#include "qorganizereventtimerange.h"
-#include "qorganizertodotimerange.h"
+#include "qorganizereventtime.h"
+#include "qorganizertodotime.h"
 #include "organizeritemremindertransform.h"
 
 const int secondsInOneMinute = 60;
diff --git a/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.cpp b/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.cpp
index d594f72d72..91cdd82291 100644
--- a/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.cpp
+++ b/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.cpp
@@ -39,32 +39,32 @@
 **
 ****************************************************************************/
 #include "organizerjournaltimerangetransform.h"
-#include "qorganizerjournaltimerange.h"
+#include "qorganizerjournaltime.h"
 
-void OrganizerJournalTimeRangeTransform::transformToDetailL(const CCalEntry& entry, QOrganizerItem *item)
+void OrganizerJournalTimeTransform::transformToDetailL(const CCalEntry& entry, QOrganizerItem *item)
 {
     if (item->type() == QOrganizerItemType::TypeJournal)
     {
         TCalTime dtstamp = entry.DTStampL(); // TODO: is DTStamp correct?
         if (dtstamp.TimeUtcL() != Time::NullTTime()) {
-            QOrganizerJournalTimeRange range;
+            QOrganizerJournalTime range;
             range.setEntryDateTime(toQDateTimeL(entry.DTStampL()));
             item->saveDetail(&range);
         }
     }
 }
 
-void OrganizerJournalTimeRangeTransform::transformToEntryL(const QOrganizerItem& item, CCalEntry* entry)
+void OrganizerJournalTimeTransform::transformToEntryL(const QOrganizerItem& item, CCalEntry* entry)
 {
     if (item.type() == QOrganizerItemType::TypeJournal)
     {
-        QOrganizerJournalTimeRange range = item.detail<QOrganizerJournalTimeRange>();
+        QOrganizerJournalTime range = item.detail<QOrganizerJournalTime>();
         if (!range.isEmpty())
             entry->SetDTStampL(toTCalTimeL(range.entryDateTime())); // TODO: is DTStamp correct?
     }
 }
 
-QString OrganizerJournalTimeRangeTransform::detailDefinitionName()
+QString OrganizerJournalTimeTransform::detailDefinitionName()
 {
-    return QOrganizerJournalTimeRange::DefinitionName;    
+    return QOrganizerJournalTime::DefinitionName;    
 }
diff --git a/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.h b/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.h
index 157a3dcdb5..53b1b9e7a5 100644
--- a/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.h
+++ b/plugins/organizer/symbian/transform/organizerjournaltimerangetransform.h
@@ -38,12 +38,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef ORGANIZERJOURNALTIMERANGETRANSFORM_H_
-#define ORGANIZERJOURNALTIMERANGETRANSFORM_H_
+#ifndef ORGANIZERJOURNALTIMETRANSFORM_H_
+#define ORGANIZERJOURNALTIMETRANSFORM_H_
 
 #include "organizeritemdetailtransform.h"
 
-class OrganizerJournalTimeRangeTransform : public OrganizerItemDetailTransform
+class OrganizerJournalTimeTransform : public OrganizerItemDetailTransform
 {
 public:
     void transformToDetailL(const CCalEntry& entry, QOrganizerItem *item);
@@ -51,4 +51,4 @@ public:
     QString detailDefinitionName();
 };
 
-#endif /* ORGANIZERJOURNALTIMERANGETRANSFORM_H_ */
+#endif /* ORGANIZERJOURNALTIMETRANSFORM_H_ */
diff --git a/plugins/organizer/symbian/transform/organizertodotimerangetransform.cpp b/plugins/organizer/symbian/transform/organizertodotimerangetransform.cpp
index b2933126bb..4d1f91a6da 100644
--- a/plugins/organizer/symbian/transform/organizertodotimerangetransform.cpp
+++ b/plugins/organizer/symbian/transform/organizertodotimerangetransform.cpp
@@ -39,16 +39,16 @@
 **
 ****************************************************************************/
 #include "organizertodotimerangetransform.h"
-#include "qorganizertodotimerange.h"
+#include "qorganizertodotime.h"
 
-void OrganizerTodoTimeRangeTransform::transformToDetailL(const CCalEntry& entry, QOrganizerItem *item)
+void OrganizerTodoTimeTransform::transformToDetailL(const CCalEntry& entry, QOrganizerItem *item)
 {
     if(item->type() == QOrganizerItemType::TypeTodo)
     {
         TCalTime startTime = entry.StartTimeL();
         TCalTime endTime = entry.EndTimeL();
 
-        QOrganizerTodoTimeRange range;
+        QOrganizerTodoTime range;
         if (startTime.TimeUtcL() != Time::NullTTime())
             range.setStartDateTime(toQDateTimeL(startTime));
         if (endTime.TimeUtcL() != Time::NullTTime())
@@ -59,14 +59,14 @@ void OrganizerTodoTimeRangeTransform::transformToDetailL(const CCalEntry& entry,
     }
 }
 
-void OrganizerTodoTimeRangeTransform::transformToDetailL(const CCalInstance& instance, QOrganizerItem *itemInstance)
+void OrganizerTodoTimeTransform::transformToDetailL(const CCalInstance& instance, QOrganizerItem *itemInstance)
 {
     if(itemInstance->type() == QOrganizerItemType::TypeTodoOccurrence)
     {
         TCalTime startTime = instance.StartTimeL();
         TCalTime endTime = instance.EndTimeL();
 
-        QOrganizerTodoTimeRange range;
+        QOrganizerTodoTime range;
         if (startTime.TimeUtcL() != Time::NullTTime())
             range.setStartDateTime(toQDateTimeL(startTime));
         if (endTime.TimeUtcL() != Time::NullTTime())
@@ -77,11 +77,11 @@ void OrganizerTodoTimeRangeTransform::transformToDetailL(const CCalInstance& ins
     }
 }
 
-void OrganizerTodoTimeRangeTransform::transformToEntryL(const QOrganizerItem& item, CCalEntry* entry)
+void OrganizerTodoTimeTransform::transformToEntryL(const QOrganizerItem& item, CCalEntry* entry)
 {
     if(item.type() == QOrganizerItemType::TypeTodo || item.type() == QOrganizerItemType::TypeTodoOccurrence)
     {
-        QOrganizerTodoTimeRange range = item.detail<QOrganizerTodoTimeRange>();
+        QOrganizerTodoTime range = item.detail<QOrganizerTodoTime>();
         
         // Nothing to do?
         if (range.isEmpty())
@@ -98,7 +98,7 @@ void OrganizerTodoTimeRangeTransform::transformToEntryL(const QOrganizerItem& it
     }
 }
 
-QString OrganizerTodoTimeRangeTransform::detailDefinitionName()
+QString OrganizerTodoTimeTransform::detailDefinitionName()
 {
-    return QOrganizerTodoTimeRange::DefinitionName;    
+    return QOrganizerTodoTime::DefinitionName;    
 }
diff --git a/plugins/organizer/symbian/transform/organizertodotimerangetransform.h b/plugins/organizer/symbian/transform/organizertodotimerangetransform.h
index 7d11c80c43..1e99e1956c 100644
--- a/plugins/organizer/symbian/transform/organizertodotimerangetransform.h
+++ b/plugins/organizer/symbian/transform/organizertodotimerangetransform.h
@@ -38,12 +38,12 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef ORGANIZERTODOTIMERANGETRANSFORM_H_
-#define ORGANIZERTODOTIMERANGETRANSFORM_H_
+#ifndef ORGANIZERTODOTIMETRANSFORM_H_
+#define ORGANIZERTODOTIMETRANSFORM_H_
 
 #include "organizeritemdetailtransform.h"
 
-class OrganizerTodoTimeRangeTransform : public OrganizerItemDetailTransform
+class OrganizerTodoTimeTransform : public OrganizerItemDetailTransform
 {
 public:
     void transformToDetailL(const CCalEntry& entry, QOrganizerItem *item);
@@ -52,4 +52,4 @@ public:
     QString detailDefinitionName();
 };
 
-#endif /* ORGANIZERTODOTIMERANGETRANSFORM_H_ */
+#endif /* ORGANIZERTODOTIMETRANSFORM_H_ */
diff --git a/plugins/organizer/symbian/tsrc/tst_detaildef/tst_detaildef.cpp b/plugins/organizer/symbian/tsrc/tst_detaildef/tst_detaildef.cpp
index 21a3c8c9cb..86455b4121 100644
--- a/plugins/organizer/symbian/tsrc/tst_detaildef/tst_detaildef.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_detaildef/tst_detaildef.cpp
@@ -66,13 +66,13 @@ private slots:
     void fetchJournalDetailDef();
     
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
 };
 
 void TestDetailDef::init()
 {
     // Create a new item manager instance
-    m_om = new QOrganizerItemManager(m_managerNameSymbian);
+    m_om = new QOrganizerManager(m_managerNameSymbian);
     
     // Cleanup by deleting all items
     m_om->removeItems(m_om->itemIds());
@@ -144,10 +144,10 @@ void TestDetailDef::fetchEventDetailDef()
     QCOMPARE(def, def1);
     
     // Event time range
-    def = detailDef.value(QOrganizerEventTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerEventTime::DefinitionName);
     QVERIFY(!def.isEmpty());
     QVERIFY(def.isUnique());
-    def1 = m_om->detailDefinition(QOrganizerEventTimeRange::DefinitionName, QOrganizerItemType::TypeEvent);
+    def1 = m_om->detailDefinition(QOrganizerEventTime::DefinitionName, QOrganizerItemType::TypeEvent);
     QCOMPARE(def, def1);
     
     // Priority
@@ -177,15 +177,15 @@ void TestDetailDef::fetchEventDetailDef()
     QCOMPARE(def, def1);
     
     // To-do time range - Not supported
-    def = detailDef.value(QOrganizerTodoTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerTodoTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerTodoTimeRange::DefinitionName, QOrganizerItemType::TypeEvent);
+    def1 = m_om->detailDefinition(QOrganizerTodoTime::DefinitionName, QOrganizerItemType::TypeEvent);
     QCOMPARE(def, def1);
     
     // Journal time range - Not supported
-    def = detailDef.value(QOrganizerJournalTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerJournalTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerJournalTimeRange::DefinitionName, QOrganizerItemType::TypeEvent);
+    def1 = m_om->detailDefinition(QOrganizerJournalTime::DefinitionName, QOrganizerItemType::TypeEvent);
     QCOMPARE(def, def1);
 }
 
@@ -246,10 +246,10 @@ void TestDetailDef::fetchEventOccDetailDef()
     QCOMPARE(def, def1);
     
     // Event time range
-    def = detailDef.value(QOrganizerEventTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerEventTime::DefinitionName);
     QVERIFY(!def.isEmpty());
     QVERIFY(def.isUnique());
-    def1 = m_om->detailDefinition(QOrganizerEventTimeRange::DefinitionName, QOrganizerItemType::TypeEventOccurrence);
+    def1 = m_om->detailDefinition(QOrganizerEventTime::DefinitionName, QOrganizerItemType::TypeEventOccurrence);
     QCOMPARE(def, def1);
     
     // Priority
@@ -280,15 +280,15 @@ void TestDetailDef::fetchEventOccDetailDef()
     QCOMPARE(def, def1);
     
     // To-do time range - Not supported
-    def = detailDef.value(QOrganizerTodoTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerTodoTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerTodoTimeRange::DefinitionName, QOrganizerItemType::TypeEventOccurrence);
+    def1 = m_om->detailDefinition(QOrganizerTodoTime::DefinitionName, QOrganizerItemType::TypeEventOccurrence);
     QCOMPARE(def, def1);
     
     // Journal time range - Not supported
-    def = detailDef.value(QOrganizerJournalTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerJournalTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerJournalTimeRange::DefinitionName, QOrganizerItemType::TypeEventOccurrence);
+    def1 = m_om->detailDefinition(QOrganizerJournalTime::DefinitionName, QOrganizerItemType::TypeEventOccurrence);
     QCOMPARE(def, def1);
 }
 
@@ -350,9 +350,9 @@ void TestDetailDef::fetchTodoDetailDef()
     QCOMPARE(def, def1);
     
     // Event time range - Not supported
-    def = detailDef.value(QOrganizerEventTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerEventTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerEventTimeRange::DefinitionName, QOrganizerItemType::TypeTodo);
+    def1 = m_om->detailDefinition(QOrganizerEventTime::DefinitionName, QOrganizerItemType::TypeTodo);
     QCOMPARE(def, def1);
     
     // Priority
@@ -382,16 +382,16 @@ void TestDetailDef::fetchTodoDetailDef()
     QCOMPARE(def, def1);
     
     // To-do time range
-    def = detailDef.value(QOrganizerTodoTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerTodoTime::DefinitionName);
     QVERIFY(!def.isEmpty());
     QVERIFY(def.isUnique());
-    def1 = m_om->detailDefinition(QOrganizerTodoTimeRange::DefinitionName, QOrganizerItemType::TypeTodo);
+    def1 = m_om->detailDefinition(QOrganizerTodoTime::DefinitionName, QOrganizerItemType::TypeTodo);
     QCOMPARE(def, def1);
     
     // Journal time range - Not supported
-    def = detailDef.value(QOrganizerJournalTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerJournalTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerJournalTimeRange::DefinitionName, QOrganizerItemType::TypeTodo);
+    def1 = m_om->detailDefinition(QOrganizerJournalTime::DefinitionName, QOrganizerItemType::TypeTodo);
     QCOMPARE(def, def1);
 }
 
@@ -452,9 +452,9 @@ void TestDetailDef::fetchTodoOccDetailDef()
     QCOMPARE(def, def1);
     
     // Event time range - Not supported
-    def = detailDef.value(QOrganizerEventTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerEventTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerEventTimeRange::DefinitionName, QOrganizerItemType::TypeTodoOccurrence);
+    def1 = m_om->detailDefinition(QOrganizerEventTime::DefinitionName, QOrganizerItemType::TypeTodoOccurrence);
     QCOMPARE(def, def1);
     
     // Priority
@@ -485,16 +485,16 @@ void TestDetailDef::fetchTodoOccDetailDef()
     QCOMPARE(def, def1);
     
     // To-do time range
-    def = detailDef.value(QOrganizerTodoTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerTodoTime::DefinitionName);
     QVERIFY(!def.isEmpty());
     QVERIFY(def.isUnique());
-    def1 = m_om->detailDefinition(QOrganizerTodoTimeRange::DefinitionName, QOrganizerItemType::TypeTodoOccurrence);
+    def1 = m_om->detailDefinition(QOrganizerTodoTime::DefinitionName, QOrganizerItemType::TypeTodoOccurrence);
     QCOMPARE(def, def1);
     
     // Journal time range - Not supported
-    def = detailDef.value(QOrganizerJournalTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerJournalTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerJournalTimeRange::DefinitionName, QOrganizerItemType::TypeTodoOccurrence);
+    def1 = m_om->detailDefinition(QOrganizerJournalTime::DefinitionName, QOrganizerItemType::TypeTodoOccurrence);
     QCOMPARE(def, def1);
 }
 
@@ -557,9 +557,9 @@ void TestDetailDef::fetchNoteDetailDef()
     QCOMPARE(def, def1);
     
     // Event time range - Not supported
-    def = detailDef.value(QOrganizerEventTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerEventTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerEventTimeRange::DefinitionName, QOrganizerItemType::TypeNote);
+    def1 = m_om->detailDefinition(QOrganizerEventTime::DefinitionName, QOrganizerItemType::TypeNote);
     QCOMPARE(def, def1);
     
     // Priority - Not supported
@@ -587,15 +587,15 @@ void TestDetailDef::fetchNoteDetailDef()
     QCOMPARE(def, def1);
     
     // To-do time range - Not supported
-    def = detailDef.value(QOrganizerTodoTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerTodoTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerTodoTimeRange::DefinitionName, QOrganizerItemType::TypeNote);
+    def1 = m_om->detailDefinition(QOrganizerTodoTime::DefinitionName, QOrganizerItemType::TypeNote);
     QCOMPARE(def, def1);
     
     // Journal time range - Not supported
-    def = detailDef.value(QOrganizerJournalTimeRange::DefinitionName);
+    def = detailDef.value(QOrganizerJournalTime::DefinitionName);
     QVERIFY(def.isEmpty());
-    def1 = m_om->detailDefinition(QOrganizerJournalTimeRange::DefinitionName, QOrganizerItemType::TypeNote);
+    def1 = m_om->detailDefinition(QOrganizerJournalTime::DefinitionName, QOrganizerItemType::TypeNote);
     QCOMPARE(def, def1);
     */
 }
diff --git a/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp b/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp
index b0ccf0f2a7..fadc8a7d04 100644
--- a/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp
@@ -49,7 +49,7 @@
 QTM_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QOrganizerItemLocation)
-Q_DECLARE_METATYPE(QOrganizerItemManager::Error)
+Q_DECLARE_METATYPE(QOrganizerManager::Error)
 
 class TestItemLocation : public QObject
 {
@@ -67,7 +67,7 @@ private:
     void addLocationData(QString managerName, QString itemType);
     
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
     
 };
 
@@ -76,7 +76,7 @@ void TestItemLocation::init()
     QFETCH(QString, managerName);
     
     // Create a new item manager instance
-    m_om = new QOrganizerItemManager(managerName);
+    m_om = new QOrganizerManager(managerName);
     
     // Cleanup by deleting all items
     m_om->removeItems(m_om->itemIds());
@@ -93,7 +93,7 @@ void TestItemLocation::cleanup()
 void TestItemLocation::addLocationDetail_data()
 {
     // Get the list of all available item managers
-    QStringList availableManagers = QOrganizerItemManager::availableManagers();
+    QStringList availableManagers = QOrganizerManager::availableManagers();
     
     // Remove these since test would fail
     availableManagers.removeAll("invalid");
@@ -104,7 +104,7 @@ void TestItemLocation::addLocationDetail_data()
     QTest::addColumn<QString>("itemType");
     QTest::addColumn<QDateTime>("startTime");
     QTest::addColumn<QOrganizerItemLocation>("location");
-    QTest::addColumn<QOrganizerItemManager::Error>("error");
+    QTest::addColumn<QOrganizerManager::Error>("error");
     
     foreach(QString manager, availableManagers) {
     	addLocationData(manager, QOrganizerItemType::TypeEvent);
@@ -121,7 +121,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
         << itemType
         << QDateTime::currentDateTime().addDays(1)
         << loc
-        << QOrganizerItemManager::NoError;
+        << QOrganizerManager::NoError;
 
     loc.setLabel("");
     QTest::newRow(QString("[%1] LocationName=%2").arg(managerName).arg(loc.label()).toLatin1().constData())
@@ -129,7 +129,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
         << itemType
         << QDateTime::currentDateTime().addDays(1)
         << loc
-        << QOrganizerItemManager::NoError;
+        << QOrganizerManager::NoError;
 
     loc.setLabel("#$%^");
     QTest::newRow(QString("[%1] LocationName=%2").arg(managerName).arg(loc.label()).toLatin1().constData())
@@ -137,7 +137,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
         << itemType
         << QDateTime::currentDateTime().addDays(1)
         << loc
-        << QOrganizerItemManager::NoError;
+        << QOrganizerManager::NoError;
 
 #ifdef SYMBIAN_CALENDAR_V2
         loc.setLabel("TestLocationName");
@@ -148,7 +148,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::NoError;
+		<< QOrganizerManager::NoError;
     
         loc.setLabel("TestLocationName");
         loc.setLatitude(20.356784);
@@ -158,7 +158,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
         << itemType
         << QDateTime::currentDateTime().addDays(1)
         << loc
-        << QOrganizerItemManager::NoError;
+        << QOrganizerManager::NoError;
 
         loc.setLabel("TestLocationName");
         loc.setLatitude(200.356784);
@@ -168,7 +168,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::BadArgumentError;
+		<< QOrganizerManager::BadArgumentError;
 	
         loc.setLabel("TestLocationName");
         loc.setLatitude(20);
@@ -178,7 +178,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::BadArgumentError;
+		<< QOrganizerManager::BadArgumentError;
 	
         loc.setLabel("TestLocationName");
         loc.setLatitude(20);
@@ -188,7 +188,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::NoError;
+		<< QOrganizerManager::NoError;
 	
         loc.setLabel("TestLocationName");
         loc.setLatitude(0);
@@ -198,7 +198,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::NoError;
+		<< QOrganizerManager::NoError;
 	
         loc.setLabel("TestLocationName");
         loc.setLatitude(0);
@@ -208,7 +208,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::NoError;
+		<< QOrganizerManager::NoError;
 	
         loc.setLabel("TestLocationName");
         loc.setLatitude(20);
@@ -218,7 +218,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::NoError;
+		<< QOrganizerManager::NoError;
 	
         loc.setLabel("TestLocationName");
         loc.setLatitude(0.128675);
@@ -228,7 +228,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
 		<< loc
-		<< QOrganizerItemManager::NoError;
+		<< QOrganizerManager::NoError;
 #else
         loc.setLabel("TestLocationName");
         loc.setLatitude(0.128675);
@@ -238,7 +238,7 @@ void TestItemLocation::addLocationData(QString managerName, QString itemType)
 		<< itemType
 		<< QDateTime::currentDateTime().addDays(1)
                 << loc
-                << QOrganizerItemManager::InvalidDetailError; // latitude/longitude is not supported so QOrganizerItemManagerEngine::validateItem will return this error.
+                << QOrganizerManager::InvalidDetailError; // latitude/longitude is not supported so QOrganizerManagerEngine::validateItem will return this error.
 #endif
 }
 
@@ -248,14 +248,14 @@ void TestItemLocation::addLocationDetail()
     QFETCH(QString, itemType);
     QFETCH(QDateTime, startTime);
     QFETCH(QOrganizerItemLocation, location);
-    QFETCH(QOrganizerItemManager::Error, error);
+    QFETCH(QOrganizerManager::Error, error);
     
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
     
     // Set the start time, without which Symbian does not save entries
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     item.saveDetail(&timeRange);
     
@@ -263,7 +263,7 @@ void TestItemLocation::addLocationDetail()
     item.saveDetail(&location);
     
     // Now save the item
-    if (error == QOrganizerItemManager::NoError) {
+    if (error == QOrganizerManager::NoError) {
     	QVERIFY(m_om->saveItem(&item));
     } else {
     	// Check for the expected error while saving and return.
diff --git a/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp b/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
index 474c30e272..b18f1afc5f 100644
--- a/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
@@ -86,7 +86,7 @@ private:
     void addOccurrenceData(QString managerName, QString itemType);
     
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
 };
 
 void tst_ItemOccurrence::init()
@@ -94,7 +94,7 @@ void tst_ItemOccurrence::init()
     QFETCH(QString, managerName);
     
     // Create a new item manager instance
-    m_om = new QOrganizerItemManager(managerName);
+    m_om = new QOrganizerManager(managerName);
     
     // Cleanup by deleting all items
     m_om->removeItems(m_om->itemIds());
@@ -114,7 +114,7 @@ void tst_ItemOccurrence::cleanup()
 QStringList tst_ItemOccurrence::getAvailableManagers()
 {
     // Get the list of all available item managers
-    QStringList availableManagers = QOrganizerItemManager::availableManagers();
+    QStringList availableManagers = QOrganizerManager::availableManagers();
     
     // Remove these since test would fail
     availableManagers.removeAll("invalid");
@@ -130,7 +130,7 @@ void tst_ItemOccurrence::addOccurrenceDetail_data()
     QTest::addColumn<QString>("managerName");
     QTest::addColumn<QString>("itemType");
     QTest::addColumn<QDateTime>("startTime");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     
     foreach(QString manager, availableManagers) {
         addOccurrenceData(manager, QOrganizerItemType::TypeEvent);
@@ -139,8 +139,8 @@ void tst_ItemOccurrence::addOccurrenceDetail_data()
 
 void tst_ItemOccurrence::addOccurrenceData(QString managerName, QString itemType)
 {
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
     rrule.setLimit(3);
     QSet<Qt::DayOfWeek> daysOfWeek;
     daysOfWeek.insert(Qt::Wednesday);
@@ -157,18 +157,18 @@ void tst_ItemOccurrence::addOccurrenceDetail()
     QFETCH(QString, managerName);
     QFETCH(QString, itemType);
     QFETCH(QDateTime, startTime);
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
     
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
     QDateTime endTime(QDate(QDate::currentDate().year() , 9, 30));
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules.insert(rrule);
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -209,7 +209,7 @@ void tst_ItemOccurrence::fetchOccurrenceByFilterSort_data()
     QTest::addColumn<QString>("managerName");
     QTest::addColumn<QString>("itemType");
     QTest::addColumn<QDateTime>("startTime");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     QTest::addColumn<QString>("label");
     QTest::addColumn<QString>("modifiedLabel");
     
@@ -218,8 +218,8 @@ void tst_ItemOccurrence::fetchOccurrenceByFilterSort_data()
     QString itemType = QOrganizerItemType::TypeEvent;
     
     foreach(QString manager, availableManagers) {
-        QOrganizerItemRecurrenceRule rrule;
-        rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+        QOrganizerRecurrenceRule rrule;
+        rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
         rrule.setLimit(3);
         QSet<Qt::DayOfWeek> daysOfWeek;
         daysOfWeek.insert(Qt::Wednesday);
@@ -239,7 +239,7 @@ void tst_ItemOccurrence::fetchOccurrenceByFilterSort()
     QFETCH(QString, managerName);
     QFETCH(QString, itemType);
     QFETCH(QDateTime, startTime);
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
     QFETCH(QString, label);
     QFETCH(QString, modifiedLabel);
     
@@ -247,12 +247,12 @@ void tst_ItemOccurrence::fetchOccurrenceByFilterSort()
     QOrganizerItem item;
     item.setType(itemType);
     QDateTime endTime(QDate(QDate::currentDate().year() , 9, 30));
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
     item.setDisplayLabel(label); 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules.insert(rrule);
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -284,8 +284,8 @@ void tst_ItemOccurrence::fetchOccurrenceByFilterSort()
     
     QOrganizerItemSortOrder sortOrder;
     sortOrder.setDirection(Qt::DescendingOrder);
-    sortOrder.setDetailDefinitionName(QOrganizerEventTimeRange::DefinitionName,
-                                     QOrganizerEventTimeRange::FieldStartDateTime);
+    sortOrder.setDetailDefinitionName(QOrganizerEventTime::DefinitionName,
+                                     QOrganizerEventTime::FieldStartDateTime);
     QList<QOrganizerItemSortOrder> sortList;
     sortList.append(sortOrder);
     instanceList.clear();
@@ -339,7 +339,7 @@ void tst_ItemOccurrence::addOccurrenceWithException_data()
     QTest::addColumn<QDateTime>("startTime");
     QTest::addColumn<QDate>("rDate");
     QTest::addColumn<QDate>("exceptionDate");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     QTest::addColumn<QOrganizerItemPriority>("priority");
     QTest::addColumn<QOrganizerItemLocation>("location");
     QTest::addColumn<QString>("modifiedDescription");
@@ -355,8 +355,8 @@ void tst_ItemOccurrence::addOccurrenceWithException_data()
     QString newDescription("modifyOccurrence");
     
     foreach(QString manager, availableManagers) {
-        QOrganizerItemRecurrenceRule rrule;
-        rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        QOrganizerRecurrenceRule rrule;
+        rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
         rrule.setLimit(10);
         QDate rDate(QDate::currentDate().year() , 9, 11);
         QDate exceptionDate(QDate::currentDate().year() , 9, 3);
@@ -373,8 +373,8 @@ void tst_ItemOccurrence::addOccurrenceWithException_data()
             << newDescription
             << QDateTime(QDate(QDate::currentDate().year() , 8, 30));        
         
-        QOrganizerItemRecurrenceRule monthRule;
-        monthRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        QOrganizerRecurrenceRule monthRule;
+        monthRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         monthRule.setLimit(5);
 
         QTest::newRow(QString("[%1] Monthly event for 5 occurrences").arg(manager).toLatin1().constData())
@@ -390,10 +390,10 @@ void tst_ItemOccurrence::addOccurrenceWithException_data()
             << newDescription
             << QDateTime(QDate(QDate::currentDate().year() , 8, 1));        
                     
-        QOrganizerItemRecurrenceRule yearRule;
-        yearRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-        QSet<QOrganizerItemRecurrenceRule::Month> months;
-        months.insert(QOrganizerItemRecurrenceRule::September);
+        QOrganizerRecurrenceRule yearRule;
+        yearRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+        QSet<QOrganizerRecurrenceRule::Month> months;
+        months.insert(QOrganizerRecurrenceRule::September);
         yearRule.setLimit(3);
         yearRule.setInterval(2);
         yearRule.setMonthsOfYear(months);
@@ -421,19 +421,19 @@ void tst_ItemOccurrence::addOccurrenceWithException()
     QFETCH(QDateTime, startTime);
     QFETCH(QDate, rDate);
     QFETCH(QDate,exceptionDate );
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
     QFETCH(QOrganizerItemPriority, priority);
     QFETCH(QOrganizerItemLocation, location);
     
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     QSet<QDate> exceptionList;
     QSet<QDate> rDateList;
     rrules.insert(rrule);
@@ -502,7 +502,7 @@ void tst_ItemOccurrence::editOccurrence()
     QFETCH(QDateTime, startTime);
     QFETCH(QDate, rDate);
     QFETCH(QDate,exceptionDate );
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
     QFETCH(QOrganizerItemPriority, priority);
     QFETCH(QOrganizerItemLocation, location);
     QFETCH(QString,modifiedDescription);
@@ -511,12 +511,12 @@ void tst_ItemOccurrence::editOccurrence()
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules.insert(rrule);
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -591,11 +591,11 @@ void tst_ItemOccurrence::editOccurrenceNegative_data()
     QTest::addColumn<QString>("managerName");
     QTest::addColumn<QString>("itemType");
     QTest::addColumn<QDateTime>("startTime");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     
     QString itemType = QOrganizerItemType::TypeEvent;
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrule.setLimit(10);
     foreach(QString manager, availableManagers) {
         QTest::newRow(QString("[%1] daily repeating entry").arg(manager).toLatin1().constData())
@@ -611,17 +611,17 @@ void tst_ItemOccurrence::editOccurrenceNegative()
     QFETCH(QString, managerName);
     QFETCH(QString, itemType);
     QFETCH(QDateTime, startTime);
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
      
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules.insert(rrule);
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -644,7 +644,7 @@ void tst_ItemOccurrence::editOccurrenceNegative()
     //firstInstance.setGuid(QString(""));
     //firstInstance.setParentLocalId(QOrganizerItemLocalId(-1));
     //QVERIFY(!m_om->saveItem(&firstInstance));
-    //QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    //QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
     //change to invalid original Date of the instance and save 
     firstInstance.setGuid(instanceGuid);
@@ -652,7 +652,7 @@ void tst_ItemOccurrence::editOccurrenceNegative()
     QVERIFY(!m_om->saveItem(&firstInstance));
     // Allow undefined error code, the engine should iterate through item instances to see if the
     // original date is valid to be able to give a specific error code
-    QVERIFY(m_om->error() != QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() != QOrganizerManager::NoError);
     
     firstInstance = static_cast<QOrganizerEventOccurrence>(firstItem);
     firstInstance.setStartDateTime(startTime.addDays(-1));
@@ -664,7 +664,7 @@ void tst_ItemOccurrence::editOccurrenceNegative()
     //itemId.setLocalId(1);
     //firstInstance.setId(itemId);
     //QVERIFY(!m_om->saveItem(&firstInstance));
-    //QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    //QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 }
 
 void tst_ItemOccurrence::updateOccurrenceLocalId()
@@ -675,9 +675,9 @@ void tst_ItemOccurrence::updateOccurrenceLocalId()
     christmas.setStartDateTime(QDateTime(QDate(2010, 12, 25), QTime(0, 0, 0)));
     christmas.setEndDateTime(QDateTime(QDate(2010, 12, 26), QTime(0, 0, 0)));
     christmas.setDisplayLabel(QLatin1String("Christmas"));
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-    christmas.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rrule);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+    christmas.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rrule);
     QVERIFY(m_om->saveItem(&christmas));
 
     // Save an exception
@@ -726,7 +726,7 @@ void tst_ItemOccurrence::fetchNegative()
     QList<QOrganizerItem> instanceList;
     item.setType(itemType);
     QDateTime endTime(startTime);
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
     
@@ -746,26 +746,26 @@ void tst_ItemOccurrence::fetchNegative()
     QDateTime previousEndTime(startTime);
     previousEndTime.setDate(QDate(startTime.date().year() - 2, startTime.date().month(),startTime.date().day()));
     instanceList = m_om->itemInstances(item,startTime,previousEndTime);
-    QCOMPARE(m_om->error(), QOrganizerItemManager::BadArgumentError);
+    QCOMPARE(m_om->error(), QOrganizerManager::BadArgumentError);
     
     //Fetch iteminstance for invalid itemtype eventoccurrence
     QOrganizerEventOccurrence invalidItem;
     instanceList = m_om->itemInstances(invalidItem,startTime,endTime);
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidItemTypeError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidItemTypeError);
     
     // Fetch the item instance with negative count
     instanceList = m_om->itemInstances(item, startTime, QDateTime(), -2);
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QCOMPARE(instanceList.count(), 1);
 
     // Fetch the item instance with undefined starttime
     instanceList = m_om->itemInstances(item, QDateTime(), endTime);
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QCOMPARE(instanceList.count(), 1);
 
     // Fetch the item instance with undefined endtime
     instanceList = m_om->itemInstances(item, startTime, QDateTime());
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QCOMPARE(instanceList.count(), 1);
 }
 
@@ -780,10 +780,10 @@ void tst_ItemOccurrence::daylightSavingTime()
     event.setStartDateTime(startDateTime);
     event.setEndDateTime(endDateTime);
     
-    QOrganizerItemRecurrenceRule rule;
-    rule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+    QOrganizerRecurrenceRule rule;
+    rule.setFrequency(QOrganizerRecurrenceRule::Monthly);
     rule.setLimit(QDate(2010, 12, 31));
-    event.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rule);
+    event.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rule);
 
     QVERIFY(m_om->saveItem(&event));
 
@@ -823,11 +823,11 @@ void tst_ItemOccurrence::leapYear()
     QDateTime endDateTime = startDateTime.addSecs(60*60);
     event.setStartDateTime(startDateTime);
     event.setEndDateTime(endDateTime);
-    QOrganizerItemRecurrenceRule rule;
-    rule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+    QOrganizerRecurrenceRule rule;
+    rule.setFrequency(QOrganizerRecurrenceRule::Yearly);
     rule.setDaysOfMonth(QSet<int>() << 29);
     rule.setLimit(QDate(2020, 3, 1));
-    event.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rule);
+    event.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rule);
     QVERIFY(m_om->saveItem(&event));
 
     // Verify
diff --git a/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp b/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp
index 790c7da26b..3899a8b0b6 100644
--- a/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp
@@ -67,7 +67,7 @@ private:
     void addPriorityData(QString managerName, QString itemType);
     
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
     
 };
 
@@ -76,7 +76,7 @@ void TestItemPriority::init()
     QFETCH(QString, managerName);
     
     // Create a new item manager instance
-    m_om = new QOrganizerItemManager(managerName);
+    m_om = new QOrganizerManager(managerName);
     
     // Cleanup by deleting all items
     m_om->removeItems(m_om->itemIds());
@@ -93,7 +93,7 @@ void TestItemPriority::cleanup()
 void TestItemPriority::addPriorityDetail_data()
 {
     // Get the list of all available item managers
-    QStringList availableManagers = QOrganizerItemManager::availableManagers();
+    QStringList availableManagers = QOrganizerManager::availableManagers();
     
     // Remove these since test would fail
     availableManagers.removeAll("invalid");
@@ -196,7 +196,7 @@ void TestItemPriority::addPriorityDetail()
     item.setType(itemType);
     
     // Set the start time, without which Symbian does not save entries
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     timeRange.setStartDateTime(startTime);
     item.saveDetail(&timeRange);
     
diff --git a/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp b/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp
index a5ee140922..1281ac882b 100644
--- a/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp
@@ -91,7 +91,7 @@ Q_DECLARE_METATYPE(QOrganizerItemFilter)
 Q_DECLARE_METATYPE(QOrganizerItemSortOrderList)
 
 /*!
- * For testing symbian backend via QOrganizerItemManager API. The target is
+ * For testing symbian backend via QOrganizerManager API. The target is
  * to implement test cases in a platform independent manner so that this test
  * module could be used also with other backends and potentially used as a
  * QtMobility auto test with as little porting work as possible.
@@ -122,20 +122,20 @@ private: // util functions
     QOrganizerItemFilter detailFilter(QString defNam, QString fieldNam, int flags, QVariant filterCriterion);
     QOrganizerItemFilter detailRangeFilter(QString defNam, QString fieldNam, int flags, QVariant min, QVariant max);
 private:
-    QList<QOrganizerItemManager *> m_managers;
+    QList<QOrganizerManager *> m_managers;
     QList<QOrganizerItemLocalIdList> m_itemIds;
 
 };
 
 tst_itemSortFilter::tst_itemSortFilter()
 {
-    QStringList managerNames = QOrganizerItemManager::availableManagers();
+    QStringList managerNames = QOrganizerManager::availableManagers();
     managerNames.removeAll("invalid"); // the test cases would not pass on invalid backend
     managerNames.removeAll("skeleton"); // the test cases would not pass on skeleton backend
     int i=0;
 
     foreach (QString manager, managerNames) {
-        m_managers << new QOrganizerItemManager(manager);
+        m_managers << new QOrganizerManager(manager);
         addTodo_data(i++);
 //TODO: addEvent_data();
     }
@@ -143,7 +143,7 @@ tst_itemSortFilter::tst_itemSortFilter()
 
 tst_itemSortFilter::~tst_itemSortFilter()
 {
-    foreach (QOrganizerItemManager* manager, m_managers) {
+    foreach (QOrganizerManager* manager, m_managers) {
         manager->removeItems(manager->itemIds());
         delete manager;
         manager = 0;
@@ -163,7 +163,7 @@ QOrganizerItemLocalId tst_itemSortFilter::addTestDataItem(int mgrIndex, QString
     }
 
     m_managers.at(mgrIndex)->saveItem(&item);
-    if (m_managers.at(mgrIndex)->error() != QOrganizerItemManager::NoError) {
+    if (m_managers.at(mgrIndex)->error() != QOrganizerManager::NoError) {
         QWARN("[tst_itemSortFilter::addTestDataItem] Test item creation failed");
     }
     return item.localId();
@@ -281,12 +281,12 @@ void tst_itemSortFilter::sortItems_data()
             << QTstSortOrder(QOrganizerItemDisplayLabel::DefinitionName, QOrganizerItemDisplayLabel::FieldLabel,
                 QOrganizerItemSortOrder::BlanksLast, Qt::DescendingOrder, Qt::CaseSensitive), "cbafed");
         addNewSortRow(i, QTstSortOrderList()
-            << QTstSortOrder(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime,
+            << QTstSortOrder(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime,
                 QOrganizerItemSortOrder::BlanksLast, Qt::AscendingOrder, Qt::CaseInsensitive)
             << QTstSortOrder(QOrganizerItemDisplayLabel::DefinitionName, QOrganizerItemDisplayLabel::FieldLabel,
                 QOrganizerItemSortOrder::BlanksLast, Qt::AscendingOrder, Qt::CaseSensitive), "abcdef");
         addNewSortRow(i, QTstSortOrderList()
-            << QTstSortOrder(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime,
+            << QTstSortOrder(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime,
                 QOrganizerItemSortOrder::BlanksLast, Qt::DescendingOrder, Qt::CaseInsensitive)
             << QTstSortOrder(QOrganizerItemDisplayLabel::DefinitionName, QOrganizerItemDisplayLabel::FieldLabel,
                 QOrganizerItemSortOrder::BlanksLast, Qt::DescendingOrder, Qt::CaseSensitive), "fedcba");
@@ -352,59 +352,59 @@ void tst_itemSortFilter::addTodo_data(int mgrIndex)
 
     itemIdList << addTestDataItem(mgrIndex, "abc", QTstDetailFieldList() << itemTypeTodo
         << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusNotStarted)
-        << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
-        << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime()));
+        << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
+        << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime()));
 
     if (fieldPercentageSupported) {
         itemIdList << addTestDataItem(mgrIndex,"bcd", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusInProgress)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime())
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime())
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldPercentageComplete, 75));
         itemIdList << addTestDataItem(mgrIndex, "cde", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusComplete)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime())
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime())
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldFinishedDateTime, QDateTime::currentDateTime())
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldPercentageComplete, 100));
     } else {
         itemIdList << addTestDataItem(mgrIndex,"bcd", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusInProgress)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime()));
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime()));
         itemIdList << addTestDataItem(mgrIndex, "cde", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusComplete)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime())
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime())
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldFinishedDateTime, QDateTime::currentDateTime()));
     }
 
     itemIdList << addTestDataItem(mgrIndex, "Abc", QTstDetailFieldList() << itemTypeTodo
         << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusNotStarted)
-        << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
-        << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addDays(2)));
+        << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
+        << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime().addDays(2)));
 
     if (fieldPercentageSupported) {
         itemIdList << addTestDataItem(mgrIndex, "Bcd", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusInProgress)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addDays(2))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime().addDays(2))
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldPercentageComplete, 25));
         itemIdList << addTestDataItem(mgrIndex, "Cde", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusComplete)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addDays(2))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime().addDays(2))
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldFinishedDateTime, QDateTime::currentDateTime().addDays(2))
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldPercentageComplete, 100));
     } else {
         itemIdList << addTestDataItem(mgrIndex, "Bcd", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusInProgress)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addDays(2)));
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime().addDays(2)));
         itemIdList << addTestDataItem(mgrIndex, "Cde", QTstDetailFieldList() << itemTypeTodo
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldStatus, QOrganizerTodoProgress::StatusComplete)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addDays(2))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(3))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime().addDays(2))
             << QTstDetailField(QOrganizerTodoProgress::DefinitionName, QOrganizerTodoProgress::FieldFinishedDateTime, QDateTime::currentDateTime().addDays(2)));
     }
 
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp
index 944feae12c..c1ab42f6b0 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp
@@ -97,21 +97,21 @@ private slots:
     void modifyCollectionSignals();
     void deleteCollectionSignals();
 public slots:
-   void requestStateChanged(QOrganizerItemAbstractRequest::State currentState);
+   void requestStateChanged(QOrganizerAbstractRequest::State currentState);
    void requestResultsAvailable();
     
 private:
    QList<QOrganizerItem> createItems(int noOfItems);
 private:
-    QOrganizerItemManager*                  m_om;
-    QOrganizerItemAbstractRequest*          m_itemRequest;
+    QOrganizerManager*                  m_om;
+    QOrganizerAbstractRequest*          m_itemRequest;
     QList<QOrganizerCollectionLocalId>           m_collectionIds;
 };
 
 
 void tst_symbianasynchcollections::initTestCase()
 {
-    m_om = new QOrganizerItemManager(managerNameSymbian);
+    m_om = new QOrganizerManager(managerNameSymbian);
     m_itemRequest = 0;
 }
 
@@ -136,9 +136,9 @@ void tst_symbianasynchcollections::fetchCollection()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -165,9 +165,9 @@ void tst_symbianasynchcollections::saveCollection()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -207,9 +207,9 @@ void tst_symbianasynchcollections::removeCollection()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -239,9 +239,9 @@ void tst_symbianasynchcollections::saveItem()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -273,7 +273,7 @@ QList<QOrganizerItem> tst_symbianasynchcollections::createItems(int noOfItems)
         organizerItem.setDisplayLabel(desplaylabel);
         
         // Set current time
-        QOrganizerEventTimeRange timeRange;
+        QOrganizerEventTime timeRange;
         QDateTime startTime;
         startTime.currentDateTime();
         timeRange.setStartDateTime(startTime.currentDateTime());
@@ -287,38 +287,38 @@ QList<QOrganizerItem> tst_symbianasynchcollections::createItems(int noOfItems)
 }
 
 void tst_symbianasynchcollections::requestStateChanged(
-    QOrganizerItemAbstractRequest::State currentState)
+    QOrganizerAbstractRequest::State currentState)
 {
     switch(currentState) {
-    case QOrganizerItemAbstractRequest::InactiveState: {
+    case QOrganizerAbstractRequest::InactiveState: {
         // Verify if the request is in inactive state
         QVERIFY(m_itemRequest->isInactive());
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::InactiveState);
+            QOrganizerAbstractRequest::InactiveState);
         // Operation not yet started start the operation
         m_itemRequest->start();
     }
     break;
-    case QOrganizerItemAbstractRequest::ActiveState: {
+    case QOrganizerAbstractRequest::ActiveState: {
         // Verify if the request is in active state
         QVERIFY(m_itemRequest->isActive());
         // Operation started, not yet finished operation already started
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::ActiveState);
+            QOrganizerAbstractRequest::ActiveState);
     }
     break;
-    case QOrganizerItemAbstractRequest::CanceledState: {
+    case QOrganizerAbstractRequest::CanceledState: {
         // Verify if the request is in canceled state
         QVERIFY(m_itemRequest->isCanceled());
         // Operation is finished due to cancellation test not completed, 
         // failed Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::CanceledState);
+            QOrganizerAbstractRequest::CanceledState);
     }
     break;
-    case QOrganizerItemAbstractRequest::FinishedState: {
+    case QOrganizerAbstractRequest::FinishedState: {
         // Verify if the request is in finished state
         QVERIFY(m_itemRequest->isFinished());
         // Operation either completed successfully or failed.  
@@ -326,7 +326,7 @@ void tst_symbianasynchcollections::requestStateChanged(
         // test completed, compare the results
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::FinishedState);
+            QOrganizerAbstractRequest::FinishedState);
     }
     break;
     default: {
@@ -338,9 +338,9 @@ void tst_symbianasynchcollections::requestStateChanged(
 
 void tst_symbianasynchcollections::requestResultsAvailable()
 {
-    QOrganizerItemAbstractRequest::RequestType reqType(m_itemRequest->type());
+    QOrganizerAbstractRequest::RequestType reqType(m_itemRequest->type());
     switch (reqType) {
-    case QOrganizerItemAbstractRequest::CollectionFetchRequest : {
+    case QOrganizerAbstractRequest::CollectionFetchRequest : {
         // Check error map
         QList<QOrganizerCollection> collections(
             ((QOrganizerCollectionFetchRequest*)(m_itemRequest))->collections());
@@ -350,7 +350,7 @@ void tst_symbianasynchcollections::requestResultsAvailable()
         QCOMPARE(count, 1);
     }
     break;
-    case QOrganizerItemAbstractRequest::CollectionSaveRequest : {
+    case QOrganizerAbstractRequest::CollectionSaveRequest : {
         QList<QOrganizerCollection> savedCollections(
             ((QOrganizerCollectionSaveRequest*)(m_itemRequest))->collections());
         int count(savedCollections.count());
@@ -362,16 +362,16 @@ void tst_symbianasynchcollections::requestResultsAvailable()
         // constant
         QCOMPARE(count, 1);
         
-        QMap<int, QOrganizerItemManager::Error> errorMap(
+        QMap<int, QOrganizerManager::Error> errorMap(
             ((QOrganizerCollectionSaveRequest*)(m_itemRequest))->errorMap());
         // Error map should contain zero errors to indicate successful saving
         // of all the collections
         QCOMPARE(0, errorMap.count());
     }
     break;
-    case QOrganizerItemAbstractRequest::CollectionRemoveRequest : {
+    case QOrganizerAbstractRequest::CollectionRemoveRequest : {
         // Check error map
-        QMap<int, QOrganizerItemManager::Error> erroMap(
+        QMap<int, QOrganizerManager::Error> erroMap(
             ((QOrganizerCollectionRemoveRequest*)(m_itemRequest))->errorMap());
         // Error map should contain zero errors to indicate successful deletion
         // of all the items
@@ -387,17 +387,17 @@ void tst_symbianasynchcollections::addCollectionSignals()
 {        
     qRegisterMetaType<QOrganizerCollectionLocalId>("QOrganizerCollectionLocalId");
     qRegisterMetaType<QList<QOrganizerCollectionLocalId> >("QList<QOrganizerCollectionLocalId>");
-    qRegisterMetaType<QOrganizerItemAbstractRequest::State>("QOrganizerItemAbstractRequest::State");
+    qRegisterMetaType<QOrganizerAbstractRequest::State>("QOrganizerAbstractRequest::State");
     
     // Create a second manager
-    QScopedPointer<QOrganizerItemManager> om2(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om2(new QOrganizerManager(m_om->managerName()));
 
     // Create request
     QOrganizerCollectionSaveRequest *req = new QOrganizerCollectionSaveRequest(this);
     req->setManager(m_om);
 
     // Setup signal spies
-    QSignalSpy stateSpy(req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(req, SIGNAL(resultsAvailable()));
     QSignalSpy addedSpy1(m_om, SIGNAL(collectionsAdded(QList<QOrganizerCollectionLocalId>)));
     QSignalSpy addedSpy2(om2.data(), SIGNAL(collectionsAdded(QList<QOrganizerCollectionLocalId>)));
@@ -413,7 +413,7 @@ void tst_symbianasynchcollections::addCollectionSignals()
 
     // Start the request
     QVERIFY(req->start());
-    QCOMPARE(req->state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req->state(), QOrganizerAbstractRequest::ActiveState);
     QCOMPARE(stateSpy.count(), 1);
     QTRY_COMPARE(resultSpy.count(), 1);
     QCOMPARE(req->collections().count(), 1);
@@ -437,17 +437,17 @@ void tst_symbianasynchcollections::modifyCollectionSignals()
 {
     qRegisterMetaType<QOrganizerCollectionLocalId>("QOrganizerCollectionLocalId");
     qRegisterMetaType<QList<QOrganizerCollectionLocalId> >("QList<QOrganizerCollectionLocalId>");
-    qRegisterMetaType<QList<QOrganizerItemAbstractRequest::State> >("QOrganizerItemAbstractRequest::State>");
+    qRegisterMetaType<QList<QOrganizerAbstractRequest::State> >("QOrganizerAbstractRequest::State>");
     
     // Create a second manager
-    QScopedPointer<QOrganizerItemManager> om2(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om2(new QOrganizerManager(m_om->managerName()));
 
     // Create request
     QOrganizerCollectionSaveRequest *req = new QOrganizerCollectionSaveRequest(this);
     req->setManager(m_om);
 
     // Setup signal spies
-    QSignalSpy stateSpy(req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(req, SIGNAL(resultsAvailable()));
     QSignalSpy changedSpy1(m_om, SIGNAL(collectionsChanged(QList<QOrganizerCollectionLocalId>)));
     QSignalSpy changedSpy2(om2.data(), SIGNAL(collectionsChanged(QList<QOrganizerCollectionLocalId>)));
@@ -461,7 +461,7 @@ void tst_symbianasynchcollections::modifyCollectionSignals()
 
     // Start the request
     QVERIFY(req->start());
-    QCOMPARE(req->state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req->state(), QOrganizerAbstractRequest::ActiveState);
     QCOMPARE(stateSpy.count(), 1);
     QTRY_COMPARE(resultSpy.count(), 1);
     QCOMPARE(req->collections().count(), 1);
@@ -490,17 +490,17 @@ void tst_symbianasynchcollections::deleteCollectionSignals()
     m_itemRequest =0;
     qRegisterMetaType<QOrganizerCollectionLocalId>("QOrganizerCollectionLocalId");
     qRegisterMetaType<QList<QOrganizerCollectionLocalId> >("QList<QOrganizerCollectionLocalId>");
-    qRegisterMetaType<QOrganizerItemAbstractRequest::State>("QOrganizerItemAbstractRequest::State");
+    qRegisterMetaType<QOrganizerAbstractRequest::State>("QOrganizerAbstractRequest::State");
     
     // Create a second manager
-    QScopedPointer<QOrganizerItemManager> om2(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om2(new QOrganizerManager(m_om->managerName()));
 
     // Create request
     QOrganizerCollectionRemoveRequest *deleteReq = new QOrganizerCollectionRemoveRequest(this);
     deleteReq->setManager(m_om);
 
     // Setup signal spies
-    QSignalSpy stateSpy(deleteReq, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(deleteReq, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(deleteReq, SIGNAL(resultsAvailable()));
     QSignalSpy removedSpy1(m_om, SIGNAL(collectionsRemoved(QList<QOrganizerCollectionLocalId>)));
     QSignalSpy removedSpy2(om2.data(), SIGNAL(collectionsRemoved(QList<QOrganizerCollectionLocalId>)));
@@ -514,7 +514,7 @@ void tst_symbianasynchcollections::deleteCollectionSignals()
 
     // Start the request
     QVERIFY(deleteReq->start());
-    QCOMPARE(deleteReq->state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(deleteReq->state(), QOrganizerAbstractRequest::ActiveState);
     QCOMPARE(stateSpy.count(), 1);
     QTRY_COMPARE(resultSpy.count(), 1);
     
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp
index efab29965c..cd4f400cda 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp
@@ -72,10 +72,10 @@ private slots:
    
 public slots:
    void fetchRequestStateChanged(
-           QOrganizerItemAbstractRequest::State currentState);
+           QOrganizerAbstractRequest::State currentState);
    void fetchRequestResultsAvailable();
    void saveRequestStateChanged(
-           QOrganizerItemAbstractRequest::State currentState);
+           QOrganizerAbstractRequest::State currentState);
    void saveRequestResultsAvailable();
 
    
@@ -83,7 +83,7 @@ private:
    QList<QOrganizerItem> createItems(int noOfItems);
    //void fetchItems();
 private:
-    QOrganizerItemManager*              m_om;
+    QOrganizerManager*              m_om;
     QOrganizerItemFetchRequest*         m_fetchItemRequest;
     QOrganizerItemSaveRequest*          m_saveItemRequest;
 };
@@ -91,7 +91,7 @@ private:
 void TestFetchItems::initTestCase()
 {
     // Create a new item manager instance
-    m_om = new QOrganizerItemManager(managerNameSymbian);
+    m_om = new QOrganizerManager(managerNameSymbian);
     // Cleanup by deleting all items
     m_om->removeItems(m_om->itemIds());
     
@@ -100,8 +100,8 @@ void TestFetchItems::initTestCase()
     m_saveItemRequest = new QOrganizerItemSaveRequest(this);
     // Connect for the state change signal 
     connect(m_saveItemRequest, 
-            SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), this, 
-            SLOT(saveRequestStateChanged(QOrganizerItemAbstractRequest::State)));
+            SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), this, 
+            SLOT(saveRequestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_saveItemRequest, SIGNAL(resultsAvailable()), 
             this, SLOT(saveRequestResultsAvailable()));
 
@@ -109,9 +109,9 @@ void TestFetchItems::initTestCase()
     m_fetchItemRequest = new QOrganizerItemFetchRequest(this);
     // Connect for the state change signal 
     connect(m_fetchItemRequest, 
-            SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+            SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
             this, 
-            SLOT(fetchRequestStateChanged(QOrganizerItemAbstractRequest::State)));
+            SLOT(fetchRequestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_fetchItemRequest, SIGNAL(resultsAvailable()), 
             this, SLOT(fetchRequestResultsAvailable()));
 }
@@ -156,19 +156,19 @@ QList<QOrganizerItem> TestFetchItems::createItems(int noOfItems)
         organizerItem.setDisplayLabel(desplaylabel);
         
         // Set current time
-        QOrganizerEventTimeRange timeRange;
+        QOrganizerEventTime timeRange;
         QDateTime startTime;
         startTime.currentDateTime();
         timeRange.setStartDateTime(startTime.currentDateTime());
         
         QVERIFY(organizerItem.saveDetail(&timeRange));
         
-        QOrganizerItemRecurrenceRule rrule;
-        rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        QOrganizerRecurrenceRule rrule;
+        rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
         rrule.setLimit(KNumberOfOccurrences);
  
         // Add recurrence rules to the item
-        QSet<QOrganizerItemRecurrenceRule> rrules;
+        QSet<QOrganizerRecurrenceRule> rrules;
         rrules.insert(rrule);
         QOrganizerItemRecurrence recurrence;
         recurrence.setRecurrenceRules(rrules);
@@ -182,24 +182,24 @@ QList<QOrganizerItem> TestFetchItems::createItems(int noOfItems)
 
 // request status changed for save request
 void TestFetchItems::saveRequestStateChanged(
-        QOrganizerItemAbstractRequest::State currentState)
+        QOrganizerAbstractRequest::State currentState)
 {
     switch(currentState) {
-        case QOrganizerItemAbstractRequest::InactiveState: { 
+        case QOrganizerAbstractRequest::InactiveState: { 
             // Operation not yet started start the operation
             saveItems();
             break;
         }
-        case QOrganizerItemAbstractRequest::ActiveState: { 
+        case QOrganizerAbstractRequest::ActiveState: { 
             // Operation started, not yet finished operation already started
         break;
         }
-        case QOrganizerItemAbstractRequest::CanceledState: { 
+        case QOrganizerAbstractRequest::CanceledState: { 
             // Operation is finished due to cancellation test not completed, 
             // failed
         break;
         }
-        case QOrganizerItemAbstractRequest::FinishedState: { 
+        case QOrganizerAbstractRequest::FinishedState: { 
             // Operation either completed successfully or failed.  
             // No further results will be available.
             // test completed, compare the results when results available 
@@ -265,24 +265,24 @@ void TestFetchItems::fetchItems()
 
 // Fetch request state changed
 void TestFetchItems::fetchRequestStateChanged(
-        QOrganizerItemAbstractRequest::State currentState)
+        QOrganizerAbstractRequest::State currentState)
 {
     switch(currentState) {
-        case QOrganizerItemAbstractRequest::InactiveState: { 
+        case QOrganizerAbstractRequest::InactiveState: { 
             // Operation not yet started start the operation
             fetchItems();
             break;
         }
-        case QOrganizerItemAbstractRequest::ActiveState: { 
+        case QOrganizerAbstractRequest::ActiveState: { 
             // Operation started, not yet finished operation already started
         break;
         }
-        case QOrganizerItemAbstractRequest::CanceledState: { 
+        case QOrganizerAbstractRequest::CanceledState: { 
             // Operation is finished due to cancellation test not completed, 
             // failed
         break;
         }
-        case QOrganizerItemAbstractRequest::FinishedState: { 
+        case QOrganizerAbstractRequest::FinishedState: { 
             // Operation either completed successfully or failed.  
             // No further results will be available.
             // test completed, compate the results while available
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp
index e8d9b1eb7c..fb85b97301 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp
@@ -76,11 +76,11 @@ private slots:
    void saveItems_negative();
    
 public slots:
-   void requestStateChanged(QOrganizerItemAbstractRequest::State currentState);
+   void requestStateChanged(QOrganizerAbstractRequest::State currentState);
    void requestResultsAvailable();
    
 public slots:
-   void requestStateChanged_Negative(QOrganizerItemAbstractRequest::State 
+   void requestStateChanged_Negative(QOrganizerAbstractRequest::State 
        currentState);
    void requestResultsAvailable_Negative();
    
@@ -88,8 +88,8 @@ private:
    QList<QOrganizerItem> createItems(int noOfItems);
    QList<QOrganizerItem> createItems_Negative(int noOfItems);
 private:
-    QOrganizerItemManager*              m_om;
-    QOrganizerItemAbstractRequest*      m_itemRequest;
+    QOrganizerManager*              m_om;
+    QOrganizerAbstractRequest*      m_itemRequest;
     QList<QOrganizerItemLocalId>        m_itemIds;
     QStringList                         m_definitionNames;
 };
@@ -97,7 +97,7 @@ private:
 void TestNoteItems::initTestCase()
 {
     // Create a new item manager instance
-    m_om = new QOrganizerItemManager(managerNameSymbian);
+    m_om = new QOrganizerManager(managerNameSymbian);
         
     // Cleanup by deleting all items
     m_om->removeItems(m_om->itemIds());
@@ -128,9 +128,9 @@ void TestNoteItems::saveItem()
     
     // Connect for the state change signal 
     connect(m_itemRequest, 
-            SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+            SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
             this, 
-            SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+            SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
             this, SLOT(requestResultsAvailable()));
 
@@ -180,9 +180,9 @@ void TestNoteItems::fetchItem()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -237,9 +237,9 @@ void TestNoteItems::removeItem()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-            SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+            SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
             this, 
-            SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+            SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
             this, SLOT(requestResultsAvailable()));
@@ -271,9 +271,9 @@ void TestNoteItems::saveDetails()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -312,9 +312,9 @@ void TestNoteItems::removeDetails()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -349,9 +349,9 @@ void TestNoteItems::fetchDetails()
 
     // Connect for the state change signal 
     connect(m_itemRequest, 
-        SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+        SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
         this, 
-        SLOT(requestStateChanged(QOrganizerItemAbstractRequest::State)));
+        SLOT(requestStateChanged(QOrganizerAbstractRequest::State)));
     connect(m_itemRequest, SIGNAL(resultsAvailable()), 
         this, SLOT(requestResultsAvailable()));
 
@@ -367,7 +367,7 @@ void TestNoteItems::fetchDetails()
     // Comment - Not supported
     m_definitionNames.append(QOrganizerItemComment::DefinitionName);
     m_definitionNames.append(QOrganizerItemRecurrence::DefinitionName);
-    m_definitionNames.append(QOrganizerEventTimeRange::DefinitionName);
+    m_definitionNames.append(QOrganizerEventTime::DefinitionName);
     m_definitionNames.append(QOrganizerItemPriority::DefinitionName);
     m_definitionNames.append(QOrganizerItemLocation::DefinitionName);
 
@@ -382,9 +382,9 @@ void TestNoteItems::fetchDetails()
     // To-do progress - Not supported
     m_definitionNames.append(QOrganizerTodoProgress::DefinitionName);
     // To-do time range - Not supported
-    m_definitionNames.append(QOrganizerTodoTimeRange::DefinitionName);
+    m_definitionNames.append(QOrganizerTodoTime::DefinitionName);
     // Journal time range - Not supported
-    m_definitionNames.append(QOrganizerJournalTimeRange::DefinitionName);
+    m_definitionNames.append(QOrganizerJournalTime::DefinitionName);
  
     itemDetailDefFetchRequest->setDefinitionNames(m_definitionNames);
     itemDetailDefFetchRequest->setItemType(QOrganizerItemType::TypeNote);
@@ -395,38 +395,38 @@ void TestNoteItems::fetchDetails()
     QVERIFY(itemDetailDefFetchRequest->isFinished());
 }
 
-void TestNoteItems::requestStateChanged(QOrganizerItemAbstractRequest::State currentState)
+void TestNoteItems::requestStateChanged(QOrganizerAbstractRequest::State currentState)
 {
     switch(currentState) {
-    case QOrganizerItemAbstractRequest::InactiveState: {
+    case QOrganizerAbstractRequest::InactiveState: {
         // Verify if the request is in inactive state
         QVERIFY(m_itemRequest->isInactive());
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::InactiveState);
+            QOrganizerAbstractRequest::InactiveState);
         // Operation not yet started start the operation
         m_itemRequest->start();
     }
     break;
-    case QOrganizerItemAbstractRequest::ActiveState: {
+    case QOrganizerAbstractRequest::ActiveState: {
         // Verify if the request is in active state
         QVERIFY(m_itemRequest->isActive());
         // Operation started, not yet finished operation already started
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::ActiveState);
+            QOrganizerAbstractRequest::ActiveState);
     }
     break;
-    case QOrganizerItemAbstractRequest::CanceledState: {
+    case QOrganizerAbstractRequest::CanceledState: {
         // Verify if the request is in canceled state
         QVERIFY(m_itemRequest->isCanceled());
         // Operation is finished due to cancellation test not completed, 
         // failed Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::CanceledState);
+            QOrganizerAbstractRequest::CanceledState);
     }
     break;
-    case QOrganizerItemAbstractRequest::FinishedState: {
+    case QOrganizerAbstractRequest::FinishedState: {
         // Verify if the request is in finished state
         QVERIFY(m_itemRequest->isFinished());
         // Operation either completed successfully or failed.  
@@ -434,7 +434,7 @@ void TestNoteItems::requestStateChanged(QOrganizerItemAbstractRequest::State cur
         // test completed, compare the results
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::FinishedState);
+            QOrganizerAbstractRequest::FinishedState);
     }
     break;
     default: {
@@ -446,9 +446,9 @@ void TestNoteItems::requestStateChanged(QOrganizerItemAbstractRequest::State cur
 
 void TestNoteItems::requestResultsAvailable()
 {
-    QOrganizerItemAbstractRequest::RequestType reqType(m_itemRequest->type());
+    QOrganizerAbstractRequest::RequestType reqType(m_itemRequest->type());
     switch (reqType) {
-    case QOrganizerItemAbstractRequest::ItemSaveRequest : {
+    case QOrganizerAbstractRequest::ItemSaveRequest : {
         QList<QOrganizerItem> items = ((QOrganizerItemSaveRequest*)
             m_itemRequest)->items();
         int count(items.count());
@@ -465,7 +465,7 @@ void TestNoteItems::requestResultsAvailable()
         }
     }
     break;
-    case QOrganizerItemAbstractRequest::ItemFetchRequest : {
+    case QOrganizerAbstractRequest::ItemFetchRequest : {
         QList<QOrganizerItem> items = ((QOrganizerItemFetchRequest*)
             (m_itemRequest))->items();
         int count(items.count());
@@ -483,9 +483,9 @@ void TestNoteItems::requestResultsAvailable()
 
     }
     break;
-    case QOrganizerItemAbstractRequest::ItemRemoveRequest : {
+    case QOrganizerAbstractRequest::ItemRemoveRequest : {
         // Check error map
-        QMap<int, QOrganizerItemManager::Error> erroMap;
+        QMap<int, QOrganizerManager::Error> erroMap;
         erroMap = ((QOrganizerItemRemoveRequest*)
             m_itemRequest)->errorMap();
         // Error map should contain zero errors to indicate successful deletion
@@ -493,7 +493,7 @@ void TestNoteItems::requestResultsAvailable()
         QCOMPARE(0, erroMap.count());
     }
     break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest : {
+    case QOrganizerAbstractRequest::DetailDefinitionSaveRequest : {
         // No definitions should be saved, so definitions() should return an 
         // empty list
         QList<QOrganizerItemDetailDefinition> savedDefinitions(
@@ -504,46 +504,46 @@ void TestNoteItems::requestResultsAvailable()
         // Check the error map, error map should contain the number of errors
         // equal to number of definitions to be saved. Also all the erros 
         // returned should be NotSupported
-        QMap<int, QOrganizerItemManager::Error> errorMap(
+        QMap<int, QOrganizerManager::Error> errorMap(
             ((QOrganizerItemDetailDefinitionSaveRequest*)
             (m_itemRequest))->errorMap());
         count = errorMap.count();
         QCOMPARE(KNumberOfItems, count);
         // Compare the errors returned
         for (int index(0); index < count; index++){
-            QCOMPARE(QOrganizerItemManager::NotSupportedError, errorMap[index]);
+            QCOMPARE(QOrganizerManager::NotSupportedError, errorMap[index]);
         }
     }
     break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest : {
+    case QOrganizerAbstractRequest::DetailDefinitionRemoveRequest : {
         // Check the error map, error map should contain the number of errors
         // equal to number of definitions to be saved. Also all the errors 
         // returned should be NotSupported
-        QMap<int, QOrganizerItemManager::Error> errorMap(
+        QMap<int, QOrganizerManager::Error> errorMap(
             ((QOrganizerItemDetailDefinitionRemoveRequest*)
             (m_itemRequest))->errorMap());
         int count = errorMap.count();
         QCOMPARE(KNumberOfItems, count);
         // Compare the errors returned, as remove detail defs is not supported
         for (int index(0); index < count; index++){
-            QCOMPARE(QOrganizerItemManager::NotSupportedError, errorMap[index]);
+            QCOMPARE(QOrganizerManager::NotSupportedError, errorMap[index]);
         }
     }
     break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest : {
+    case QOrganizerAbstractRequest::DetailDefinitionFetchRequest : {
 
         // Get the error map
-        QMap<int, QOrganizerItemManager::Error> errorMap(
+        QMap<int, QOrganizerManager::Error> errorMap(
             ((QOrganizerItemDetailDefinitionFetchRequest*)
             (m_itemRequest))->errorMap());
         // Get the iterator to the error map
-        QMapIterator<int, QOrganizerItemManager::Error> iter(errorMap);
+        QMapIterator<int, QOrganizerManager::Error> iter(errorMap);
         // Compare the errors returned
         while (iter.hasNext()){
             // Advance the iterator to point to next item in the error map
             iter.next();
             // Compare the error value
-            QCOMPARE(QOrganizerItemManager::DoesNotExistError, iter.value());
+            QCOMPARE(QOrganizerManager::DoesNotExistError, iter.value());
             // Get the index for the error returned
             int keyIndex(iter.key());
             
@@ -579,9 +579,9 @@ void TestNoteItems::saveItems_negative()
     
     // Connect for the state change signal 
     connect(m_itemRequest, 
-            SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), 
+            SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), 
             this, 
-            SLOT(requestStateChanged_Negative(QOrganizerItemAbstractRequest::State)));
+            SLOT(requestStateChanged_Negative(QOrganizerAbstractRequest::State)));
         connect(m_itemRequest, SIGNAL(resultsAvailable()), 
             this, SLOT(requestResultsAvailable_Negative()));
 
@@ -630,7 +630,7 @@ QList<QOrganizerItem> TestNoteItems::createItems_Negative(int noOfItems)
         //organizerItem.setId(id);
 
         // Set current time
-        QOrganizerEventTimeRange timeRange;
+        QOrganizerEventTime timeRange;
         QDateTime startTime;
         timeRange.setStartDateTime(startTime.currentDateTime());
 
@@ -644,11 +644,11 @@ QList<QOrganizerItem> TestNoteItems::createItems_Negative(int noOfItems)
         
         // Add recurrence rules to the item
         // Cretae a rule
-        QOrganizerItemRecurrenceRule rrule;
-        rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        QOrganizerRecurrenceRule rrule;
+        rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
         rrule.setLimit(2);
         // Set rule
-        QSet<QOrganizerItemRecurrenceRule> rrules;
+        QSet<QOrganizerRecurrenceRule> rrules;
         rrules.insert(rrule);
         QOrganizerItemRecurrence recurrence;
         recurrence.setRecurrenceRules(rrules);
@@ -659,38 +659,38 @@ QList<QOrganizerItem> TestNoteItems::createItems_Negative(int noOfItems)
     return itemsList;
 }
 
-void TestNoteItems::requestStateChanged_Negative(QOrganizerItemAbstractRequest::State currentState)
+void TestNoteItems::requestStateChanged_Negative(QOrganizerAbstractRequest::State currentState)
 {
     switch(currentState) {
-    case QOrganizerItemAbstractRequest::InactiveState: {
+    case QOrganizerAbstractRequest::InactiveState: {
         // Verify if the request is in inactive state
         QVERIFY(m_itemRequest->isInactive());
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::InactiveState);
+            QOrganizerAbstractRequest::InactiveState);
         // Operation not yet started start the operation
         m_itemRequest->start();
     }
     break;
-    case QOrganizerItemAbstractRequest::ActiveState: {
+    case QOrganizerAbstractRequest::ActiveState: {
         // Verify if the request is in active state
         QVERIFY(m_itemRequest->isActive());
         // Operation started, not yet finished operation already started
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::ActiveState);
+            QOrganizerAbstractRequest::ActiveState);
     }
     break;
-    case QOrganizerItemAbstractRequest::CanceledState: {
+    case QOrganizerAbstractRequest::CanceledState: {
         // Verify if the request is in canceled state
         QVERIFY(m_itemRequest->isCanceled());
         // Operation is finished due to cancellation test not completed, 
         // failed Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::CanceledState);
+            QOrganizerAbstractRequest::CanceledState);
     }
     break;
-    case QOrganizerItemAbstractRequest::FinishedState: {
+    case QOrganizerAbstractRequest::FinishedState: {
         // Verify if the request is in finished state
         QVERIFY(m_itemRequest->isFinished());
         // Operation either completed successfully or failed.  
@@ -698,7 +698,7 @@ void TestNoteItems::requestStateChanged_Negative(QOrganizerItemAbstractRequest::
         // test completed, compare the results
         // Compare the request state is set rightly
         QCOMPARE(m_itemRequest->state(), 
-            QOrganizerItemAbstractRequest::FinishedState);
+            QOrganizerAbstractRequest::FinishedState);
     }
     break;
     default: {
@@ -710,20 +710,20 @@ void TestNoteItems::requestStateChanged_Negative(QOrganizerItemAbstractRequest::
 
 void TestNoteItems::requestResultsAvailable_Negative()
 {
-    QOrganizerItemAbstractRequest::RequestType reqType(m_itemRequest->type());
+    QOrganizerAbstractRequest::RequestType reqType(m_itemRequest->type());
     switch (reqType) {
-    case QOrganizerItemAbstractRequest::ItemSaveRequest : {
+    case QOrganizerAbstractRequest::ItemSaveRequest : {
         QList<QOrganizerItem> items = ((QOrganizerItemSaveRequest*)
             m_itemRequest)->items();
         int count(items.count());
         QCOMPARE(0, count);
 
         // Get the error map
-        QMap<int, QOrganizerItemManager::Error> errorMap(
+        QMap<int, QOrganizerManager::Error> errorMap(
             ((QOrganizerItemSaveRequest*)
                 (m_itemRequest))->errorMap());
         // Get the iterator to the error map
-        QMapIterator<int, QOrganizerItemManager::Error> iter(errorMap);
+        QMapIterator<int, QOrganizerManager::Error> iter(errorMap);
         // Compare the errors returned
         while (iter.hasNext()){
             // Advance the iterator to point to next item in the error map
@@ -743,15 +743,15 @@ void TestNoteItems::requestResultsAvailable_Negative()
         }
     }
     break;
-    case QOrganizerItemAbstractRequest::ItemFetchRequest : {}
+    case QOrganizerAbstractRequest::ItemFetchRequest : {}
     break;
-    case QOrganizerItemAbstractRequest::ItemRemoveRequest : {}
+    case QOrganizerAbstractRequest::ItemRemoveRequest : {}
     break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest : {}
+    case QOrganizerAbstractRequest::DetailDefinitionSaveRequest : {}
     break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest : {}
+    case QOrganizerAbstractRequest::DetailDefinitionRemoveRequest : {}
     break;
-    case QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest : {}
+    case QOrganizerAbstractRequest::DetailDefinitionFetchRequest : {}
     break;
     }
 }
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp b/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp
index 154e605b8b..1f04b8cf05 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp
@@ -114,7 +114,7 @@ Q_DECLARE_METATYPE(QTstDetailFieldList)
 Q_DECLARE_METATYPE(QList<QOrganizerItemLocalId>)
 
 /*!
- * For testing symbian backend via QOrganizerItemManager API. The target is
+ * For testing symbian backend via QOrganizerManager API. The target is
  * to implement test cases in a platform independent manner so that this test
  * module could be used also with other backends and potentially used as a
  * QtMobility auto test with as little porting work as possible.
@@ -172,8 +172,8 @@ private:
 private: // util functions
     void addManagers();
     void addItem_dataBasic(QString managerName, QString itemType);
-    void addItem_dataEventTimeRange(QString managerName, QString itemType);
-    void addItem_dataTodoTimeRange(QString managerName, QString itemType);
+    void addItem_dataEventTime(QString managerName, QString itemType);
+    void addItem_dataTodoTime(QString managerName, QString itemType);
     void addItem_dataReminders(QString managerName, QString itemType);
     QString testCaseName(QString testCase, QString managerName, QString itemType);
     bool parseDetails(QTstDetailFieldList detailsString, QList<QOrganizerItemDetail> &details);
@@ -183,7 +183,7 @@ private: // util functions
     bool compareItems(QOrganizerItem itemA, QOrganizerItem itemB, QStringList ignoredDetails = QStringList());    
 
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
     TTimeIntervalSeconds m_UTCOffset;
 };
 
@@ -191,7 +191,7 @@ private:
 void tst_SymbianOm::init()
 {
     QFETCH(QString, managerName);
-    m_om = new QOrganizerItemManager(managerName);
+    m_om = new QOrganizerManager(managerName);
 
     // Remove all organizer items first (Note: ignores possible errors)
     m_om->removeItems(m_om->itemIds());
@@ -222,7 +222,7 @@ void tst_SymbianOm::addSimpleItem()
 
     // Save
     QVERIFY(m_om->saveItem(&item));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(item.id().localId() != QOrganizerItemLocalId());
     QVERIFY(item.id().managerUri().contains(m_om->managerName()));
 
@@ -230,7 +230,7 @@ void tst_SymbianOm::addSimpleItem()
     QList<QOrganizerItem> items;
     items.append(item);
     QVERIFY(m_om->saveItems(&items));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     foreach (QOrganizerItem listitem, items) {
         QVERIFY(listitem.id().localId() != QOrganizerItemLocalId());
         QVERIFY(item.id().managerUri().contains(m_om->managerName()));
@@ -238,7 +238,7 @@ void tst_SymbianOm::addSimpleItem()
 
     // Save with list parameter and error map parameter
     QVERIFY(m_om->saveItems(&items));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QVERIFY(m_om->errorMap().count() == 0);
     foreach (QOrganizerItem listitem2, items) {
         QVERIFY(listitem2.id().localId() != QOrganizerItemLocalId());
@@ -259,7 +259,7 @@ void tst_SymbianOm::fetchSimpleItem()
 
     // Fetch
     QOrganizerItem fetchedItem = m_om->item(item.localId());
-    QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(m_om->error(), QOrganizerManager::NoError);
     QCOMPARE(fetchedItem.id(), item.id());
     QVERIFY(fetchedItem.type() == QOrganizerItemType::TypeTodo);
 }
@@ -316,7 +316,7 @@ void tst_SymbianOm::fetchItems()
 
     // Fetch ids
     QList<QOrganizerItem> actualItems = m_om->items();
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     
     // Verify
     QVERIFY(compareItemLists(actualItems, expectedItems));
@@ -335,7 +335,7 @@ void tst_SymbianOm::fetchItemIds()
 
     // Fetch ids
     QList<QOrganizerItemLocalId> actualIds = m_om->itemIds();
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     
     // Verify
     QVERIFY(actualIds.count() == expectedIds.count());
@@ -376,7 +376,7 @@ void tst_SymbianOm::uniqueIds()
     // Load and check that ids are the still the same
     for (int i=0; i<count; i++) {
         QOrganizerItem item = m_om->item(lids[i]);
-        QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+        QVERIFY(m_om->error() == QOrganizerManager::NoError);
         QVERIFY(lids[i] == item.localId());
         QVERIFY(guids[i] == item.guid());
     }
@@ -452,7 +452,7 @@ void tst_SymbianOm::timeStamp()
         
     // Load the same item again
     QOrganizerTodo item2 = m_om->item(item1.localId());
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QOrganizerItemTimestamp timeStamp3 = item2.detail<QOrganizerItemTimestamp>();
     //qDebug() << "timestamp3" << timeStamp3;
     QVERIFY(timeStamp3.lastModified() == timeStamp2.lastModified());
@@ -462,14 +462,14 @@ void tst_SymbianOm::addNegative()
 {
     // Save with null pointer as item
     QVERIFY(!m_om->saveItem(0));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::BadArgumentError);
+    QCOMPARE(m_om->error(), QOrganizerManager::BadArgumentError);
 
     QVERIFY(!m_om->saveItems(0));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::BadArgumentError);
+    QCOMPARE(m_om->error(), QOrganizerManager::BadArgumentError);
 
     QList<QOrganizerItem> items;
     QVERIFY(!m_om->saveItems(&items));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::BadArgumentError);
+    QCOMPARE(m_om->error(), QOrganizerManager::BadArgumentError);
 
     // TODO: try to save an event with non-existing (non-zero) id and check that it fails
 }
@@ -490,7 +490,7 @@ void tst_SymbianOm::addItem_data()
     QTest::addColumn<int>("expectedError");
     QTest::addColumn<QTstDetailFieldList>("detailsList");
 
-    QStringList managerNames = QOrganizerItemManager::availableManagers();
+    QStringList managerNames = QOrganizerManager::availableManagers();
     managerNames.removeAll("invalid"); // the test cases would not pass on invalid backend
     managerNames.removeAll("skeleton"); // the test cases would not pass on skeleton backend
     managerNames.removeAll("memory");
@@ -498,12 +498,12 @@ void tst_SymbianOm::addItem_data()
     foreach (QString managerName, managerNames) {
         // TypeEvent
         addItem_dataBasic(managerName, QOrganizerItemType::TypeEvent);
-        addItem_dataEventTimeRange(managerName, QOrganizerItemType::TypeEvent);
+        addItem_dataEventTime(managerName, QOrganizerItemType::TypeEvent);
         addItem_dataReminders(managerName, QOrganizerItemType::TypeEvent);
 
         // TypeTodo
         addItem_dataBasic(managerName, QOrganizerItemType::TypeTodo);
-        addItem_dataTodoTimeRange(managerName, QOrganizerItemType::TypeTodo);
+        addItem_dataTodoTime(managerName, QOrganizerItemType::TypeTodo);
         addItem_dataReminders(managerName, QOrganizerItemType::TypeTodo);
 
         // TypeJournal not implementable on symbian backend
@@ -522,7 +522,7 @@ void tst_SymbianOm::addItem()
     QFETCH(int, expectedError);
     QFETCH(QTstDetailFieldList, detailsList);
 
-    QOrganizerItemManager::Error expectedErrorCode = (QOrganizerItemManager::Error) expectedError; 
+    QOrganizerManager::Error expectedErrorCode = (QOrganizerManager::Error) expectedError; 
     QList<QOrganizerItemDetail> details;
     QVERIFY(parseDetails(detailsList, details));
 
@@ -532,7 +532,7 @@ void tst_SymbianOm::addItem()
         QVERIFY(item.saveDetail(&detail));
         /* TODO: enable the following and implement detail definitions to symbian backend 
         QOrganizerItemDetailDefinition def = m_om->detailDefinition(detail.definitionName(), item.type());
-        if (m_om->error() != QOrganizerItemManager::NoError) {
+        if (m_om->error() != QOrganizerManager::NoError) {
             // this detail is not supported, skip the test case
             QString skipMsg = QString("Detail ") + detail.definitionName() + QString(" not supported for item type " + item.type());
             QSKIP(skipMsg.toAscii(), SkipSingle);
@@ -541,7 +541,7 @@ void tst_SymbianOm::addItem()
     }
 
     // Add, fetch and verify result
-    if (expectedErrorCode == QOrganizerItemManager::NoError) {
+    if (expectedErrorCode == QOrganizerManager::NoError) {
         // Save
         QVERIFY(m_om->saveItem(&item));
         QCOMPARE(m_om->error(), expectedErrorCode);
@@ -550,7 +550,7 @@ void tst_SymbianOm::addItem()
 
         // Fetch item to verify everything was saved successfully
         QOrganizerItem savedItem = m_om->item(item.localId());
-        QCOMPARE(m_om->error(), QOrganizerItemManager::NoError);
+        QCOMPARE(m_om->error(), QOrganizerManager::NoError);
         QVERIFY(verifyDetails(savedItem.details(), details));
     } else {
         // An error is expected -> Check that save fails and the error code
@@ -565,7 +565,7 @@ void tst_SymbianOm::signalEmission()
     QFETCH(QString, managerName);
     
     // Create a second manager
-    QOrganizerItemManager om2(managerName);
+    QOrganizerManager om2(managerName);
     
     // Connect signal spies
     qRegisterMetaType<QOrganizerItemLocalId>("QOrganizerItemLocalId");
@@ -653,7 +653,7 @@ void tst_SymbianOm::signalEmission()
 
 void tst_SymbianOm::invalidDetail()
 {
-    // NOTE: There is an auto test about this (tst_QOrganizerItemManager::itemValidation)
+    // NOTE: There is an auto test about this (tst_QOrganizerManager::itemValidation)
     // but its not working currently on symbian backend. This test can be removed
     // when it's compatible with symbian backend.
     QOrganizerTodo todo;
@@ -661,7 +661,7 @@ void tst_SymbianOm::invalidDetail()
     invalidDetail.setValue("foo", "bar");
     QVERIFY(todo.saveDetail(&invalidDetail));
     QVERIFY(!m_om->saveItem(&todo));
-    QVERIFY(m_om->error() == QOrganizerItemManager::InvalidDetailError);
+    QVERIFY(m_om->error() == QOrganizerManager::InvalidDetailError);
 }
 
 /*!
@@ -674,17 +674,17 @@ void tst_SymbianOm::addReminderToSingleInstance()
     repeatingEvent.setType(QOrganizerItemType::TypeEvent);
     
     // Add the start and end time
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     QDateTime startDateTime = QDateTime::currentDateTime();
     timeRange.setStartDateTime(startDateTime);
     timeRange.setEndDateTime(startDateTime.addSecs(3000));
     
     // Create a daily recurrence rule
     QOrganizerItemRecurrence recurrence;
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrule.setLimit(3);
-    QSet<QOrganizerItemRecurrenceRule> list;
+    QSet<QOrganizerRecurrenceRule> list;
     list.insert(rrule);
     recurrence.setRecurrenceRules(list);
     
@@ -729,17 +729,17 @@ void tst_SymbianOm::removeReminderFromSingleInstance()
     repeatingEvent.setType(QOrganizerItemType::TypeEvent);
     
     // Add the start and end time
-    QOrganizerEventTimeRange timeRange;
+    QOrganizerEventTime timeRange;
     QDateTime startDateTime = QDateTime::currentDateTime();
     timeRange.setStartDateTime(startDateTime);
     timeRange.setEndDateTime(startDateTime.addSecs(3000));
     
     // Create a daily recurrence rule
     QOrganizerItemRecurrence recurrence;
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrule.setLimit(3);
-    QSet<QOrganizerItemRecurrenceRule> list;
+    QSet<QOrganizerRecurrenceRule> list;
     list.insert(rrule);
     recurrence.setRecurrenceRules(list);
     
@@ -821,7 +821,7 @@ void tst_SymbianOm::addManagers()
 {
     QTest::addColumn<QString>("managerName");
 
-    QStringList managerNames = QOrganizerItemManager::availableManagers();
+    QStringList managerNames = QOrganizerManager::availableManagers();
     managerNames.removeAll("invalid"); // the test cases would not pass on invalid backend
     managerNames.removeAll("skeleton"); // the test cases would not pass on skeleton backend
     managerNames.removeAll("memory");
@@ -852,23 +852,23 @@ void tst_SymbianOm::addItem_dataBasic(QString managerName, QString itemType)
         && itemType == QOrganizerItemType::TypeEvent) {
         QTest::newRow(testCaseName("item without details", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::BadArgumentError // Symbian calendar server requires start time for an event
+            << (int) QOrganizerManager::BadArgumentError // Symbian calendar server requires start time for an event
             << QTstDetailFieldList(itemTypeDetails);
 
         QTest::newRow(testCaseName("item with description", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::BadArgumentError // Symbian calendar server requires start time for an event
+            << (int) QOrganizerManager::BadArgumentError // Symbian calendar server requires start time for an event
             << (QTstDetailFieldList(itemTypeDetails)
                 << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with Elbonian president")));
     } else {
         QTest::newRow(testCaseName("item without details", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << QTstDetailFieldList(itemTypeDetails);
 
         QTest::newRow(testCaseName("item with description", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << (QTstDetailFieldList(itemTypeDetails)
                 << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with Elbonian president")));
     }
@@ -879,7 +879,7 @@ void tst_SymbianOm::addItem_dataBasic(QString managerName, QString itemType)
  * Note: the test cases are actually type dependent, because the time range
  * detail is type dependent.
  */
-void tst_SymbianOm::addItem_dataEventTimeRange(QString managerName, QString itemType)
+void tst_SymbianOm::addItem_dataEventTime(QString managerName, QString itemType)
 {
     // The default detail list contains only the type (event)
     QTstDetailFieldList itemTypeDetails = QTstDetailFieldList();
@@ -890,9 +890,9 @@ void tst_SymbianOm::addItem_dataEventTimeRange(QString managerName, QString item
 
     QTest::newRow(testCaseName("item with start time", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
-            << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldStartDateTime, QDateTime::currentDateTime()));
+            << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldStartDateTime, QDateTime::currentDateTime()));
 
     // There is a bug in symbian calendar server: An end datetime that is
     // exactly the same as the start datetime is ignored.
@@ -902,25 +902,25 @@ void tst_SymbianOm::addItem_dataEventTimeRange(QString managerName, QString item
     if (managerName != m_managerNameSymbian) {
         QTest::newRow(testCaseName("item with start time = end time", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << (QTstDetailFieldList(itemTypeDetails)
-                << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldStartDateTime, QDateTime::currentDateTime())
-                << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldEndDateTime, QDateTime::currentDateTime()));
+                << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldStartDateTime, QDateTime::currentDateTime())
+                << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldEndDateTime, QDateTime::currentDateTime()));
     }
 
     QTest::newRow(testCaseName("item with start time < end time", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
-            << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldStartDateTime, QDateTime::currentDateTime())
-            << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldEndDateTime, QDateTime::currentDateTime().addSecs(3600)));
+            << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldStartDateTime, QDateTime::currentDateTime())
+            << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldEndDateTime, QDateTime::currentDateTime().addSecs(3600)));
 
     QTest::newRow(testCaseName("item with start time > end time", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::BadArgumentError
+        << (int) QOrganizerManager::BadArgumentError
         << (QTstDetailFieldList(itemTypeDetails)
-            << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addSecs(3600))
-            << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldEndDateTime, QDateTime::currentDateTime()));
+            << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldStartDateTime, QDateTime::currentDateTime().addSecs(3600))
+            << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldEndDateTime, QDateTime::currentDateTime()));
 
     // Symbian calendar server makes the client process panic in case the start
     // time of an event (calendar event of type EAppt) is left empty.
@@ -931,16 +931,16 @@ void tst_SymbianOm::addItem_dataEventTimeRange(QString managerName, QString item
         // This test case matches the iCalendar specification
         QTest::newRow(testCaseName("item with end time", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << (QTstDetailFieldList(itemTypeDetails)
-                << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldEndDateTime, QDateTime::currentDateTime().addSecs(3600)));
+                << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldEndDateTime, QDateTime::currentDateTime().addSecs(3600)));
     } else {
         // This test case is against the iCalendar specification
         QTest::newRow(testCaseName("item with end time", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::BadArgumentError
+            << (int) QOrganizerManager::BadArgumentError
             << (QTstDetailFieldList(itemTypeDetails)
-                << QTstDetailField(QOrganizerEventTimeRange::DefinitionName, QOrganizerEventTimeRange::FieldEndDateTime, QDateTime::currentDateTime().addSecs(3600)));
+                << QTstDetailField(QOrganizerEventTime::DefinitionName, QOrganizerEventTime::FieldEndDateTime, QDateTime::currentDateTime().addSecs(3600)));
     }
 }
 
@@ -952,19 +952,19 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
         QOrganizerItemType::FieldType,
         itemType);
 
-    QString timeRangeDefinition = QOrganizerEventTimeRange::DefinitionName;
-    QString fieldStartDateTime = QOrganizerEventTimeRange::FieldStartDateTime;
-    QString fieldEndDateTime = QOrganizerEventTimeRange::FieldEndDateTime;
+    QString timeRangeDefinition = QOrganizerEventTime::DefinitionName;
+    QString fieldStartDateTime = QOrganizerEventTime::FieldStartDateTime;
+    QString fieldEndDateTime = QOrganizerEventTime::FieldEndDateTime;
 
     if (itemType == QOrganizerItemType::TypeTodo) {
-        timeRangeDefinition = QLatin1String(QOrganizerTodoTimeRange::DefinitionName);
-        fieldStartDateTime = QLatin1String(QOrganizerTodoTimeRange::FieldStartDateTime);
-        fieldEndDateTime = QLatin1String(QOrganizerTodoTimeRange::FieldDueDateTime);
+        timeRangeDefinition = QLatin1String(QOrganizerTodoTime::DefinitionName);
+        fieldStartDateTime = QLatin1String(QOrganizerTodoTime::FieldStartDateTime);
+        fieldEndDateTime = QLatin1String(QOrganizerTodoTime::FieldDueDateTime);
     }
 
     QTest::newRow(testCaseName("item with reminder time delta", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with the president"))
             // start tomorrow
@@ -983,7 +983,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
     if (itemType != QOrganizerItemType::TypeTodo) {
         QTest::newRow(testCaseName("item with reminder starttime", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << (QTstDetailFieldList(itemTypeDetails)
                 << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with the president"))
                 // start after an hour
@@ -994,7 +994,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with reminder starttime after 3 hours, 2 secs", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with the president"))
             // start now
@@ -1005,7 +1005,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with reminder starttime after 30 days", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with the president"))
             // start after 30 days
@@ -1016,7 +1016,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with reminder starttime after 365 days", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with the president"))
             // start after 365 days
@@ -1027,7 +1027,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with reminder starttime in the past", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with the president"))
             // start now
@@ -1038,7 +1038,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with reminder delta", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with Elbonian president"))
             // start tomorrow
@@ -1049,7 +1049,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with small reminder delta", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with Elbonian president"))
             // start tomorrow
@@ -1060,7 +1060,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with smallest reminder delta", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with Elbonian president"))
             // start tomorrow
@@ -1071,7 +1071,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
 
     QTest::newRow(testCaseName("item with reminder delta in past", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << QTstDetailField(QOrganizerItemDescription::DefinitionName, QOrganizerItemDescription::FieldDescription, QString("Meeting with Elbonian president"))
             // start now
@@ -1086,7 +1086,7 @@ void tst_SymbianOm::addItem_dataReminders(QString managerName, QString itemType)
  * Note: the test cases are actually type dependent, because the time range
  * detail is type dependent.
  */
-void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemType)
+void tst_SymbianOm::addItem_dataTodoTime(QString managerName, QString itemType)
 {
     // The default detail list contains only the type (todo)
     QTstDetailFieldList itemTypeDetails;
@@ -1104,31 +1104,31 @@ void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemT
     if (managerName != m_managerNameSymbian) {
         QTest::newRow(testCaseName("item with due time", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << (QTstDetailFieldList(itemTypeDetails)
-                << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime())); 
+                << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime())); 
     }
 
     QTest::newRow(testCaseName("item with due time == not-before time", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime())
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime()));
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime())
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime()));
 
     QTest::newRow(testCaseName("item with due time > not-before time", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime()));
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(1))
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime()));
 
     QTest::newRow(testCaseName("item with due time < not-before time", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::BadArgumentError
+        << (int) QOrganizerManager::BadArgumentError
         << (QTstDetailFieldList(itemTypeDetails)
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime())
-            << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addDays(1)));
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime())
+            << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime().addDays(1)));
 
     // There is a bug in symbian calendar server which makes the "not-before"
     // datetime to be ignored if no "due" datetime is defined
@@ -1138,17 +1138,17 @@ void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemT
     if (managerName != m_managerNameSymbian) {
         QTest::newRow(testCaseName("item with not-before time", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << (QTstDetailFieldList(itemTypeDetails)
-                << QTstDetailField(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime().addDays(1)));
+                << QTstDetailField(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime().addDays(1)));
     }
 
-    QTstDetailField timeStart(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldStartDateTime, QDateTime::currentDateTime());
-    QTstDetailField timeDue(QOrganizerTodoTimeRange::DefinitionName, QOrganizerTodoTimeRange::FieldDueDateTime, QDateTime::currentDateTime().addDays(1));
+    QTstDetailField timeStart(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldStartDateTime, QDateTime::currentDateTime());
+    QTstDetailField timeDue(QOrganizerTodoTime::DefinitionName, QOrganizerTodoTime::FieldDueDateTime, QDateTime::currentDateTime().addDays(1));
     
     QTest::newRow(testCaseName("item with progress StatusNotStarted", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << timeStart
             << timeDue
@@ -1156,7 +1156,7 @@ void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemT
     
     QTest::newRow(testCaseName("item with progress StatusInProgress", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << timeStart
             << timeDue
@@ -1164,7 +1164,7 @@ void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemT
     
     QTest::newRow(testCaseName("item with progress StatusComplete", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::NoError
+        << (int) QOrganizerManager::NoError
         << (QTstDetailFieldList(itemTypeDetails)
             << timeStart
             << timeDue
@@ -1173,7 +1173,7 @@ void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemT
 
     QTest::newRow(testCaseName("item with progress StatusComplete, no finished date", managerName, itemType).toLatin1().constData())
         << managerName
-        << (int) QOrganizerItemManager::BadArgumentError
+        << (int) QOrganizerManager::BadArgumentError
         << (QTstDetailFieldList(itemTypeDetails)
             << timeStart
             << timeDue
@@ -1182,7 +1182,7 @@ void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemT
     if (managerName != m_managerNameSymbian) {
         QTest::newRow(testCaseName("item with progress percentage", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::NoError
+            << (int) QOrganizerManager::NoError
             << (QTstDetailFieldList(itemTypeDetails)
                 << timeStart
                 << timeDue
@@ -1190,7 +1190,7 @@ void tst_SymbianOm::addItem_dataTodoTimeRange(QString managerName, QString itemT
     } else {
         QTest::newRow(testCaseName("item with progress percentage", managerName, itemType).toLatin1().constData())
             << managerName
-            << (int) QOrganizerItemManager::InvalidDetailError
+            << (int) QOrganizerManager::InvalidDetailError
             << (QTstDetailFieldList(itemTypeDetails)
                 << timeStart
                 << timeDue
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp b/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp
index bb8eb0cde6..fdb2b8eec3 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp
@@ -64,7 +64,7 @@ QTM_USE_NAMESPACE
 #endif
 
 /*!
- * For testing symbian backend via QOrganizerItemManager async API.
+ * For testing symbian backend via QOrganizerManager async API.
  */
 class tst_SymbianOmAsync : public QObject
 {
@@ -137,7 +137,7 @@ private: // util functions
     void addManagers();
 
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
     bool m_customCollectionsSupported;
 };
 
@@ -146,7 +146,7 @@ Q_DECLARE_METATYPE(QList<QOrganizerCollectionLocalId>)
 tst_SymbianOmAsync::tst_SymbianOmAsync() :
     m_om(0)
 {
-    qRegisterMetaType<QOrganizerItemAbstractRequest::State>("QOrganizerItemAbstractRequest::State");
+    qRegisterMetaType<QOrganizerAbstractRequest::State>("QOrganizerAbstractRequest::State");
     qRegisterMetaType<QList<QOrganizerItemLocalId> >("QList<QOrganizerItemLocalId>");
     qRegisterMetaType<QList<QOrganizerCollectionLocalId> >("QList<QOrganizerCollectionLocalId>");
 }
@@ -165,7 +165,7 @@ void tst_SymbianOmAsync::initTestCase()
 void tst_SymbianOmAsync::init()
 {
     QFETCH(QString, managerName);
-    m_om = new QOrganizerItemManager(managerName);
+    m_om = new QOrganizerManager(managerName);
     // Remove items on all collections
     m_om->removeItems(m_om->itemIds());
     // Remove all collections (except the default)
@@ -199,21 +199,21 @@ void tst_SymbianOmAsync::addSimpleItem()
     saveItemRequest.setItem(item);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&saveItemRequest, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&saveItemRequest, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&saveItemRequest, SIGNAL(resultsAvailable()));
     QSignalSpy addedSpy(m_om, SIGNAL(itemsAdded(QList<QOrganizerItemLocalId>)));
 
     // Save
     QVERIFY(saveItemRequest.start());
-    QCOMPARE(saveItemRequest.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(saveItemRequest.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1); // one item saved
     QTRY_COMPARE(addedSpy.count(), 1);  // one item saved
 
     // Verify
     QCOMPARE(m_om->itemIds().count(), 1);
-    QCOMPARE(saveItemRequest.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(saveItemRequest.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(saveItemRequest.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(saveItemRequest.error(), QOrganizerManager::NoError);
     QCOMPARE(saveItemRequest.items().count(), 1);
     QVERIFY(saveItemRequest.items().at(0).localId() != QOrganizerItemLocalId());
 }
@@ -236,18 +236,18 @@ void tst_SymbianOmAsync::fetchSimpleItem()
     fetchItemRequest.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&fetchItemRequest, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&fetchItemRequest, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&fetchItemRequest, SIGNAL(resultsAvailable()));
 
     // Fetch
     QVERIFY(fetchItemRequest.start());
-    QCOMPARE(fetchItemRequest.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(fetchItemRequest.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1); // 1 item fetched
 
     // Verify
-    QCOMPARE(fetchItemRequest.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(fetchItemRequest.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(fetchItemRequest.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(fetchItemRequest.error(), QOrganizerManager::NoError);
     QCOMPARE(fetchItemRequest.items().count(), 1);
     QVERIFY(fetchItemRequest.items().at(0).localId() != QOrganizerItemLocalId());
 }
@@ -269,12 +269,12 @@ void tst_SymbianOmAsync::fetchWaitForFinished()
 
      // Create signal spys for verification purposes
      QSignalSpy stateSpy(&fetchItemRequest,
-         SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+         SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
      QSignalSpy resultSpy(&fetchItemRequest, SIGNAL(resultsAvailable()));
 
      // Fetch
      QVERIFY(fetchItemRequest.start());
-     QCOMPARE(fetchItemRequest.state(), QOrganizerItemAbstractRequest::ActiveState);
+     QCOMPARE(fetchItemRequest.state(), QOrganizerAbstractRequest::ActiveState);
      QCOMPARE(stateSpy.count(), 1);  // inactive > active
      QTime startTime = QTime::currentTime();
      QVERIFY(fetchItemRequest.waitForFinished(5000)); // 5 seconds time-out
@@ -298,18 +298,18 @@ void tst_SymbianOmAsync::fetchItems()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
 
     // Fetch
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QVERIFY(resultSpy.count() > 1);
 
     // Verify
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.items().count(), itemCount);
     QVERIFY(req.items().at(0).localId() != QOrganizerItemLocalId());
 }
@@ -326,18 +326,18 @@ void tst_SymbianOmAsync::fetchItemIds()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
 
     // Fetch
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QVERIFY(resultSpy.count() >= 1);   // allow one or more "resultsAvailable"
 
     // Verify
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.itemIds().count(), itemCount);
     QVERIFY(req.itemIds().at(0) != QOrganizerItemLocalId());
 }
@@ -357,7 +357,7 @@ void tst_SymbianOmAsync::fetchItemsIdFilter()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
 
     // Fetch with local id filter
@@ -365,12 +365,12 @@ void tst_SymbianOmAsync::fetchItemsIdFilter()
     localIdFilter.setIds(m_om->itemIds().mid(pos, length));
     req.setFilter(localIdFilter);
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QVERIFY(resultSpy.count() > 1);
 
     // Verify
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.items().count(), length);
     // Assuming the sort order is the same:
     QVERIFY(req.items().at(0).localId() == m_om->itemIds().at(pos));
@@ -398,19 +398,19 @@ void tst_SymbianOmAsync::fetchItemsNonExistingIds()
     req.setFilter(localIdFilter);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
 
     // Fetch
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
 
     // Verify
     QVERIFY(resultSpy.count() > 1);
     QCOMPARE(req.items().count(), itemCount - 1);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::DoesNotExistError);
 }
 
 void tst_SymbianOmAsync::fetchItemsDetailFilter()
@@ -425,7 +425,7 @@ void tst_SymbianOmAsync::fetchItemsDetailFilter()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
 
     // Fetch with detail filter
@@ -433,12 +433,12 @@ void tst_SymbianOmAsync::fetchItemsDetailFilter()
     detailFilter.setDetailDefinitionName(QOrganizerItemDisplayLabel::DefinitionName);
     req.setFilter(detailFilter);
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QVERIFY(resultSpy.count() > 1);
 
     // Verify
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.items().count(), itemCount);
     QVERIFY(req.items().at(0).localId() != QOrganizerItemLocalId());
 }
@@ -455,7 +455,7 @@ void tst_SymbianOmAsync::fetchItemsSortOrder()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
 
     // Set sort order
@@ -475,12 +475,12 @@ void tst_SymbianOmAsync::fetchItemsSortOrder()
 
     // Fetch
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QVERIFY(resultSpy.count() > 1);
 
     // Verify
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.items().count(), itemCount);
     QVERIFY(req.items().at(0).localId() != QOrganizerItemLocalId());
 }
@@ -518,13 +518,13 @@ void tst_SymbianOmAsync::addItems()
     req.setItems(items);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     QSignalSpy addedSpy(m_om, SIGNAL(itemsAdded(QList<QOrganizerItemLocalId>)));
 
     // Save
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2); // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
 
@@ -535,8 +535,8 @@ void tst_SymbianOmAsync::addItems()
     // get one signal. For example showing information like "54% complete" to the user is not
     // possible if you get only one signal once the request is completed.
     QVERIFY(addedSpy.count() > 1);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.items().count(), itemCount);
     foreach (QOrganizerItem item, req.items()) {
         QVERIFY(!item.localId().isNull());
@@ -562,11 +562,11 @@ void tst_SymbianOmAsync::addItemsMultiReq()
     req3.setItem(item3);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy1(&req1, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy1(&req1, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy1(&req1, SIGNAL(resultsAvailable()));
-    QSignalSpy stateSpy2(&req2, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy2(&req2, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy2(&req2, SIGNAL(resultsAvailable()));
-    QSignalSpy stateSpy3(&req3, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy3(&req3, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy3(&req3, SIGNAL(resultsAvailable()));
     QSignalSpy addedSpy(m_om, SIGNAL(itemsAdded(QList<QOrganizerItemLocalId>)));
 
@@ -574,9 +574,9 @@ void tst_SymbianOmAsync::addItemsMultiReq()
     QVERIFY(req1.start());
     QVERIFY(req2.start());
     QVERIFY(req3.start());
-    QCOMPARE(req1.state(), QOrganizerItemAbstractRequest::ActiveState);
-    QCOMPARE(req2.state(), QOrganizerItemAbstractRequest::ActiveState);
-    QCOMPARE(req3.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req1.state(), QOrganizerAbstractRequest::ActiveState);
+    QCOMPARE(req2.state(), QOrganizerAbstractRequest::ActiveState);
+    QCOMPARE(req3.state(), QOrganizerAbstractRequest::ActiveState);
 
     // Verify
     QTRY_COMPARE(stateSpy1.count(), 2); // inactive > active > finished
@@ -586,8 +586,8 @@ void tst_SymbianOmAsync::addItemsMultiReq()
     QTRY_COMPARE(resultSpy2.count(), 1);
     QTRY_COMPARE(resultSpy3.count(), 1);
     QCOMPARE(addedSpy.count(), 3);
-    QCOMPARE(req1.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req1.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req1.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req1.error(), QOrganizerManager::NoError);
     QCOMPARE(m_om->itemIds().count(), 3);
     foreach (QOrganizerItemLocalId id, m_om->itemIds()) {
         QVERIFY(!id.isNull());
@@ -609,21 +609,21 @@ void tst_SymbianOmAsync::modifyItems()
     req.setItems(items);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     QSignalSpy changedSpy(m_om, SIGNAL(itemsChanged(QList<QOrganizerItemLocalId>)));
 
     // Save
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
 
     // Verify
     QVERIFY(changedSpy.count() > 0);
     QVERIFY(changedSpy.count() > 1);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.items().count(), itemCount);
 }
 
@@ -639,21 +639,21 @@ void tst_SymbianOmAsync::removeItems()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     QSignalSpy removedSpy(m_om, SIGNAL(itemsRemoved(QList<QOrganizerItemLocalId>)));
 
     // Remove
     req.setItemIds(m_om->itemIds());
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
 
     // Verify
     QVERIFY(removedSpy.count() > 0);
     QVERIFY(removedSpy.count() > 1);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(m_om->itemIds().count(), 0);
 }
 
@@ -664,7 +664,7 @@ void tst_SymbianOmAsync::addCollection()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     QSignalSpy addedSpy(m_om, SIGNAL(collectionsAdded(QList<QOrganizerCollectionLocalId>)));
 
@@ -681,7 +681,7 @@ void tst_SymbianOmAsync::addCollection()
     if (!m_customCollectionsSupported) {
         QWARN("Saving collections not supported!");
         QVERIFY(!req.start());
-        QCOMPARE(req.error(), QOrganizerItemManager::NotSupportedError);
+        QCOMPARE(req.error(), QOrganizerManager::NotSupportedError);
         QCOMPARE(stateSpy.count(), 1);
         QTRY_COMPARE(resultSpy.count(), 1);
         return;
@@ -689,14 +689,14 @@ void tst_SymbianOmAsync::addCollection()
 
     // Start the request
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
     QTRY_COMPARE(addedSpy.count(), 1);
 
     // Verify
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QList<QOrganizerCollection> collections = m_om->collections();
     QCOMPARE(collections.count(), 2); // the default plus the new one
     QCOMPARE(collections.at(1).metaData().value("Name").toString(), QString("addCollection"));
@@ -716,7 +716,7 @@ void tst_SymbianOmAsync::modifyCollection()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     QSignalSpy addedSpy(m_om, SIGNAL(collectionsAdded(QList<QOrganizerCollectionLocalId>)));
     QSignalSpy changedSpy(m_om, SIGNAL(collectionsChanged(QList<QOrganizerCollectionLocalId>)));
@@ -736,15 +736,15 @@ void tst_SymbianOmAsync::modifyCollection()
 
     // Start the request
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
     QTRY_COMPARE(addedSpy.count(), 1);
     QTRY_COMPARE(changedSpy.count(), 1);
 
     // Verify
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QList<QOrganizerCollection> collections = m_om->collections();
     QCOMPARE(collections.count(), 2); // the default plus the new one
     QCOMPARE(collections.at(1).metaData().value("Name").toString(), QString("modifyCollection"));
@@ -758,7 +758,7 @@ void tst_SymbianOmAsync::removeCollection()
     req.setManager(m_om);
 
     // Create signal spys for verification purposes
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     QSignalSpy removedSpy(m_om, SIGNAL(collectionsRemoved(QList<QOrganizerCollectionLocalId>)));
     
@@ -766,7 +766,7 @@ void tst_SymbianOmAsync::removeCollection()
     if (!m_customCollectionsSupported) {
         QWARN("Removing collections not supported!");
         QVERIFY(!req.start());
-        QCOMPARE(req.error(), QOrganizerItemManager::NotSupportedError);
+        QCOMPARE(req.error(), QOrganizerManager::NotSupportedError);
         QCOMPARE(stateSpy.count(), 1);
         QTRY_COMPARE(resultSpy.count(), 1);
         return;
@@ -786,35 +786,35 @@ void tst_SymbianOmAsync::removeCollection()
 
     // Start the request
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
     QTRY_COMPARE(removedSpy.count(), 1);
 
     // Verify
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(m_om->collections().count(), 1); // the default
 
     // Try to remove again, should fail
     req.setCollectionId(collection.localId());
     QVERIFY(req.start());
     QTRY_COMPARE(resultSpy.count(), 2);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::DoesNotExistError);
 }
 
 void tst_SymbianOmAsync::addCollectionMultiManager()
 {
     // Create a second manager
-    QScopedPointer<QOrganizerItemManager> om2(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om2(new QOrganizerManager(m_om->managerName()));
 
     // Create request
     QOrganizerCollectionSaveRequest req;
     req.setManager(m_om);
 
     // Setup signal spies
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     QSignalSpy addedSpy1(m_om, SIGNAL(collectionsAdded(QList<QOrganizerCollectionLocalId>)));
     QSignalSpy addedSpy2(om2.data(), SIGNAL(collectionsAdded(QList<QOrganizerCollectionLocalId>)));
@@ -823,7 +823,7 @@ void tst_SymbianOmAsync::addCollectionMultiManager()
     if (!m_customCollectionsSupported) {
         QWARN("Removing collections not supported!");
         QVERIFY(!req.start());
-        QCOMPARE(req.error(), QOrganizerItemManager::NotSupportedError);
+        QCOMPARE(req.error(), QOrganizerManager::NotSupportedError);
         QCOMPARE(stateSpy.count(), 1);
         QTRY_COMPARE(resultSpy.count(), 1);
         return;
@@ -840,7 +840,7 @@ void tst_SymbianOmAsync::addCollectionMultiManager()
 
     // Start the request
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
     QCOMPARE(req.collections().count(), 1);
@@ -866,18 +866,18 @@ void tst_SymbianOmAsync::detailDefinitionFetch()
     req.setManager(m_om);
     
     // Setup signal spies
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     
     // Fetch by item type only
     req.setItemType(QOrganizerItemType::TypeEvent);
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QCOMPARE(stateSpy.count(), 1);
     QTRY_COMPARE(resultSpy.count(), 1);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
     QCOMPARE(stateSpy.count(), 2);
-    QCOMPARE(req.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(req.error(), QOrganizerManager::NoError);
     QCOMPARE(req.errorMap().count(), 0);
     QVERIFY(req.definitions().count() > 0);
     stateSpy.clear();
@@ -892,11 +892,11 @@ void tst_SymbianOmAsync::detailDefinitionFetch()
     QVERIFY(req.start());
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
     QCOMPARE(stateSpy.count(), 2);
-    QCOMPARE(req.error(), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(req.error(), QOrganizerManager::DoesNotExistError);
     QCOMPARE(req.errorMap().count(), 1);
-    QCOMPARE(req.errorMap().value(1), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(req.errorMap().value(1), QOrganizerManager::DoesNotExistError);
     QVERIFY(req.definitions().count() == 1);    
     stateSpy.clear();
     resultSpy.clear();
@@ -905,11 +905,11 @@ void tst_SymbianOmAsync::detailDefinitionFetch()
     req.setItemType(QString());
     req.setDefinitionNames(QStringList());
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NotSupportedError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NotSupportedError);
     QCOMPARE(req.errorMap().count(), 0);
     QVERIFY(req.definitions().count() == 0);
     stateSpy.clear();
@@ -918,11 +918,11 @@ void tst_SymbianOmAsync::detailDefinitionFetch()
     // Fetch by not supported item type
     req.setItemType(QOrganizerItemType::TypeJournal);
     QVERIFY(req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::ActiveState);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
     QTRY_COMPARE(resultSpy.count(), 1);
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NotSupportedError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NotSupportedError);
     QCOMPARE(req.errorMap().count(), 0);
     QVERIFY(req.definitions().count() == 0);
     stateSpy.clear();
@@ -936,13 +936,13 @@ void tst_SymbianOmAsync::detailDefinitionSave()
     req.setManager(m_om);
     
     // Setup signal spies
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     
     // Saving detail definitions is not supported so verify it cannot be started 
     QVERIFY(!req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NotSupportedError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NotSupportedError);
     QCOMPARE(req.errorMap().count(), 0);
     QCOMPARE(stateSpy.count(), 1);
     QCOMPARE(resultSpy.count(), 1);    
@@ -955,13 +955,13 @@ void tst_SymbianOmAsync::detailDefinitionRemove()
     req.setManager(m_om);
     
     // Setup signal spies
-    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
     
     // Removing detail definitions is not supported so verify it cannot be started 
     QVERIFY(!req.start());
-    QCOMPARE(req.state(), QOrganizerItemAbstractRequest::FinishedState);
-    QCOMPARE(req.error(), QOrganizerItemManager::NotSupportedError);
+    QCOMPARE(req.state(), QOrganizerAbstractRequest::FinishedState);
+    QCOMPARE(req.error(), QOrganizerManager::NotSupportedError);
     QCOMPARE(req.errorMap().count(), 0);
     QCOMPARE(stateSpy.count(), 1);
     QCOMPARE(resultSpy.count(), 1);   
@@ -1000,7 +1000,7 @@ QOrganizerItem tst_SymbianOmAsync::createItem(QString itemType, QString label, Q
     item.setType(itemType);
     item.setDisplayLabel(label);
     if (itemType == QOrganizerItemType::TypeTodo) {
-        QOrganizerTodoTimeRange timeRange;
+        QOrganizerTodoTime timeRange;
         if (startTime.isValid())
             timeRange.setStartDateTime(startTime);
         if (endTime.isValid())
@@ -1008,7 +1008,7 @@ QOrganizerItem tst_SymbianOmAsync::createItem(QString itemType, QString label, Q
         if (!timeRange.isEmpty())
             item.saveDetail(&timeRange);
     } else {
-        QOrganizerEventTimeRange timeRange;
+        QOrganizerEventTime timeRange;
         if (startTime.isValid())
             timeRange.setStartDateTime(startTime);
         if (endTime.isValid())
@@ -1044,7 +1044,7 @@ void tst_SymbianOmAsync::addManagers()
 {
     QTest::addColumn<QString>("managerName");
 
-    QStringList managerNames = QOrganizerItemManager::availableManagers();
+    QStringList managerNames = QOrganizerManager::availableManagers();
     managerNames.removeAll("invalid"); // the test cases would not pass on invalid backend
     managerNames.removeAll("skeleton"); // the test cases would not pass on skeleton backend
     // TODO: memory backend does not have async API implemented
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp b/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp
index d08410f8a2..00d0435830 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp
@@ -76,7 +76,7 @@ Q_DECLARE_METATYPE(QList<QOrganizerItemLocalId>)
 Q_DECLARE_METATYPE(QList<QOrganizerCollectionLocalId>)
 
 /*!
- * For testing symbian backend via QOrganizerItemManager API. The target is
+ * For testing symbian backend via QOrganizerManager API. The target is
  * to implement test cases in a platform independent manner so that this test
  * module could be used also with other backends and potentially used as a
  * QtMobility auto test with as little porting work as possible.
@@ -141,7 +141,7 @@ private: // util functions
     void addManagers();
 
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
     bool m_customCollectionsSupported;
 };
 
@@ -159,7 +159,7 @@ void tst_symbianomcollections::initTestCase()
 void tst_symbianomcollections::init()
 {
     QFETCH(QString, managerName);
-    m_om = new QOrganizerItemManager(managerName);
+    m_om = new QOrganizerManager(managerName);
     // Remove items on all collections
     m_om->removeItems(m_om->itemIds());
     // Remove all collections (except the default)
@@ -185,12 +185,12 @@ void tst_symbianomcollections::fetchCollection()
 {
     // Fetch default collection id
     QOrganizerCollectionLocalId dId = m_om->defaultCollection().localId();
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(!dId.isNull());
     
     // Get collections but do not provide id's
     QList<QOrganizerCollection> cs = m_om->collections();
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(cs.count() == 0);
     
     // Get all collections
@@ -207,7 +207,7 @@ void tst_symbianomcollections::fetchCollection()
     // Get a specific collection
     QOrganizerCollection defaultCollection = m_om->collection(dId);
     cs << defaultCollection;
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(cs.count() == 1);
 
     // Do a basic verify
@@ -218,7 +218,7 @@ void tst_symbianomcollections::fetchCollection()
     QOrganizerCollectionLocalId nonId;
     cs.clear();
     cs << m_om->collection(nonId);
-    QVERIFY(m_om->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(m_om->error() == QOrganizerManager::DoesNotExistError);
 
     // Can we save collections? 
     if (!m_customCollectionsSupported)
@@ -230,7 +230,7 @@ void tst_symbianomcollections::fetchCollection()
     QVERIFY(m_om->saveCollection(&c1));
     cs.clear();
     cs = m_om->collections();
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(cs.count() == 2);
     
     //remove and then fetch the collections
@@ -238,13 +238,13 @@ void tst_symbianomcollections::fetchCollection()
         
     cs.clear();
     cs = m_om->collections();
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(cs.count() == 1);
     
     // fetch an already removed collection
     cs.clear();
     cs << m_om->collection(c1.id().localId());
-    QVERIFY(m_om->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(m_om->error() == QOrganizerManager::DoesNotExistError);
 }
 
 void tst_symbianomcollections::saveCollection()
@@ -255,7 +255,7 @@ void tst_symbianomcollections::saveCollection()
         // Verify it fails with correct error
         QOrganizerCollection c1;
         QVERIFY(!m_om->saveCollection(&c1));
-        QVERIFY(m_om->error() == QOrganizerItemManager::NotSupportedError);        
+        QVERIFY(m_om->error() == QOrganizerManager::NotSupportedError);        
         return;
     }
     
@@ -279,7 +279,7 @@ void tst_symbianomcollections::saveCollection()
     // Verify saved collection matches to fetched collection
     QList<QOrganizerCollection> cs;
     cs << m_om->collection(c1.id().localId());
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(cs.count() == 1);
     foreach (QString key, c1.metaData().keys()) {
         if (cs[0].metaData(key) != c1.metaData(key)) {
@@ -327,7 +327,7 @@ void tst_symbianomcollections::saveCollection()
     // Verify saved collection matches to fetched collection (again)
     cs.clear();
     cs << m_om->collection(c1.id().localId());
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(cs.count() == 1);
     foreach (QString key, c1.metaData().keys()) {
         if (cs[0].metaData(key) != c1.metaData(key)) {
@@ -372,7 +372,7 @@ void tst_symbianomcollections::removeCollection()
         QWARN("Removing a collection not supported!");
         // Verify it fails with correct error code
         QVERIFY(!m_om->removeCollection(m_om->defaultCollection()));
-        QVERIFY(m_om->error() == QOrganizerItemManager::NotSupportedError);
+        QVERIFY(m_om->error() == QOrganizerManager::NotSupportedError);
         return;
     }
     
@@ -390,7 +390,7 @@ void tst_symbianomcollections::removeCollection()
     QVERIFY(m_om->saveCollection(&c));
     
     // Create a second manager which will open the same collection
-    QScopedPointer<QOrganizerItemManager> om2(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om2(new QOrganizerManager(m_om->managerName()));
     QList<QOrganizerCollection> colls = om2->collections();
     QVERIFY(colls.contains(c)); // we assume that collections local id is global between managers
     
@@ -400,7 +400,7 @@ void tst_symbianomcollections::removeCollection()
     QVERIFY(m_om->removeCollection(c.id().localId()));
 
     // Create a third manager
-    QScopedPointer<QOrganizerItemManager> om3(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om3(new QOrganizerManager(m_om->managerName()));
 
     // Collection should not appear in any manager
     QTRY_COMPARE(m_om->collections().count(), 1);
@@ -417,7 +417,7 @@ void tst_symbianomcollections::removeCollection()
     
     // Remove all collections
     colls = m_om->collections();
-    QVERIFY(m_om->error() == QOrganizerItemManager::NoError);
+    QVERIFY(m_om->error() == QOrganizerManager::NoError);
     QVERIFY(colls.count() >= 2); // default collection + collection saved
     foreach (const QOrganizerCollection& coll, colls) {
         if (coll == m_om->defaultCollection())
@@ -439,7 +439,7 @@ void tst_symbianomcollections::collectionSignalEmission()
         QSKIP("Collection signals not supported!", SkipSingle);
     
     // Create a second manager
-    QScopedPointer<QOrganizerItemManager> om2(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om2(new QOrganizerManager(m_om->managerName()));
     
     // Setup signal spies
     qRegisterMetaType<QList<QOrganizerCollectionLocalId> >("QList<QOrganizerCollectionLocalId>");
@@ -511,7 +511,7 @@ void tst_symbianomcollections::itemSignalEmission()
     QVERIFY(m_om->saveCollection(&c));
     
     // Create a second manager
-    QScopedPointer<QOrganizerItemManager> om2(new QOrganizerItemManager(m_om->managerName()));
+    QScopedPointer<QOrganizerManager> om2(new QOrganizerManager(m_om->managerName()));
     
     // Setup signal spies
     qRegisterMetaType<QList<QOrganizerItemLocalId> >("QList<QOrganizerItemLocalId>");
@@ -817,10 +817,10 @@ void tst_symbianomcollections::fetchItemInstance()
                                       QString("fetchiteminstance"),
                                       QDateTime::currentDateTime().addMSecs(3600));
     item.setCollectionId(c.id());
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
     rrule.setLimit(5);
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules.insert(rrule);
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -855,10 +855,10 @@ void tst_symbianomcollections::modifyItemInstance()
                                       QString("modifyiteminstance"),
                                       QDateTime::currentDateTime().addMSecs(3600));
     item.setCollectionId(c.id());
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
     rrule.setLimit(5);
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules.insert(rrule);
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -945,7 +945,7 @@ QOrganizerItem tst_symbianomcollections::createItem(QString itemType, QString la
     item.setType(itemType);
     item.setDisplayLabel(label);
     if (itemType == QOrganizerItemType::TypeTodo) {
-        QOrganizerTodoTimeRange timeRange;
+        QOrganizerTodoTime timeRange;
         if (startTime.isValid())
             timeRange.setStartDateTime(startTime);
         if (endTime.isValid())
@@ -953,7 +953,7 @@ QOrganizerItem tst_symbianomcollections::createItem(QString itemType, QString la
         if (!timeRange.isEmpty())
             item.saveDetail(&timeRange);
     } else {
-        QOrganizerEventTimeRange timeRange;
+        QOrganizerEventTime timeRange;
         if (startTime.isValid())
             timeRange.setStartDateTime(startTime);
         if (endTime.isValid())
@@ -971,7 +971,7 @@ void tst_symbianomcollections::addManagers()
 {
     QTest::addColumn<QString>("managerName");
 
-    QStringList managerNames = QOrganizerItemManager::availableManagers();
+    QStringList managerNames = QOrganizerManager::availableManagers();
     managerNames.removeAll("invalid"); // the test cases would not pass on invalid backend
     managerNames.removeAll("skeleton"); // the test cases would not pass on skeleton backend
     managerNames.removeAll("memory");
diff --git a/plugins/organizer/symbian/tsrc/tst_todooccurrence/tst_todooccurrence.cpp b/plugins/organizer/symbian/tsrc/tst_todooccurrence/tst_todooccurrence.cpp
index a877445b6c..301b259445 100644
--- a/plugins/organizer/symbian/tsrc/tst_todooccurrence/tst_todooccurrence.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_todooccurrence/tst_todooccurrence.cpp
@@ -84,13 +84,13 @@ private:
     void addOccurrencedata(QString itemType);
     
 private:
-    QOrganizerItemManager *m_om;
+    QOrganizerManager *m_om;
 };
 
 void TestTodoOccurrence::init()
 {
     // Create a new item manager instance
-    m_om = new QOrganizerItemManager(managerNameSymbian);
+    m_om = new QOrganizerManager(managerNameSymbian);
     
     // Cleanup by deleting all items
     m_om->removeItems(m_om->itemIds());
@@ -111,7 +111,7 @@ void TestTodoOccurrence::addSimpleOccurrenceDetail_data()
     QTest::addColumn<QDateTime>("firstInstanceDueDateTime");
     QTest::addColumn<QDateTime>("secondInstanceDueDateTime");
     QTest::addColumn<QDateTime>("thirdInstanceDueDateTime");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     QTest::addColumn<int>("numberOfInstances");
     
     addSimpleOccurrenceData(QOrganizerItemType::TypeTodo);
@@ -123,8 +123,8 @@ void TestTodoOccurrence::addSimpleOccurrenceData(QString itemType)
 	QDateTime secondInstanceDueDateTime(QDate::currentDate());
 	QDateTime thirdInstanceDueDateTime(QDate::currentDate());
 	
-	QOrganizerItemRecurrenceRule dailyRrule;
-	dailyRrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+	QOrganizerRecurrenceRule dailyRrule;
+	dailyRrule.setFrequency(QOrganizerRecurrenceRule::Daily);
 	dailyRrule.setLimit(QDate::currentDate().addDays(4));
 	dailyRrule.setInterval(2);
 	secondInstanceDueDateTime.setDate(firstInstanceDueDateTime.date().addDays(2));
@@ -139,8 +139,8 @@ void TestTodoOccurrence::addSimpleOccurrenceData(QString itemType)
 		<< dailyRrule
 		<< 3; 
 	
-	QOrganizerItemRecurrenceRule weeklyRrule;
-	weeklyRrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+	QOrganizerRecurrenceRule weeklyRrule;
+	weeklyRrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
 	secondInstanceDueDateTime = firstInstanceDueDateTime.addDays(7);
 	thirdInstanceDueDateTime = firstInstanceDueDateTime.addDays(14);
 	weeklyRrule.setLimit(3);
@@ -157,8 +157,8 @@ void TestTodoOccurrence::addSimpleOccurrenceData(QString itemType)
 		<< weeklyRrule
 		<< 3;
 	
-	QOrganizerItemRecurrenceRule monthlyRrule;
-	monthlyRrule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+	QOrganizerRecurrenceRule monthlyRrule;
+	monthlyRrule.setFrequency(QOrganizerRecurrenceRule::Monthly);
 	secondInstanceDueDateTime = firstInstanceDueDateTime.addMonths(1);
 	thirdInstanceDueDateTime = firstInstanceDueDateTime.addMonths(2);
 	monthlyRrule.setLimit(3);
@@ -175,8 +175,8 @@ void TestTodoOccurrence::addSimpleOccurrenceData(QString itemType)
 		<< monthlyRrule
 		<< 3;
 	
-	QOrganizerItemRecurrenceRule yearlyRrule;
-	yearlyRrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+	QOrganizerRecurrenceRule yearlyRrule;
+	yearlyRrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
 	secondInstanceDueDateTime = firstInstanceDueDateTime.addYears(1);
 	thirdInstanceDueDateTime = firstInstanceDueDateTime.addYears(2);
 	yearlyRrule.setLimit(3);
@@ -198,7 +198,7 @@ void TestTodoOccurrence::addSimpleOccurrenceDetail()
     QFETCH(QDateTime, firstInstanceDueDateTime);
     QFETCH(QDateTime, secondInstanceDueDateTime);
     QFETCH(QDateTime, thirdInstanceDueDateTime);
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
     QFETCH(int, numberOfInstances);
 
     // Set the item type
@@ -206,7 +206,7 @@ void TestTodoOccurrence::addSimpleOccurrenceDetail()
     item.setStartDateTime(startTime);
     item.setDueDateTime(startTime);
    
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules << rrule;
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -261,7 +261,7 @@ void TestTodoOccurrence::addOccurrenceDetail_data()
 {
     QTest::addColumn<QString>("itemType");
     QTest::addColumn<QDateTime>("startTime");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     QTest::addColumn<QDateTime>("fourthInstanceDateTime");
     QTest::addColumn<QDateTime>("fifthInstanceDateTime");
     QTest::addColumn<QOrganizerItemPriority>("priority");
@@ -279,8 +279,8 @@ void TestTodoOccurrence::addOccurrencedata(QString itemType)
 	QSet<int> positions;
 	
 	// Repeating weekly on tuesday and thursday.
-	QOrganizerItemRecurrenceRule weeklyRrule;
-	weeklyRrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+	QOrganizerRecurrenceRule weeklyRrule;
+	weeklyRrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
 	weeklyRrule.setLimit(6);
 	daysOfWeek << Qt::Tuesday;
 	daysOfWeek << Qt::Thursday;
@@ -314,8 +314,8 @@ void TestTodoOccurrence::addOccurrencedata(QString itemType)
 		<< priority;
 	
 	// Monthly which repeats on every 6th and 22nd of the month.
-	QOrganizerItemRecurrenceRule monthlyRrule;
-	monthlyRrule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+	QOrganizerRecurrenceRule monthlyRrule;
+	monthlyRrule.setFrequency(QOrganizerRecurrenceRule::Monthly);
 	monthlyRrule.setLimit(6);
 	days << 6;
 	days << 22;
@@ -333,8 +333,8 @@ void TestTodoOccurrence::addOccurrencedata(QString itemType)
 		<< priority;
 	
 	// Monthly which repeats on every 2nd wednesday and thursday of the month.
-	QOrganizerItemRecurrenceRule monthlyRruleUsingSetPosition;
-	monthlyRruleUsingSetPosition.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+	QOrganizerRecurrenceRule monthlyRruleUsingSetPosition;
+	monthlyRruleUsingSetPosition.setFrequency(QOrganizerRecurrenceRule::Monthly);
 	monthlyRruleUsingSetPosition.setLimit(6);
 	positions << 2;
 	daysOfWeek.clear();
@@ -355,11 +355,11 @@ void TestTodoOccurrence::addOccurrencedata(QString itemType)
 		<< priority;
 	
 	// Yearly repeating on the month of september on 2nd tuesday of that month.
-	QOrganizerItemRecurrenceRule yearlyRrule;
-	yearlyRrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+	QOrganizerRecurrenceRule yearlyRrule;
+	yearlyRrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
 	yearlyRrule.setLimit(6);
-	QSet<QOrganizerItemRecurrenceRule::Month> months;
-	months << QOrganizerItemRecurrenceRule::September;
+	QSet<QOrganizerRecurrenceRule::Month> months;
+	months << QOrganizerRecurrenceRule::September;
 	yearlyRrule.setMonthsOfYear(months);
 	daysOfWeek.clear();
 	daysOfWeek << Qt::Tuesday;
@@ -384,7 +384,7 @@ void TestTodoOccurrence::addOccurrenceDetail()
 {
 	QFETCH(QString, itemType);
 	QFETCH(QDateTime, startTime);
-	QFETCH(QOrganizerItemRecurrenceRule, rrule);
+	QFETCH(QOrganizerRecurrenceRule, rrule);
 	QFETCH(QDateTime, fourthInstanceDateTime);
 	QFETCH(QDateTime, fifthInstanceDateTime);
 	QFETCH(QOrganizerItemPriority, priority);
@@ -396,7 +396,7 @@ void TestTodoOccurrence::addOccurrenceDetail()
 	item.setStartDateTime(startTime);
 	item.setDueDateTime(startTime);
 
-	QSet<QOrganizerItemRecurrenceRule> rrules;
+	QSet<QOrganizerRecurrenceRule> rrules;
 	rrules << rrule;
 	QOrganizerItemRecurrence recurrence;
 	recurrence.setRecurrenceRules(rrules);
@@ -437,11 +437,11 @@ void TestTodoOccurrence::editOccurrenceNegative_data()
 {
     QTest::addColumn<QString>("itemType");
     QTest::addColumn<QDateTime>("startTime");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     
     QString itemType = QOrganizerItemType::TypeTodo;
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrule.setLimit(10);
 
     QTest::newRow("daily repeating entry")
@@ -454,18 +454,18 @@ void TestTodoOccurrence::editOccurrenceNegative()
 {
     QFETCH(QString, itemType);
     QFETCH(QDateTime, startTime);
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
      
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
-    QOrganizerTodoTimeRange timeRange;
+    QOrganizerTodoTime timeRange;
     timeRange.setStartDateTime(startTime);
     timeRange.setDueDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules << rrule;
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
@@ -481,7 +481,7 @@ void TestTodoOccurrence::editOccurrenceNegative()
     // Comments are not supporeted.
     QVERIFY(item.saveDetail(&comment));  
     QVERIFY(!m_om->saveItem(&item));
-    QVERIFY(m_om->error() == QOrganizerItemManager::InvalidDetailError);
+    QVERIFY(m_om->error() == QOrganizerManager::InvalidDetailError);
     
 
     //Fetch first instance of the saved entry to modify
@@ -497,13 +497,13 @@ void TestTodoOccurrence::editOccurrenceNegative()
     //firstInstance.setGuid(QString(""));
     //firstInstance.setParentLocalId(QOrganizerItemLocalId(-1));
     //QVERIFY(!m_om->saveItem(&firstInstance));
-    //QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    //QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
     
     //change to invalid original Date of the instance and save 
     firstInstance.setGuid(instanceGuid);
     firstInstance.setOriginalDate(QDate(1000,1,1));
     QVERIFY(!m_om->saveItem(&firstInstance));
-    QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
     
     //Save the instance with invalid localid
     // TODO: Disabled because of API change. REFACTOR!
@@ -511,7 +511,7 @@ void TestTodoOccurrence::editOccurrenceNegative()
     //itemId.setLocalId(1);
     //firstInstance.setId(itemId);
     //QVERIFY(!m_om->saveItem(&firstInstance));
-    //QCOMPARE(m_om->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    //QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 }
 
 void TestTodoOccurrence::addOccurrenceWithException_data()
@@ -521,7 +521,7 @@ void TestTodoOccurrence::addOccurrenceWithException_data()
     QTest::addColumn<QDateTime>("startTime");
     QTest::addColumn<QDate>("rDate");
     QTest::addColumn<QDate>("exceptionDate");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("rrule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("rrule");
     QTest::addColumn<QOrganizerItemPriority>("priority");
     QTest::addColumn<QString>("modifiedDescription");
     QTest::addColumn<QDateTime>("modifiedStartTime");
@@ -533,8 +533,8 @@ void TestTodoOccurrence::addOccurrenceWithException_data()
     QString description("checkoccurrence");
     QString newDescription("modifyOccurrence");
     
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrule.setLimit(10);
     QDate rDate(QDate::currentDate().year() , 9, 11);
     QDate exceptionDate(QDate::currentDate().year() , 9, 3);
@@ -549,8 +549,8 @@ void TestTodoOccurrence::addOccurrenceWithException_data()
     << newDescription
     << QDateTime(QDate(QDate::currentDate().year() , 8, 30));        
 
-    QOrganizerItemRecurrenceRule monthRule;
-    monthRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+    QOrganizerRecurrenceRule monthRule;
+    monthRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
     monthRule.setLimit(5);
 
     QTest::newRow("Monthly todo for 5 occurrences")
@@ -564,10 +564,10 @@ void TestTodoOccurrence::addOccurrenceWithException_data()
     << newDescription
     << QDateTime(QDate(QDate::currentDate().year() , 8, 1));        
 
-    QOrganizerItemRecurrenceRule yearRule;
-    yearRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-    QSet<QOrganizerItemRecurrenceRule::Month> months;
-    months << QOrganizerItemRecurrenceRule::September;
+    QOrganizerRecurrenceRule yearRule;
+    yearRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+    QSet<QOrganizerRecurrenceRule::Month> months;
+    months << QOrganizerRecurrenceRule::September;
     yearRule.setLimit(3);
     yearRule.setMonthsOfYear(months);
     QDate yearException(QDate(QDate::currentDate().year() , 9, 1));
@@ -590,19 +590,19 @@ void TestTodoOccurrence::addOccurrenceWithException()
     QFETCH(QDateTime, startTime);
     QFETCH(QDate, rDate);
     QFETCH(QDate,exceptionDate );
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
     QFETCH(QOrganizerItemPriority, priority);
     
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
-    QOrganizerTodoTimeRange timeRange;
+    QOrganizerTodoTime timeRange;
     timeRange.setStartDateTime(startTime);
     timeRange.setDueDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     QSet<QDate> exceptionList;
     QSet<QDate> rDateList;
     rrules << rrule;
@@ -661,7 +661,7 @@ void TestTodoOccurrence::editOccurrence()
     QFETCH(QDateTime, startTime);
     QFETCH(QDate, rDate);
     QFETCH(QDate,exceptionDate );
-    QFETCH(QOrganizerItemRecurrenceRule, rrule);
+    QFETCH(QOrganizerRecurrenceRule, rrule);
     QFETCH(QOrganizerItemPriority, priority);
     QFETCH(QString,modifiedDescription);
     QFETCH(QDateTime, modifiedStartTime);
@@ -669,13 +669,13 @@ void TestTodoOccurrence::editOccurrence()
     // Set the item type
     QOrganizerItem item;
     item.setType(itemType);
-    QOrganizerTodoTimeRange timeRange;
+    QOrganizerTodoTime timeRange;
     timeRange.setStartDateTime(startTime);
     timeRange.setDueDateTime(startTime);
     QVERIFY(item.saveDetail(&timeRange));
 
     // Add recurrence rules to the item
-    QSet<QOrganizerItemRecurrenceRule> rrules;
+    QSet<QOrganizerRecurrenceRule> rrules;
     rrules << rrule;
     QOrganizerItemRecurrence recurrence;
     recurrence.setRecurrenceRules(rrules);
diff --git a/src/organizer/details/details.pri b/src/organizer/details/details.pri
index ee1c18836b..ac62e89676 100644
--- a/src/organizer/details/details.pri
+++ b/src/organizer/details/details.pri
@@ -2,7 +2,7 @@ INCLUDEPATH += details \
     ./
 
 PUBLIC_HEADERS += \
-    details/qorganizereventtimerange.h \
+    details/qorganizereventtime.h \
     details/qorganizeritemaudiblereminder.h \
     details/qorganizeritemcomment.h \
     details/qorganizeritemdescription.h \
@@ -18,8 +18,8 @@ PUBLIC_HEADERS += \
     details/qorganizeritemtype.h \
     details/qorganizeritemvisualreminder.h \
     details/qorganizeritemdetails.h \
-    details/qorganizerjournaltimerange.h \
+    details/qorganizerjournaltime.h \
     details/qorganizertodoprogress.h \
-    details/qorganizertodotimerange.h
+    details/qorganizertodotime.h
 
 SOURCES += details/qorganizeritemdetails.cpp
diff --git a/src/organizer/details/qorganizereventtimerange.h b/src/organizer/details/qorganizereventtime.h
index f5e8e6d190..0ef243c176 100644
--- a/src/organizer/details/qorganizereventtimerange.h
+++ b/src/organizer/details/qorganizereventtime.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QORGANIZEREVENTTIMERANGE_H
-#define QORGANIZEREVENTTIMERANGE_H
+#ifndef QORGANIZEREVENTTIME_H
+#define QORGANIZEREVENTTIME_H
 
 #include <QString>
 
@@ -51,7 +51,7 @@
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_ORGANIZER_EXPORT QOrganizerEventTimeRange : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerEventTime : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -60,7 +60,7 @@ public:
     static const QLatin1Constant FieldEndDateTime;
     static const QLatin1Constant FieldTimeSpecified;
 #else
-    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerEventTimeRange, "EventTimeRange")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerEventTime, "EventTime")
     Q_DECLARE_LATIN1_CONSTANT(FieldStartDateTime, "StartDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldEndDateTime, "EndDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldTimeSpecified, "TimeSpecified");
diff --git a/src/organizer/details/qorganizeritemdetails.cpp b/src/organizer/details/qorganizeritemdetails.cpp
index 4711515f88..451d81e415 100644
--- a/src/organizer/details/qorganizeritemdetails.cpp
+++ b/src/organizer/details/qorganizeritemdetails.cpp
@@ -144,65 +144,65 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemDisplayLabel::FieldLabel, "Label");
 
 
 
-/* ==================== QOrganizerEventTimeRange ======================= */
+/* ==================== QOrganizerEventTime ======================= */
 /*!
-   \class QOrganizerEventTimeRange
-   \brief The QOrganizerEventTimeRange class contains the start and end dates and times of a recurring event series,
+   \class QOrganizerEventTime
+   \brief The QOrganizerEventTime class contains the start and end dates and times of a recurring event series,
           or occurrence of an event.
    \inmodule QtOrganizer
    \ingroup organizer-details
 */
 
 /*!
-   \variable QOrganizerEventTimeRange::DefinitionName
+   \variable QOrganizerEventTime::DefinitionName
 
    The constant string which identifies the definition of details
    which contain a start and end timestamps of an event series or event occurrence.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTimeRange::DefinitionName, "EventTimeRange");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTime::DefinitionName, "EventTime");
 
 /*!
-   \variable QOrganizerEventTimeRange::FieldEndDateTime
+   \variable QOrganizerEventTime::FieldEndDateTime
 
    The constant key for which the end date and time value is stored in
-   details of the QOrganizerEventTimeRange type.
+   details of the QOrganizerEventTime type.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTimeRange::FieldEndDateTime, "EndDateTime");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTime::FieldEndDateTime, "EndDateTime");
 
 /*!
-   \variable QOrganizerEventTimeRange::FieldStartDateTime
+   \variable QOrganizerEventTime::FieldStartDateTime
 
    The constant key for which the start date and time value is stored in
-   details of the QOrganizerEventTimeRange type.
+   details of the QOrganizerEventTime type.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTimeRange::FieldStartDateTime, "StartDateTime");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTime::FieldStartDateTime, "StartDateTime");
 
 /*!
-   \variable QOrganizerEventTimeRange::FieldTimeSpecified
+   \variable QOrganizerEventTime::FieldTimeSpecified
 
    The constant key for the specification of whether the time is significant in the
-   start datetime of the QOrganizerEventTimeRange type.
+   start datetime of the QOrganizerEventTime type.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTimeRange::FieldTimeSpecified, "TimeSpecified");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerEventTime::FieldTimeSpecified, "TimeSpecified");
 
 
 /*!
-    \fn QOrganizerEventTimeRange::startDateTime() const
+    \fn QOrganizerEventTime::startDateTime() const
     Returns the event timerange's start date and time as QDateTime.
  */
 
 /*!
-    \fn QOrganizerEventTimeRange::setStartDateTime(const QDateTime& startDateTime)
+    \fn QOrganizerEventTime::setStartDateTime(const QDateTime& startDateTime)
     Sets the event timerange's start date and time to \a startDateTime.
  */
 
 /*!
-    \fn QOrganizerEventTimeRange::endDateTime() const
+    \fn QOrganizerEventTime::endDateTime() const
     Returns the event timerange's due date and time as QDateTime.
  */
 
 /*!
-    \fn QOrganizerEventTimeRange::setEndDateTime(const QDateTime& dueDateTime)
+    \fn QOrganizerEventTime::setEndDateTime(const QDateTime& dueDateTime)
     Sets the event timerange's due date and time to \a dueDateTime.
  */
 
@@ -298,40 +298,40 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerItemInstanceOrigin::FieldOriginalDate, "Origi
  */
 
 
-/* ==================== QOrganizerJournalTimeRange ======================= */
+/* ==================== QOrganizerJournalTime ======================= */
 // XXX TODO: time range or just single instant in time?
 /*!
-   \class QOrganizerJournalTimeRange
+   \class QOrganizerJournalTime
 
-   \brief The QOrganizerJournalTimeRange class contains information about
+   \brief The QOrganizerJournalTime class contains information about
    the date and time for which a journal entry has been created.
    \inmodule QtOrganizer
    \ingroup organizer-details
  */
 
 /*!
-\variable QOrganizerJournalTimeRange::DefinitionName
+\variable QOrganizerJournalTime::DefinitionName
 
 The constant string which identifies the definition of details
 which describe the date and time associated with a journal item.
 */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerJournalTimeRange::DefinitionName, "JournalTimeRange");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerJournalTime::DefinitionName, "JournalTime");
 
 /*!
-   \variable QOrganizerJournalTimeRange::FieldEntryDateTime
+   \variable QOrganizerJournalTime::FieldEntryDateTime
 
    The constant key for which the date and time of value for a journal entry is
-   stored in details of the QOrganizerJournalTimeRange type.
+   stored in details of the QOrganizerJournalTime type.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerJournalTimeRange::FieldEntryDateTime, "EntryDateTime");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerJournalTime::FieldEntryDateTime, "EntryDateTime");
 
 /*!
-   \fn QOrganizerJournalTimeRange::entryDateTime() const
+   \fn QOrganizerJournalTime::entryDateTime() const
    Returns the journal entry date and time as QDateTime.
  */
 
 /*!
-   \fn QOrganizerJournalTimeRange::setEntryDateTime(const QDateTime& entryDateTime)
+   \fn QOrganizerJournalTime::setEntryDateTime(const QDateTime& entryDateTime)
    Sets the journal entry date and time to \a entryDateTime.
  */
 
@@ -631,15 +631,15 @@ void QOrganizerItemRecurrence::setRecurrenceDates(const QSet<QDate>& rdates)
    \fn QOrganizerItemRecurrence::exceptionRules() const
    Returns a list of exception rules.
  */
-QSet<QOrganizerItemRecurrenceRule> QOrganizerItemRecurrence::exceptionRules() const
+QSet<QOrganizerRecurrenceRule> QOrganizerItemRecurrence::exceptionRules() const
 {
-    return variantValue(FieldExceptionRules).value< QSet<QOrganizerItemRecurrenceRule> >();
+    return variantValue(FieldExceptionRules).value< QSet<QOrganizerRecurrenceRule> >();
 }
 /*!
-   \fn QOrganizerItemRecurrence::setExceptionRules(const QList<QOrganizerItemRecurrenceRule>& xrules)
+   \fn QOrganizerItemRecurrence::setExceptionRules(const QList<QOrganizerRecurrenceRule>& xrules)
    Sets a list of exception rules to \a xrules.
  */
-void QOrganizerItemRecurrence::setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>& xrules)
+void QOrganizerItemRecurrence::setExceptionRules(const QSet<QOrganizerRecurrenceRule>& xrules)
 {
     setValue(FieldExceptionRules, QVariant::fromValue(xrules));
 }
@@ -647,17 +647,17 @@ void QOrganizerItemRecurrence::setExceptionRules(const QSet<QOrganizerItemRecurr
    \fn QOrganizerItemRecurrence::recurrenceRules() const
    Returns a list of recurrence rules.
  */
-QSet<QOrganizerItemRecurrenceRule> QOrganizerItemRecurrence::recurrenceRules() const
+QSet<QOrganizerRecurrenceRule> QOrganizerItemRecurrence::recurrenceRules() const
 {
-    return variantValue(FieldRecurrenceRules).value< QSet<QOrganizerItemRecurrenceRule> >();
+    return variantValue(FieldRecurrenceRules).value< QSet<QOrganizerRecurrenceRule> >();
 }
 
 
 /*!
-   \fn QOrganizerItemRecurrence::setRecurrenceRules(const QList<QOrganizerItemRecurrenceRule>& rrules)
+   \fn QOrganizerItemRecurrence::setRecurrenceRules(const QList<QOrganizerRecurrenceRule>& rrules)
    Sets a list of recurrence rules to \a rrules.
  */
-void QOrganizerItemRecurrence::setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule>& rrules)
+void QOrganizerItemRecurrence::setRecurrenceRules(const QSet<QOrganizerRecurrenceRule>& rrules)
 {
     setValue(FieldRecurrenceRules, QVariant::fromValue(rrules));
 }
@@ -1121,61 +1121,61 @@ Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoProgress::FieldFinishedDateTime, "Finishe
   \fn QOrganizerTodoProgress::setPercentageComplete(int percentage)
   Sets the todo progress item's completion percentage to \a percentage.
  */
-/* ==================== QOrganizerTodoTimeRange ======================= */
+/* ==================== QOrganizerTodoTime ======================= */
 /*!
-   \class QOrganizerTodoTimeRange
-   \brief The QOrganizerTodoTimeRange class contains information about the time range of a todo item.
+   \class QOrganizerTodoTime
+   \brief The QOrganizerTodoTime class contains information about the time range of a todo item.
    \inmodule QtOrganizer
    \ingroup organizer-details
  */
 
 /*!
-   \variable QOrganizerTodoTimeRange::DefinitionName
+   \variable QOrganizerTodoTime::DefinitionName
    The constant string which identifies the definition of details which contain time-range information about a todo item.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTimeRange::DefinitionName, "TodoTimeRange");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTime::DefinitionName, "TodoTime");
 
 /*!
-   \variable QOrganizerTodoTimeRange::FieldStartDateTime
+   \variable QOrganizerTodoTime::FieldStartDateTime
 
    The constant key of the date time value which describes the date at which
    the todo should be started.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTimeRange::FieldStartDateTime, "StartDateTime");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTime::FieldStartDateTime, "StartDateTime");
 
 /*!
-   \variable QOrganizerTodoTimeRange::FieldDueDateTime
+   \variable QOrganizerTodoTime::FieldDueDateTime
 
    The constant key of the date time value which describes the latest date at which
    the todo should be completed.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTimeRange::FieldDueDateTime, "DueDateTime");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTime::FieldDueDateTime, "DueDateTime");
 
 /*!
-   \variable QOrganizerTodoTimeRange::FieldTimeSpecified
+   \variable QOrganizerTodoTime::FieldTimeSpecified
 
    The constant key for the specification of whether the time is significant in the
-   start datetime of the QOrganizerTodoTimeRange type.
+   start datetime of the QOrganizerTodoTime type.
  */
-Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTimeRange::FieldTimeSpecified, "TimeSpecified");
+Q_DEFINE_LATIN1_CONSTANT(QOrganizerTodoTime::FieldTimeSpecified, "TimeSpecified");
 
 /*!
-    \fn QOrganizerTodoTimeRange::startDateTime() const
+    \fn QOrganizerTodoTime::startDateTime() const
     Returns the todo timerange's start date and time as QDateTime.
  */
 
 /*!
-    \fn QOrganizerTodoTimeRange::setStartDateTime(const QDateTime& startDateTime)
+    \fn QOrganizerTodoTime::setStartDateTime(const QDateTime& startDateTime)
     Sets the todo timerange's start date and time to \a startDateTime.
  */
 
 /*!
-    \fn QOrganizerTodoTimeRange::dueDateTime() const
+    \fn QOrganizerTodoTime::dueDateTime() const
     Returns the todo timerange's due date and time as QDateTime.
  */
 
 /*!
-    \fn QOrganizerTodoTimeRange::setDueDateTime(const QDateTime& dueDateTime)
+    \fn QOrganizerTodoTime::setDueDateTime(const QDateTime& dueDateTime)
     Sets the todo timerange's due date and time to \a dueDateTime.
  */
 
diff --git a/src/organizer/details/qorganizeritemdetails.h b/src/organizer/details/qorganizeritemdetails.h
index 87ff4cc2a3..3e33189f5c 100644
--- a/src/organizer/details/qorganizeritemdetails.h
+++ b/src/organizer/details/qorganizeritemdetails.h
@@ -45,7 +45,7 @@
 // this file includes all of the leaf detail classes
 // provided by the Qt Organizer API.
 
-#include "qorganizereventtimerange.h"
+#include "qorganizereventtime.h"
 #include "qorganizeritemcomment.h"
 #include "qorganizeritemdescription.h"
 #include "qorganizeritemdisplaylabel.h"
@@ -56,9 +56,9 @@
 #include "qorganizeritemrecurrence.h"
 #include "qorganizeritemtimestamp.h"
 #include "qorganizeritemtype.h"
-#include "qorganizerjournaltimerange.h"
+#include "qorganizerjournaltime.h"
 #include "qorganizertodoprogress.h"
-#include "qorganizertodotimerange.h"
+#include "qorganizertodotime.h"
 
 #include "qorganizeritemreminder.h"
 #include "qorganizeritemaudiblereminder.h"
diff --git a/src/organizer/details/qorganizeritemrecurrence.h b/src/organizer/details/qorganizeritemrecurrence.h
index e3f8bb3aa3..9a1d775493 100644
--- a/src/organizer/details/qorganizeritemrecurrence.h
+++ b/src/organizer/details/qorganizeritemrecurrence.h
@@ -47,7 +47,7 @@
 #include "qtorganizerglobal.h"
 #include "qorganizeritemdetail.h"
 #include "qorganizeritem.h"
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -69,17 +69,17 @@ public:
     Q_DECLARE_LATIN1_CONSTANT(FieldExceptionDates, "ExceptionDates");
 #endif
 
-    void setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule>& rrules);
+    void setRecurrenceRules(const QSet<QOrganizerRecurrenceRule>& rrules);
 
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules() const;
+    QSet<QOrganizerRecurrenceRule> recurrenceRules() const;
 
     void setRecurrenceDates(const QSet<QDate>& rdates);
 
     QSet<QDate> recurrenceDates() const;
 
-    void setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>& xrules);
+    void setExceptionRules(const QSet<QOrganizerRecurrenceRule>& xrules);
 
-    QSet<QOrganizerItemRecurrenceRule> exceptionRules() const;
+    QSet<QOrganizerRecurrenceRule> exceptionRules() const;
 
     void setExceptionDates(const QSet<QDate>& xdates);
 
diff --git a/src/organizer/details/qorganizerjournaltimerange.h b/src/organizer/details/qorganizerjournaltime.h
index d2b166428e..210cee1d8f 100644
--- a/src/organizer/details/qorganizerjournaltimerange.h
+++ b/src/organizer/details/qorganizerjournaltime.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QORGANIZERJOURNALTIMERANGE_H
-#define QORGANIZERJOURNALTIMERANGE_H
+#ifndef QORGANIZERJOURNALTIME_H
+#define QORGANIZERJOURNALTIME_H
 
 #include <QString>
 
@@ -51,14 +51,14 @@
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_ORGANIZER_EXPORT QOrganizerJournalTimeRange : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerJournalTime : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
     static const QLatin1Constant DefinitionName;
     static const QLatin1Constant FieldEntryDateTime;
 #else
-    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerJournalTimeRange, "JournalTimeRange")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerJournalTime, "JournalTime")
     Q_DECLARE_LATIN1_CONSTANT(FieldEntryDateTime, "EntryDateTime");
 #endif
 
diff --git a/src/organizer/details/qorganizertodotimerange.h b/src/organizer/details/qorganizertodotime.h
index 190f3919d6..2f587eb486 100644
--- a/src/organizer/details/qorganizertodotimerange.h
+++ b/src/organizer/details/qorganizertodotime.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QORGANIZERTODOTIMERANGE_H
-#define QORGANIZERTODOTIMERANGE_H
+#ifndef QORGANIZERTODOTIME_H
+#define QORGANIZERTODOTIME_H
 
 #include <QString>
 
@@ -51,7 +51,7 @@
 QTM_BEGIN_NAMESPACE
 
 /* Leaf class */
-class Q_ORGANIZER_EXPORT QOrganizerTodoTimeRange : public QOrganizerItemDetail
+class Q_ORGANIZER_EXPORT QOrganizerTodoTime : public QOrganizerItemDetail
 {
 public:
 #ifdef Q_QDOC
@@ -60,7 +60,7 @@ public:
     static const QLatin1Constant FieldDueDateTime;
     static const QLatin1Constant FieldTimeSpecified;
 #else
-    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerTodoTimeRange, "TodoTimeRange")
+    Q_DECLARE_CUSTOM_ORGANIZER_DETAIL(QOrganizerTodoTime, "TodoTime")
     Q_DECLARE_LATIN1_CONSTANT(FieldStartDateTime, "StartDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldDueDateTime, "DueDateTime");
     Q_DECLARE_LATIN1_CONSTANT(FieldTimeSpecified, "TimeSpecified");
diff --git a/src/organizer/engines/qorganizeriteminvalidbackend.cpp b/src/organizer/engines/qorganizeriteminvalidbackend.cpp
index 3195b22688..6896f41819 100644
--- a/src/organizer/engines/qorganizeriteminvalidbackend.cpp
+++ b/src/organizer/engines/qorganizeriteminvalidbackend.cpp
@@ -46,7 +46,7 @@
 /*!
   \class QOrganizerItemInvalidEngine
   \brief The QOrganizerItemInvalidEngine class provides an implementation of
-  QOrganizerItemManagerEngine whose functions always return an error.
+  QOrganizerManagerEngine whose functions always return an error.
   \inmodule QtOrganizer
   
   The invalid engine may be used as a reference or test engine, but does nothing.
diff --git a/src/organizer/engines/qorganizeriteminvalidbackend_p.h b/src/organizer/engines/qorganizeriteminvalidbackend_p.h
index a31ef47c39..5d92a95cd1 100644
--- a/src/organizer/engines/qorganizeriteminvalidbackend_p.h
+++ b/src/organizer/engines/qorganizeriteminvalidbackend_p.h
@@ -54,15 +54,15 @@
 // We mean it.
 //
 
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanager_p.h"
+#include "qorganizermanager.h"
+#include "qorganizermanager_p.h"
 
 #include <QMap>
 #include <QString>
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemInvalidEngine : public QOrganizerItemManagerEngine
+class QOrganizerItemInvalidEngine : public QOrganizerManagerEngine
 {
 public:
     QOrganizerItemInvalidEngine();
@@ -72,16 +72,16 @@ public:
     int managerVersion() const {return 0;}
 
     /*! \reimp */
-    virtual QString synthesizedDisplayLabel(const QOrganizerItem&, QOrganizerItemManager::Error* error) const
+    virtual QString synthesizedDisplayLabel(const QOrganizerItem&, QOrganizerManager::Error* error) const
     {
-        *error =  QOrganizerItemManager::NotSupportedError;
+        *error =  QOrganizerManager::NotSupportedError;
         return QString();
     }
 
     /*! \reimp */
-    virtual QOrganizerItem compatibleItem(const QOrganizerItem&, QOrganizerItemManager::Error* error) const
+    virtual QOrganizerItem compatibleItem(const QOrganizerItem&, QOrganizerManager::Error* error) const
     {
-        *error =  QOrganizerItemManager::NotSupportedError;
+        *error =  QOrganizerManager::NotSupportedError;
         return QOrganizerItem();
     }
 };
diff --git a/src/organizer/engines/qorganizeritemmemorybackend.cpp b/src/organizer/engines/qorganizeritemmemorybackend.cpp
index 8484d8732f..c8c78a0242 100644
--- a/src/organizer/engines/qorganizeritemmemorybackend.cpp
+++ b/src/organizer/engines/qorganizeritemmemorybackend.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 #include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemmanagerengine.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizermanagerengine.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemrequests.h"
 #include "qorganizeritemchangeset.h"
 #include "qorganizeritemdetails.h"
@@ -354,22 +354,22 @@ QMap<QString, QString> QOrganizerItemMemoryEngine::managerParameters() const
 }
 
 /*! \reimp */
-QOrganizerItem QOrganizerItemMemoryEngine::item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QOrganizerItem QOrganizerItemMemoryEngine::item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(fetchHint); // no optimisations are possible in the memory backend; ignore the fetch hint.
     int index = d->m_organizeritemIds.indexOf(organizeritemId);
     if (index != -1) {
         // found the organizer item successfully.
-        *error = QOrganizerItemManager::NoError;
+        *error = QOrganizerManager::NoError;
         return d->m_organizeritems.at(index);
     }
 
-    *error = QOrganizerItemManager::DoesNotExistError;
+    *error = QOrganizerManager::DoesNotExistError;
     return QOrganizerItem();
 }
 
 /*! \reimp */
-QList<QOrganizerItemLocalId> QOrganizerItemMemoryEngine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItemLocalId> QOrganizerItemMemoryEngine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const
 {
     /* Special case the fast case */
     if (startDate.isNull() && endDate.isNull() && filter.type() == QOrganizerItemFilter::DefaultFilter && sortOrders.count() == 0) {
@@ -386,17 +386,17 @@ QList<QOrganizerItemLocalId> QOrganizerItemMemoryEngine::itemIds(const QDateTime
     }
 }
 
-QList<QDateTime> QOrganizerItemMemoryEngine::generateDateTimes(const QDateTime& initialDateTime, QOrganizerItemRecurrenceRule rrule, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount) const
+QList<QDateTime> QOrganizerItemMemoryEngine::generateDateTimes(const QDateTime& initialDateTime, QOrganizerRecurrenceRule rrule, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount) const
 {
     QList<QDateTime> retn;
 
     if (periodEnd.isValid() || maxCount <= 0)
         maxCount = INT_MAX; // count of returned items is unlimited
-    if (rrule.limitType() == QOrganizerItemRecurrenceRule::CountLimit)
+    if (rrule.limitType() == QOrganizerRecurrenceRule::CountLimit)
         maxCount = qMin(maxCount, rrule.limitCount());
 
     QDateTime realPeriodEnd(periodEnd);
-    if (rrule.limitType() == QOrganizerItemRecurrenceRule::DateLimit
+    if (rrule.limitType() == QOrganizerRecurrenceRule::DateLimit
         && rrule.limitDate() < realPeriodEnd.date()) {
         realPeriodEnd.setDate(rrule.limitDate());
     }
@@ -446,10 +446,10 @@ QList<QDateTime> QOrganizerItemMemoryEngine::generateDateTimes(const QDateTime&
  * Determines if \a rrule is underspecified and if so, fills in missing information based on \a
  * initialDate.
  */
-void QOrganizerItemMemoryEngine::inferMissingCriteria(QOrganizerItemRecurrenceRule* rrule, const QDate& initialDate) const
+void QOrganizerItemMemoryEngine::inferMissingCriteria(QOrganizerRecurrenceRule* rrule, const QDate& initialDate) const
 {
     switch (rrule->frequency()) {
-        case QOrganizerItemRecurrenceRule::Weekly:
+        case QOrganizerRecurrenceRule::Weekly:
             if (rrule->daysOfWeek().isEmpty()) {
                 // derive day of week
                 QSet<Qt::DayOfWeek> days;
@@ -457,7 +457,7 @@ void QOrganizerItemMemoryEngine::inferMissingCriteria(QOrganizerItemRecurrenceRu
                 rrule->setDaysOfWeek(days);
             }
             break;
-        case QOrganizerItemRecurrenceRule::Monthly:
+        case QOrganizerRecurrenceRule::Monthly:
             if (rrule->daysOfWeek().isEmpty() && rrule->daysOfMonth().isEmpty()) {
                 // derive day of month
                 QSet<int> days;
@@ -465,7 +465,7 @@ void QOrganizerItemMemoryEngine::inferMissingCriteria(QOrganizerItemRecurrenceRu
                 rrule->setDaysOfMonth(days);
             }
             break;
-        case QOrganizerItemRecurrenceRule::Yearly:
+        case QOrganizerRecurrenceRule::Yearly:
             if (rrule->monthsOfYear().isEmpty()
                     && rrule->weeksOfYear().isEmpty()
                     && rrule->daysOfYear().isEmpty()
@@ -475,8 +475,8 @@ void QOrganizerItemMemoryEngine::inferMissingCriteria(QOrganizerItemRecurrenceRu
                 QSet<int> daysOfMonth;
                 daysOfMonth << initialDate.day();
                 rrule->setDaysOfMonth(daysOfMonth);
-                QSet<QOrganizerItemRecurrenceRule::Month> months;
-                months << static_cast<QOrganizerItemRecurrenceRule::Month>(initialDate.month());
+                QSet<QOrganizerRecurrenceRule::Month> months;
+                months << static_cast<QOrganizerRecurrenceRule::Month>(initialDate.month());
                 rrule->setMonthsOfYear(months);
             } else if (!rrule->monthsOfYear().isEmpty()
                     && rrule->weeksOfYear().isEmpty()
@@ -497,9 +497,9 @@ void QOrganizerItemMemoryEngine::inferMissingCriteria(QOrganizerItemRecurrenceRu
                 rrule->setDaysOfWeek(days);
             }
             break;
-        case QOrganizerItemRecurrenceRule::Daily:
+        case QOrganizerRecurrenceRule::Daily:
             break;
-        case QOrganizerItemRecurrenceRule::Invalid:
+        case QOrganizerRecurrenceRule::Invalid:
             Q_ASSERT(false);
     }
 }
@@ -512,22 +512,22 @@ void QOrganizerItemMemoryEngine::inferMissingCriteria(QOrganizerItemRecurrenceRu
  * eg. If \a frequency is Monthly and \a interval is 3, then true is returned iff \a date is in the
  * same month as \a initialDate, in a month 3 months ahead, 6 months ahead, etc.
  */
-bool QOrganizerItemMemoryEngine::inMultipleOfInterval(const QDate& date, const QDate& initialDate, QOrganizerItemRecurrenceRule::Frequency frequency, int interval, Qt::DayOfWeek firstDayOfWeek, int maxCount) const
+bool QOrganizerItemMemoryEngine::inMultipleOfInterval(const QDate& date, const QDate& initialDate, QOrganizerRecurrenceRule::Frequency frequency, int interval, Qt::DayOfWeek firstDayOfWeek, int maxCount) const
 {
     switch (frequency) {
-        case QOrganizerItemRecurrenceRule::Yearly: {
+        case QOrganizerRecurrenceRule::Yearly: {
             int yearsDelta = date.year() - initialDate.year();
             if (maxCount && maxCount * interval <= yearsDelta)
                 return false;
             return (yearsDelta % interval == 0);
         }
-        case QOrganizerItemRecurrenceRule::Monthly: {
+        case QOrganizerRecurrenceRule::Monthly: {
             int monthsDelta = date.month() - initialDate.month() + (12 * (date.year() - initialDate.year()));
             if (maxCount && maxCount * interval <= monthsDelta)
                 return false;
             return (monthsDelta % interval == 0);
         }
-        case QOrganizerItemRecurrenceRule::Weekly: {
+        case QOrganizerRecurrenceRule::Weekly: {
             // we need to adjust for the week start specified by the client if the interval is greater than 1
             // ie, every time we hit the day specified, we increment the week count.
             int weekCount = 0;
@@ -542,13 +542,13 @@ bool QOrganizerItemMemoryEngine::inMultipleOfInterval(const QDate& date, const Q
                 return false;
             return (weekCount % interval == 0);
         }
-        case QOrganizerItemRecurrenceRule::Daily: {
+        case QOrganizerRecurrenceRule::Daily: {
             int daysDelta = initialDate.daysTo(date);
             if (maxCount && maxCount * interval <= daysDelta)
                 return false;
             return (daysDelta % interval == 0);
         }
-        case QOrganizerItemRecurrenceRule::Invalid:
+        case QOrganizerRecurrenceRule::Invalid:
             Q_ASSERT(false);
     }
     return true;
@@ -560,22 +560,22 @@ bool QOrganizerItemMemoryEngine::inMultipleOfInterval(const QDate& date, const Q
  * frequency is Weekly, then it returns the first day of \a date's week, considering the week to
  * start on \a firstDayOfWeek
  */
-QDate QOrganizerItemMemoryEngine::firstDateInPeriod(const QDate& date, QOrganizerItemRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const
+QDate QOrganizerItemMemoryEngine::firstDateInPeriod(const QDate& date, QOrganizerRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const
 {
     QDate retn(date);
     switch (frequency) {
-        case QOrganizerItemRecurrenceRule::Yearly:
+        case QOrganizerRecurrenceRule::Yearly:
             retn.setDate(date.year(), 1, 1);
             return retn;
-        case QOrganizerItemRecurrenceRule::Monthly:
+        case QOrganizerRecurrenceRule::Monthly:
             retn.setDate(date.year(), date.month(), 1);
             return retn;
-        case QOrganizerItemRecurrenceRule::Weekly:
+        case QOrganizerRecurrenceRule::Weekly:
             while (retn.dayOfWeek() != firstDayOfWeek) {
                 retn = retn.addDays(-1);
             } 
             return retn;
-        case QOrganizerItemRecurrenceRule::Daily:
+        case QOrganizerRecurrenceRule::Daily:
             return retn;
         default:
             Q_ASSERT(false);
@@ -588,29 +588,29 @@ QDate QOrganizerItemMemoryEngine::firstDateInPeriod(const QDate& date, QOrganize
  * \a frequency.  eg. if \a frequency is Monthly, then this returns the first day of the next month.
  * If \a frequency is Weekly, then it returns the first \a firstDayOfWeek after \a date.
  */
-QDate QOrganizerItemMemoryEngine::firstDateInNextPeriod(const QDate& date, QOrganizerItemRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const
+QDate QOrganizerItemMemoryEngine::firstDateInNextPeriod(const QDate& date, QOrganizerRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const
 {
     QDate retn(date);
     switch (frequency) {
-        case QOrganizerItemRecurrenceRule::Yearly:
+        case QOrganizerRecurrenceRule::Yearly:
             retn.setDate(date.year()+1, 1, 1);
             return retn;
-        case QOrganizerItemRecurrenceRule::Monthly:
+        case QOrganizerRecurrenceRule::Monthly:
             {
             int newMonth = date.month() + 1;
             int newYear = date.year() + (newMonth==13 ? 1 : 0);
             retn.setDate(newYear, newMonth==13 ? 1 : newMonth, 1);
             }
             return retn;
-        case QOrganizerItemRecurrenceRule::Weekly:
+        case QOrganizerRecurrenceRule::Weekly:
             do {
                 retn = retn.addDays(1);
             } while (retn.dayOfWeek() != firstDayOfWeek);
             return retn;
-        case QOrganizerItemRecurrenceRule::Daily:
+        case QOrganizerRecurrenceRule::Daily:
             retn = retn.addDays(1);
             return retn;
-        case QOrganizerItemRecurrenceRule::Invalid:
+        case QOrganizerRecurrenceRule::Invalid:
             Q_ASSERT(false);
     }
     return retn;
@@ -621,7 +621,7 @@ QDate QOrganizerItemMemoryEngine::firstDateInNextPeriod(const QDate& date, QOrga
  * match the \a rrule.  Only daysOfWeek, daysOfMonth, daysOfYear, weeksOfYear and months from the \a
  * rrule are matched.
  */
-QList<QDate> QOrganizerItemMemoryEngine::matchingDates(const QDate& periodStart, const QDate& periodEnd, const QOrganizerItemRecurrenceRule& rrule) const
+QList<QDate> QOrganizerItemMemoryEngine::matchingDates(const QDate& periodStart, const QDate& periodEnd, const QOrganizerRecurrenceRule& rrule) const
 {
     QList<QDate> retn;
 
@@ -629,11 +629,11 @@ QList<QDate> QOrganizerItemMemoryEngine::matchingDates(const QDate& periodStart,
     QSet<int> daysOfMonth = rrule.daysOfMonth();
     QSet<int> daysOfYear = rrule.daysOfYear();
     QSet<int> weeksOfYear = rrule.weeksOfYear();
-    QSet<QOrganizerItemRecurrenceRule::Month> monthsOfYear = rrule.monthsOfYear();
+    QSet<QOrganizerRecurrenceRule::Month> monthsOfYear = rrule.monthsOfYear();
 
     QDate tempDate = periodStart;
     while (tempDate < periodEnd) {
-        if ((monthsOfYear.isEmpty() || monthsOfYear.contains(static_cast<QOrganizerItemRecurrenceRule::Month>(tempDate.month())))
+        if ((monthsOfYear.isEmpty() || monthsOfYear.contains(static_cast<QOrganizerRecurrenceRule::Month>(tempDate.month())))
                 && (weeksOfYear.isEmpty() || weeksOfYear.contains(tempDate.weekNumber()))
                 && (daysOfYear.isEmpty() || daysOfYear.contains(tempDate.dayOfYear()))
                 && (daysOfMonth.isEmpty() || daysOfMonth.contains(tempDate.day()))
@@ -681,7 +681,7 @@ bool QOrganizerItemMemoryEngine::itemHasReccurence(const QOrganizerItem& oi) con
 }
 
 
-QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, bool forExport, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, bool forExport, QOrganizerManager::Error* error) const
 {
     // given the generating item, grab it's QOrganizerItemRecurrence detail (if it exists), and calculate all of the dates within the given period.
     // how would a real backend do this?
@@ -710,7 +710,7 @@ QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItemInstances(const QO
         realPeriodEnd.setTime(realPeriodStart.time());
     }
     if (realPeriodStart > realPeriodEnd) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return QList<QOrganizerItem>();
     }
 
@@ -723,7 +723,7 @@ QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItemInstances(const QO
         parentFilter.setDetailDefinitionName(QOrganizerItemInstanceOrigin::DefinitionName, QOrganizerItemInstanceOrigin::FieldParentLocalId);
         parentFilter.setValue(QVariant::fromValue(generator.localId()));
         foreach(const QOrganizerItem&currException, d->m_organizeritems) {
-            if (QOrganizerItemManagerEngine::testFilter(parentFilter, currException)) {
+            if (QOrganizerManagerEngine::testFilter(parentFilter, currException)) {
                 QDateTime lowerBound;
                 QDateTime upperBound;
                 if (currException.type() == QOrganizerItemType::TypeEventOccurrence) {
@@ -750,10 +750,10 @@ QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItemInstances(const QO
     foreach (const QDate& xdate, recur.exceptionDates()) {
         xdates += xdate;
     }
-    QSet<QOrganizerItemRecurrenceRule> xrules = recur.exceptionRules();
-    foreach (const QOrganizerItemRecurrenceRule& xrule, xrules) {
-        if (xrule.frequency() != QOrganizerItemRecurrenceRule::Invalid
-                && ((xrule.limitType() != QOrganizerItemRecurrenceRule::DateLimit) || (xrule.limitDate() >= realPeriodStart.date()))) {
+    QSet<QOrganizerRecurrenceRule> xrules = recur.exceptionRules();
+    foreach (const QOrganizerRecurrenceRule& xrule, xrules) {
+        if (xrule.frequency() != QOrganizerRecurrenceRule::Invalid
+                && ((xrule.limitType() != QOrganizerRecurrenceRule::DateLimit) || (xrule.limitDate() >= realPeriodStart.date()))) {
             // we cannot skip it, since it applies in the given time period.
             QList<QDateTime> xdatetimes = generateDateTimes(initialDateTime, xrule, realPeriodStart, realPeriodEnd, 50); // max count of 50 is arbitrary...
             foreach (const QDateTime& xdatetime, xdatetimes) {
@@ -767,10 +767,10 @@ QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItemInstances(const QO
     foreach (const QDate& rdate, recur.recurrenceDates()) {
         rdates += QDateTime(rdate, initialDateTime.time());
     }
-    QSet<QOrganizerItemRecurrenceRule> rrules = recur.recurrenceRules();
-    foreach (const QOrganizerItemRecurrenceRule& rrule, rrules) {
-        if (rrule.frequency() != QOrganizerItemRecurrenceRule::Invalid
-                && ((rrule.limitType() != QOrganizerItemRecurrenceRule::DateLimit) || (rrule.limitDate() >= realPeriodStart.date()))) {
+    QSet<QOrganizerRecurrenceRule> rrules = recur.recurrenceRules();
+    foreach (const QOrganizerRecurrenceRule& rrule, rrules) {
+        if (rrule.frequency() != QOrganizerRecurrenceRule::Invalid
+                && ((rrule.limitType() != QOrganizerRecurrenceRule::DateLimit) || (rrule.limitDate() >= realPeriodStart.date()))) {
             // we cannot skip it, since it applies in the given time period.
             rdates += generateDateTimes(initialDateTime, rrule, realPeriodStart, realPeriodEnd, 50); // max count of 50 is arbitrary...
         }
@@ -795,7 +795,7 @@ QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItemInstances(const QO
 }
 
 /*! \reimp */
-QList<QOrganizerItem> QOrganizerItemMemoryEngine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemMemoryEngine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(fetchHint);
     return internalItemInstances(generator, periodStart, periodEnd, maxCount, false, error);
@@ -816,8 +816,8 @@ QOrganizerItem QOrganizerItemMemoryEngine::generateInstance(const QOrganizerItem
     QList<QOrganizerItemDetail> occDets;
     foreach (const QOrganizerItemDetail& det, allDets) {
         if (det.definitionName() != QOrganizerItemRecurrence::DefinitionName
-                && det.definitionName() != QOrganizerEventTimeRange::DefinitionName
-                && det.definitionName() != QOrganizerTodoTimeRange::DefinitionName) {
+                && det.definitionName() != QOrganizerEventTime::DefinitionName
+                && det.definitionName() != QOrganizerTodoTime::DefinitionName) {
             occDets.append(det);
         }
     }
@@ -839,7 +839,7 @@ QOrganizerItem QOrganizerItemMemoryEngine::generateInstance(const QOrganizerItem
 
     // and update the time range in the instance based on the current instance date
     if (generator.type() == QOrganizerItemType::TypeEvent) {
-        QOrganizerEventTimeRange etr = generator.detail<QOrganizerEventTimeRange>();
+        QOrganizerEventTime etr = generator.detail<QOrganizerEventTime>();
         QDateTime temp = etr.startDateTime();
         temp.setDate(rdate.date());
         etr.setStartDateTime(temp);
@@ -851,7 +851,7 @@ QOrganizerItem QOrganizerItemMemoryEngine::generateInstance(const QOrganizerItem
 
     // for todo's?
     if (generator.type() == QOrganizerItemType::TypeTodo) {
-        QOrganizerTodoTimeRange ttr = generator.detail<QOrganizerTodoTimeRange>();
+        QOrganizerTodoTime ttr = generator.detail<QOrganizerTodoTime>();
         QDateTime temp = ttr.dueDateTime();
         temp.setDate(rdate.date());
         ttr.setDueDateTime(temp);
@@ -864,18 +864,18 @@ QOrganizerItem QOrganizerItemMemoryEngine::generateInstance(const QOrganizerItem
     return instanceItem;
 }
 
-QList<QOrganizerItem> QOrganizerItemMemoryEngine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemMemoryEngine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     return internalItems(startDate, endDate, filter, sortOrders, fetchHint, error, false);
 }
 
-QList<QOrganizerItem> QOrganizerItemMemoryEngine::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerItemMemoryEngine::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     return internalItems(startDate, endDate, filter, sortOrders, fetchHint, error, true);
 }
 
 /*! \reimp */
-QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error, bool forExport) const
+QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error, bool forExport) const
 {
     Q_UNUSED(fetchHint); // no optimisations are possible in the memory backend; ignore the fetch hint.
     Q_UNUSED(error);
@@ -887,8 +887,8 @@ QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItems(const QDateTime&
         if (itemHasReccurence(c)) {
             addItemRecurrences(sorted, c, startDate, endDate, filter, sortOrders, forExport);
         } else {
-            if ((isDefFilter || QOrganizerItemManagerEngine::testFilter(filter, c)) && QOrganizerItemManagerEngine::isItemBetweenDates(c, startDate, endDate))
-                QOrganizerItemManagerEngine::addSorted(&sorted,c, sortOrders);
+            if ((isDefFilter || QOrganizerManagerEngine::testFilter(filter, c)) && QOrganizerManagerEngine::isItemBetweenDates(c, startDate, endDate))
+                QOrganizerManagerEngine::addSorted(&sorted,c, sortOrders);
         }
     }
 
@@ -897,30 +897,30 @@ QList<QOrganizerItem> QOrganizerItemMemoryEngine::internalItems(const QDateTime&
 
 void QOrganizerItemMemoryEngine::addItemRecurrences(QList<QOrganizerItem>& sorted, const QOrganizerItem& c, const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, bool forExport) const
 {
-    QOrganizerItemManager::Error error = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error error = QOrganizerManager::NoError;
     QList<QOrganizerItem> recItems = internalItemInstances(c, startDate, endDate, forExport ? 1 : 50, forExport, &error);
 
     if (filter.type() == QOrganizerItemFilter::DefaultFilter) {
         foreach(const QOrganizerItem&oi, recItems) {
-            QOrganizerItemManagerEngine::addSorted(&sorted, forExport ? c : oi, sortOrders);
+            QOrganizerManagerEngine::addSorted(&sorted, forExport ? c : oi, sortOrders);
         }
     } else {
         foreach(const QOrganizerItem&oi, recItems) {
-            if (QOrganizerItemManagerEngine::testFilter(filter, oi))
-                QOrganizerItemManagerEngine::addSorted(&sorted, forExport ? c : oi, sortOrders);
+            if (QOrganizerManagerEngine::testFilter(filter, oi))
+                QOrganizerManagerEngine::addSorted(&sorted, forExport ? c : oi, sortOrders);
         }
     }
 }
 
 /*! Saves the given organizeritem \a theOrganizerItem, storing any error to \a error and
     filling the \a changeSet with ids of changed organizeritems as required */
-bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error)
 {
     QOrganizerCollectionLocalId targetCollectionId = theOrganizerItem->collectionLocalId();
 
     // check that the collection exists (or is null :. default collection):
     if (!targetCollectionId.isNull() && !d->m_organizerCollectionIds.contains(targetCollectionId)) {
-        *error = QOrganizerItemManager::InvalidCollectionError;
+        *error = QOrganizerManager::InvalidCollectionError;
         return false;
     }
 
@@ -936,7 +936,7 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
         QOrganizerItem oldOrganizerItem = d->m_organizeritems.at(index);
 
         if (oldOrganizerItem.type() != theOrganizerItem->type()) {
-            *error = QOrganizerItemManager::AlreadyExistsError;
+            *error = QOrganizerManager::AlreadyExistsError;
             return false;
         }
 
@@ -946,13 +946,13 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
             targetCollectionId = d->m_itemsInCollections.key(theOrganizerItem->localId());
         } else if (!d->m_itemsInCollections.values(targetCollectionId).contains(theOrganizerItem->localId())) {
             // the given collection id was non-null but doesn't already contain this item.  error.
-            *error = QOrganizerItemManager::InvalidCollectionError;
+            *error = QOrganizerManager::InvalidCollectionError;
             return false;
         }
 
         QOrganizerItemTimestamp ts = theOrganizerItem->detail(QOrganizerItemTimestamp::DefinitionName);
         ts.setLastModified(QDateTime::currentDateTime());
-        QOrganizerItemManagerEngine::setDetailAccessConstraints(&ts, QOrganizerItemDetail::ReadOnly | QOrganizerItemDetail::Irremovable);
+        QOrganizerManagerEngine::setDetailAccessConstraints(&ts, QOrganizerItemDetail::ReadOnly | QOrganizerItemDetail::Irremovable);
         theOrganizerItem->saveDetail(&ts);
 
         if (!fixOccurrenceReferences(theOrganizerItem, error)) {
@@ -968,7 +968,7 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
         newId.setManagerUri(managerUri());
         if (!theOrganizerItem->id().isNull()) {
             // the ID is not empty, and it doesn't identify an existing organizer item in our database either.
-            *error = QOrganizerItemManager::DoesNotExistError;
+            *error = QOrganizerManager::DoesNotExistError;
             return false;
         }
 
@@ -990,7 +990,7 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
         quint32 nextOrganizerItemId = d->m_nextOrganizerItemId; // don't increment it until we're successful.
         nextOrganizerItemId += 1;
         QOrganizerItemMemoryEngineLocalId* newMemoryEngineLocalId = new QOrganizerItemMemoryEngineLocalId;
-        newMemoryEngineLocalId->m_localCollectionId = static_cast<QOrganizerCollectionMemoryEngineLocalId*>(QOrganizerItemManagerEngine::engineLocalCollectionId(targetCollectionId))->m_localCollectionId;
+        newMemoryEngineLocalId->m_localCollectionId = static_cast<QOrganizerCollectionMemoryEngineLocalId*>(QOrganizerManagerEngine::engineLocalCollectionId(targetCollectionId))->m_localCollectionId;
         newMemoryEngineLocalId->m_localItemId = nextOrganizerItemId;
         newId.setLocalId(QOrganizerItemLocalId(newMemoryEngineLocalId));
         theOrganizerItem->setId(newId);
@@ -1006,7 +1006,7 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
         // if we're saving an exception occurrence, we need to add it's original date as an exdate to the parent.
         if (theOrganizerItem->type() == QOrganizerItemType::TypeEventOccurrence) {
             // update the event by adding an EX-DATE which corresponds to the original date of the occurrence being saved.
-            QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error tempError = QOrganizerManager::NoError;
             QOrganizerItemInstanceOrigin origin = theOrganizerItem->detail<QOrganizerItemInstanceOrigin>();
             QOrganizerItemLocalId parentId = origin.parentLocalId();
 
@@ -1015,14 +1015,14 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
             if (targetCollectionWasNull) {
                 targetCollectionId = d->m_itemsInCollections.key(parentId);
                 if (targetCollectionId.isNull()) {
-                    *error = QOrganizerItemManager::UnspecifiedError; // this should never occur; parent should _always_ be in a collection.
+                    *error = QOrganizerManager::UnspecifiedError; // this should never occur; parent should _always_ be in a collection.
                     return false;
                 }
-                newId.setLocalId(QOrganizerItemLocalId(QOrganizerItemLocalId(new QOrganizerItemMemoryEngineLocalId(static_cast<QOrganizerCollectionMemoryEngineLocalId*>(QOrganizerItemManagerEngine::engineLocalCollectionId(targetCollectionId))->m_localCollectionId, nextOrganizerItemId))));
+                newId.setLocalId(QOrganizerItemLocalId(QOrganizerItemLocalId(new QOrganizerItemMemoryEngineLocalId(static_cast<QOrganizerCollectionMemoryEngineLocalId*>(QOrganizerManagerEngine::engineLocalCollectionId(targetCollectionId))->m_localCollectionId, nextOrganizerItemId))));
                 theOrganizerItem->setId(newId);
             } else if (!d->m_itemsInCollections.values(targetCollectionId).contains(parentId)) {
                 // nope, the specified collection doesn't contain the parent.  error.
-                *error = QOrganizerItemManager::InvalidCollectionError;
+                *error = QOrganizerManager::InvalidCollectionError;
                 return false;
             }
 
@@ -1038,7 +1038,7 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
             }
         } else if (theOrganizerItem->type() == QOrganizerItemType::TypeTodoOccurrence) {
             // update the todo by adding an EX-DATE which corresponds to the original date of the occurrence being saved.
-            QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error tempError = QOrganizerManager::NoError;
             QOrganizerItemInstanceOrigin origin = theOrganizerItem->detail<QOrganizerItemInstanceOrigin>();
             QOrganizerItemLocalId parentId = origin.parentLocalId();
 
@@ -1047,14 +1047,14 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
             if (targetCollectionWasNull) {
                 targetCollectionId = d->m_itemsInCollections.key(parentId);
                 if (targetCollectionId.isNull()) {
-                    *error = QOrganizerItemManager::UnspecifiedError; // this should never occur; parent should _always_ be in a collection.
+                    *error = QOrganizerManager::UnspecifiedError; // this should never occur; parent should _always_ be in a collection.
                     return false;
                 }
-                newId.setLocalId(QOrganizerItemLocalId(QOrganizerItemLocalId(new QOrganizerItemMemoryEngineLocalId(static_cast<QOrganizerCollectionMemoryEngineLocalId*>(QOrganizerItemManagerEngine::engineLocalCollectionId(targetCollectionId))->m_localCollectionId, nextOrganizerItemId))));
+                newId.setLocalId(QOrganizerItemLocalId(QOrganizerItemLocalId(new QOrganizerItemMemoryEngineLocalId(static_cast<QOrganizerCollectionMemoryEngineLocalId*>(QOrganizerManagerEngine::engineLocalCollectionId(targetCollectionId))->m_localCollectionId, nextOrganizerItemId))));
                 theOrganizerItem->setId(newId);
             } else if (!d->m_itemsInCollections.values(targetCollectionId).contains(parentId)) {
                 // nope, the specified collection doesn't contain the parent.  error.
-                *error = QOrganizerItemManager::InvalidCollectionError;
+                *error = QOrganizerManager::InvalidCollectionError;
                 return false;
             }
 
@@ -1092,7 +1092,7 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
         //      - if not, the current codepath is ok.
     }
 
-    *error = QOrganizerItemManager::NoError;     // successful.
+    *error = QOrganizerManager::NoError;     // successful.
     return true;
 }
 
@@ -1100,26 +1100,26 @@ bool QOrganizerItemMemoryEngine::saveItem(QOrganizerItem* theOrganizerItem, QOrg
  * For Occurrence type items, ensure the ParentLocalId and the Guid are set consistently.  Returns
  * false and sets \a error on error, returns true otherwise.
  */
-bool QOrganizerItemMemoryEngine::fixOccurrenceReferences(QOrganizerItem* theItem, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::fixOccurrenceReferences(QOrganizerItem* theItem, QOrganizerManager::Error* error)
 {
     if (theItem->type() == QOrganizerItemType::TypeEventOccurrence
             || theItem->type() == QOrganizerItemType::TypeTodoOccurrence) {
         const QString guid = theItem->guid();
         QOrganizerItemInstanceOrigin instanceOrigin = theItem->detail<QOrganizerItemInstanceOrigin>();
         if (!instanceOrigin.originalDate().isValid()) {
-            *error = QOrganizerItemManager::InvalidOccurrenceError;
+            *error = QOrganizerManager::InvalidOccurrenceError;
             return false;
         }
         QOrganizerItemLocalId parentId = instanceOrigin.parentLocalId();
         if (!guid.isEmpty()) {
             if (!parentId.isNull()) {
-                QOrganizerItemManager::Error tempError;
+                QOrganizerManager::Error tempError;
                 QOrganizerItem parentItem = item(parentId, QOrganizerItemFetchHint(), &tempError);
                 if (guid != parentItem.guid()
                         || !typesAreRelated(theItem->type(), parentItem.type())) {
                     // parentId and guid are both set and inconsistent, or the parent is the wrong
                     // type
-                    *error = QOrganizerItemManager::InvalidOccurrenceError;
+                    *error = QOrganizerManager::InvalidOccurrenceError;
                     return false;
                 }
             } else {
@@ -1133,14 +1133,14 @@ bool QOrganizerItemMemoryEngine::fixOccurrenceReferences(QOrganizerItem* theItem
                 }
                 if (parentId.isNull()) {
                     // couldn't find an item with the given guid
-                    *error = QOrganizerItemManager::InvalidOccurrenceError;
+                    *error = QOrganizerManager::InvalidOccurrenceError;
                     return false;
                 }
-                QOrganizerItemManager::Error tempError;
+                QOrganizerManager::Error tempError;
                 QOrganizerItem parentItem = item(parentId, QOrganizerItemFetchHint(), &tempError);
                 if (!typesAreRelated(theItem->type(), parentItem.type())) {
                     // the parent is the wrong type
-                    *error = QOrganizerItemManager::InvalidOccurrenceError;
+                    *error = QOrganizerManager::InvalidOccurrenceError;
                     return false;
                 }
                 // found a matching item - set the parentId of the occurrence
@@ -1149,18 +1149,18 @@ bool QOrganizerItemMemoryEngine::fixOccurrenceReferences(QOrganizerItem* theItem
                 theItem->saveDetail(&origin);
             }
         } else if (!parentId.isNull()) {
-            QOrganizerItemManager::Error tempError;
+            QOrganizerManager::Error tempError;
             QOrganizerItem parentItem = item(parentId, QOrganizerItemFetchHint(), &tempError);
             if (parentItem.guid().isEmpty()
                     || !typesAreRelated(theItem->type(), parentItem.type())) {
                 // found the matching item but it has no guid, or it isn't the right type
-                *error = QOrganizerItemManager::InvalidOccurrenceError;
+                *error = QOrganizerManager::InvalidOccurrenceError;
                 return false;
             }
             theItem->setGuid(parentItem.guid());
         } else {
             // neither parentId or guid is supplied
-            *error = QOrganizerItemManager::InvalidOccurrenceError;
+            *error = QOrganizerManager::InvalidOccurrenceError;
             return false;
         }
     }
@@ -1179,20 +1179,20 @@ bool QOrganizerItemMemoryEngine::typesAreRelated(const QString& occurrenceType,
 }
 
 /*! \reimp */
-bool QOrganizerItemMemoryEngine::saveItems(QList<QOrganizerItem>* organizeritems, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::saveItems(QList<QOrganizerItem>* organizeritems, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     if(errorMap) {
         errorMap->clear();
     }
 
     if (!organizeritems) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
     QOrganizerItemChangeSet changeSet;
     QOrganizerItem current;
-    QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error operationError = QOrganizerManager::NoError;
     for (int i = 0; i < organizeritems->count(); i++) {
         current = organizeritems->at(i);
         if (!saveItem(&current, changeSet, error)) {
@@ -1206,17 +1206,17 @@ bool QOrganizerItemMemoryEngine::saveItems(QList<QOrganizerItem>* organizeritems
     *error = operationError;
     d->emitSharedSignals(&changeSet);
     // return false if some error occurred
-    return (*error == QOrganizerItemManager::NoError);
+    return (*error == QOrganizerManager::NoError);
 }
 
 /*! Removes the organizer item identified by the given \a organizeritemId, storing any error to \a error and
     filling the \a changeSet with ids of changed organizer items and relationships as required */
-bool QOrganizerItemMemoryEngine::removeItem(const QOrganizerItemLocalId& organizeritemId, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::removeItem(const QOrganizerItemLocalId& organizeritemId, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error)
 {
     int index = d->m_organizeritemIds.indexOf(organizeritemId);
 
     if (index == -1) {
-        *error = QOrganizerItemManager::DoesNotExistError;
+        *error = QOrganizerManager::DoesNotExistError;
         return false;
     }
 
@@ -1228,23 +1228,23 @@ bool QOrganizerItemMemoryEngine::removeItem(const QOrganizerItemLocalId& organiz
     d->m_organizeritems.removeAt(index);
     d->m_organizeritemIds.removeAt(index);
     d->m_itemsInCollections.remove(d->m_itemsInCollections.key(organizeritemId), organizeritemId);
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
 
     changeSet.insertRemovedItem(organizeritemId);
     return true;
 }
 
 /*! \reimp */
-bool QOrganizerItemMemoryEngine::removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     if (organizeritemIds.count() == 0) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
     
     QOrganizerItemChangeSet changeSet;
     QOrganizerItemLocalId current;
-    QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+    QOrganizerManager::Error operationError = QOrganizerManager::NoError;
     for (int i = 0; i < organizeritemIds.count(); i++) {
         current = organizeritemIds.at(i);
         if (!removeItem(current, changeSet, error)) {
@@ -1257,13 +1257,13 @@ bool QOrganizerItemMemoryEngine::removeItems(const QList<QOrganizerItemLocalId>&
     *error = operationError;
     d->emitSharedSignals(&changeSet);
     // return false if some errors occurred
-    return (*error == QOrganizerItemManager::NoError);
+    return (*error == QOrganizerManager::NoError);
 }
 
-QOrganizerCollection QOrganizerItemMemoryEngine::defaultCollection(QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemMemoryEngine::defaultCollection(QOrganizerManager::Error* error) const
 {
     // default collection has id of 1.
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QOrganizerCollectionLocalId defaultCollectionId = QOrganizerCollectionLocalId(new QOrganizerCollectionMemoryEngineLocalId(1));
     for (int i = 0; i < d->m_organizerCollections.size(); ++i) {
         if (d->m_organizerCollections.at(i).localId() == defaultCollectionId) {
@@ -1271,31 +1271,31 @@ QOrganizerCollection QOrganizerItemMemoryEngine::defaultCollection(QOrganizerIte
         }
     }
 
-    *error = QOrganizerItemManager::UnspecifiedError;
+    *error = QOrganizerManager::UnspecifiedError;
     return QOrganizerCollection();
 }
 
-QOrganizerCollection QOrganizerItemMemoryEngine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemMemoryEngine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     for (int i = 0; i < d->m_organizerCollections.size(); ++i) {
         if (d->m_organizerCollections.at(i).localId() == collectionId) {
             return d->m_organizerCollections.at(i);
         }
     }
 
-    *error = QOrganizerItemManager::DoesNotExistError;
+    *error = QOrganizerManager::DoesNotExistError;
     return QOrganizerCollection();
 }
-QList<QOrganizerCollection> QOrganizerItemMemoryEngine::collections(QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollection> QOrganizerItemMemoryEngine::collections(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return d->m_organizerCollections;
 }
 
-QOrganizerCollection QOrganizerItemMemoryEngine::compatibleCollection(const QOrganizerCollection& original, QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerItemMemoryEngine::compatibleCollection(const QOrganizerCollection& original, QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
 
     // we don't allow people to change the default collection.
     QOrganizerCollectionLocalId defaultCollectionLocalId = QOrganizerCollectionLocalId(new QOrganizerCollectionMemoryEngineLocalId(1));
@@ -1312,15 +1312,15 @@ QOrganizerCollection QOrganizerItemMemoryEngine::compatibleCollection(const QOrg
     return original;
 }
 
-bool QOrganizerItemMemoryEngine::saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error)
 {
     QOrganizerCollectionChangeSet cs; // for signal emission.
 
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     QOrganizerCollectionLocalId colId = collection->localId();
     if (colId == QOrganizerCollectionLocalId(new QOrganizerCollectionMemoryEngineLocalId(1))) {
         // attempting to update the default collection.  this is not allowed in the memory engine.
-        *error = QOrganizerItemManager::PermissionsError;
+        *error = QOrganizerManager::PermissionsError;
         return false;
     }
 
@@ -1338,7 +1338,7 @@ bool QOrganizerItemMemoryEngine::saveCollection(QOrganizerCollection* collection
     // this must be a new collection.  check that the id is null.
     if ((collection->id().managerUri() != managerUri() && !collection->id().managerUri().isEmpty()) || !colId.isNull()) {
         // nope, this collection belongs in another manager, or has been deleted.
-        *error = QOrganizerItemManager::DoesNotExistError;
+        *error = QOrganizerManager::DoesNotExistError;
         return false;
     }
 
@@ -1355,13 +1355,13 @@ bool QOrganizerItemMemoryEngine::saveCollection(QOrganizerCollection* collection
     return true;
 }
 
-bool QOrganizerItemMemoryEngine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error)
 {
     QOrganizerCollectionChangeSet cs; // for signal emission.
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     if (collectionId == QOrganizerCollectionLocalId(new QOrganizerCollectionMemoryEngineLocalId(1))) {
         // attempting to remove the default collection.  this is not allowed in the memory engine.
-        *error = QOrganizerItemManager::PermissionsError;
+        *error = QOrganizerManager::PermissionsError;
         return false;
     }
 
@@ -1388,25 +1388,25 @@ bool QOrganizerItemMemoryEngine::removeCollection(const QOrganizerCollectionLoca
     }
 
     // the collection doesn't exist...
-    *error = QOrganizerItemManager::DoesNotExistError;
+    *error = QOrganizerManager::DoesNotExistError;
     return false;
 }
 
 /*! \reimp */
-QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemMemoryEngine::detailDefinitions(const QString& organizeritemType, QOrganizerItemManager::Error* error) const
+QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemMemoryEngine::detailDefinitions(const QString& organizeritemType, QOrganizerManager::Error* error) const
 {
     // lazy initialisation of schema definitions.
     if (d->m_definitions.isEmpty()) {
-        d->m_definitions = QOrganizerItemManagerEngine::schemaDefinitions();
+        d->m_definitions = QOrganizerManagerEngine::schemaDefinitions();
     }
 
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return d->m_definitions.value(organizeritemType);
 }
 
 /*! Saves the given detail definition \a def, storing any error to \a error and
     filling the \a changeSet with ids of changed organizer items as required */
-bool QOrganizerItemMemoryEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error)
 {
     // we should check for changes to the database in this function, and add ids of changed data to changeSet. // XXX TODO.
     Q_UNUSED(changeSet);
@@ -1420,12 +1420,12 @@ bool QOrganizerItemMemoryEngine::saveDetailDefinition(const QOrganizerItemDetail
     defsForThisType.insert(def.name(), def);
     d->m_definitions.insert(organizeritemType, defsForThisType);
 
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return true;
 }
 
 /*! \reimp */
-bool QOrganizerItemMemoryEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerManager::Error* error)
 {
     QOrganizerItemChangeSet changeSet;
     bool retn = saveDetailDefinition(def, organizeritemType, changeSet, error);
@@ -1435,7 +1435,7 @@ bool QOrganizerItemMemoryEngine::saveDetailDefinition(const QOrganizerItemDetail
 
 /*! Removes the detail definition identified by \a definitionId, storing any error to \a error and
     filling the \a changeSet with ids of changed organizer items as required */
-bool QOrganizerItemMemoryEngine::removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error)
 {
     // we should check for changes to the database in this function, and add ids of changed data to changeSet...
     // we should also check to see if the changes have invalidated any organizer item data, and add the ids of those organizer items
@@ -1443,7 +1443,7 @@ bool QOrganizerItemMemoryEngine::removeDetailDefinition(const QString& definitio
     Q_UNUSED(changeSet);
 
     if (definitionId.isEmpty()) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
@@ -1452,14 +1452,14 @@ bool QOrganizerItemMemoryEngine::removeDetailDefinition(const QString& definitio
     bool success = defsForThisType.remove(definitionId);
     d->m_definitions.insert(organizeritemType, defsForThisType);
     if (success)
-        *error = QOrganizerItemManager::NoError;
+        *error = QOrganizerManager::NoError;
     else
-        *error = QOrganizerItemManager::DoesNotExistError;
+        *error = QOrganizerManager::DoesNotExistError;
     return success;
 }
 
 /*! \reimp */
-bool QOrganizerItemMemoryEngine::removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerItemManager::Error* error)
+bool QOrganizerItemMemoryEngine::removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerManager::Error* error)
 {
     QOrganizerItemChangeSet changeSet;
     bool retn = removeDetailDefinition(definitionId, organizeritemType, changeSet, error);
@@ -1468,19 +1468,19 @@ bool QOrganizerItemMemoryEngine::removeDetailDefinition(const QString& definitio
 }
 
 /*! \reimp */
-void QOrganizerItemMemoryEngine::requestDestroyed(QOrganizerItemAbstractRequest* req)
+void QOrganizerItemMemoryEngine::requestDestroyed(QOrganizerAbstractRequest* req)
 {
     Q_UNUSED(req);
 }
 
 /*! \reimp */
-bool QOrganizerItemMemoryEngine::startRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemMemoryEngine::startRequest(QOrganizerAbstractRequest* req)
 {
     if (!req)
         return false;
 
-    QWeakPointer<QOrganizerItemAbstractRequest> checkDeletion(req);
-    updateRequestState(req, QOrganizerItemAbstractRequest::ActiveState);
+    QWeakPointer<QOrganizerAbstractRequest> checkDeletion(req);
+    updateRequestState(req, QOrganizerAbstractRequest::ActiveState);
     if (!checkDeletion.isNull())
         performAsynchronousOperation(req);
 
@@ -1488,14 +1488,14 @@ bool QOrganizerItemMemoryEngine::startRequest(QOrganizerItemAbstractRequest* req
 }
 
 /*! \reimp */
-bool QOrganizerItemMemoryEngine::cancelRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerItemMemoryEngine::cancelRequest(QOrganizerAbstractRequest* req)
 {
     Q_UNUSED(req); // we can't cancel since we complete immediately
     return false;
 }
 
 /*! \reimp */
-bool QOrganizerItemMemoryEngine::waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs)
+bool QOrganizerItemMemoryEngine::waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs)
 {
     // in our implementation, we always complete any operation we start.
     Q_UNUSED(msecs);
@@ -1508,15 +1508,15 @@ bool QOrganizerItemMemoryEngine::waitForRequestFinished(QOrganizerItemAbstractRe
  * This slot is called some time after an asynchronous request is started.
  * It performs the required operation, sets the result and returns.
  */
-void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerItemAbstractRequest *currentRequest)
+void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerAbstractRequest *currentRequest)
 {
     // store up changes, and emit signals once at the end of the (possibly batch) operation.
     QOrganizerItemChangeSet changeSet;
 
     // Now perform the active request and emit required signals.
-    Q_ASSERT(currentRequest->state() == QOrganizerItemAbstractRequest::ActiveState);
+    Q_ASSERT(currentRequest->state() == QOrganizerAbstractRequest::ActiveState);
     switch (currentRequest->type()) {
-        case QOrganizerItemAbstractRequest::ItemFetchRequest:
+        case QOrganizerAbstractRequest::ItemFetchRequest:
         {
             QOrganizerItemFetchRequest* r = static_cast<QOrganizerItemFetchRequest*>(currentRequest);
             QOrganizerItemFilter filter = r->filter();
@@ -1525,18 +1525,18 @@ void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerItemAbst
             QDateTime startDate = r->startDate();
             QDateTime endDate = r->endDate();
 
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
             QList<QOrganizerItem> requestedOrganizerItems = items(startDate, endDate, filter, sorting, fetchHint, &operationError);
 
             // update the request with the results.
-            if (!requestedOrganizerItems.isEmpty() || operationError != QOrganizerItemManager::NoError)
-                updateItemFetchRequest(r, requestedOrganizerItems, operationError, QOrganizerItemAbstractRequest::FinishedState);
+            if (!requestedOrganizerItems.isEmpty() || operationError != QOrganizerManager::NoError)
+                updateItemFetchRequest(r, requestedOrganizerItems, operationError, QOrganizerAbstractRequest::FinishedState);
             else
-                updateRequestState(currentRequest, QOrganizerItemAbstractRequest::FinishedState);
+                updateRequestState(currentRequest, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::ItemFetchForExportRequest:
+        case QOrganizerAbstractRequest::ItemFetchForExportRequest:
         {
             QOrganizerItemFetchForExportRequest* r = static_cast<QOrganizerItemFetchForExportRequest*>(currentRequest);
             QOrganizerItemFilter filter = r->filter();
@@ -1545,18 +1545,18 @@ void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerItemAbst
             QDateTime startDate = r->startDate();
             QDateTime endDate = r->endDate();
 
-            QOrganizerItemManager::Error operationError;
+            QOrganizerManager::Error operationError;
             QList<QOrganizerItem> requestedOrganizerItems = itemsForExport(startDate, endDate, filter, sorting, fetchHint, &operationError);
 
             // update the request with the results.
-            if (!requestedOrganizerItems.isEmpty() || operationError != QOrganizerItemManager::NoError)
-                updateItemFetchForExportRequest(r, requestedOrganizerItems, operationError, QOrganizerItemAbstractRequest::FinishedState);
+            if (!requestedOrganizerItems.isEmpty() || operationError != QOrganizerManager::NoError)
+                updateItemFetchForExportRequest(r, requestedOrganizerItems, operationError, QOrganizerAbstractRequest::FinishedState);
             else
-                updateRequestState(currentRequest, QOrganizerItemAbstractRequest::FinishedState);
+                updateRequestState(currentRequest, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::ItemInstanceFetchRequest:
+        case QOrganizerAbstractRequest::ItemInstanceFetchRequest:
         {
             QOrganizerItemInstanceFetchRequest* r = static_cast<QOrganizerItemInstanceFetchRequest*>(currentRequest);
             QOrganizerItem generator(r->generator());
@@ -1565,19 +1565,19 @@ void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerItemAbst
             int countLimit = r->maxOccurrences();
             QOrganizerItemFetchHint fetchHint = r->fetchHint();
 
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
             QList<QOrganizerItem> requestedOrganizerItems = itemInstances(generator, startDate, endDate, countLimit, fetchHint, &operationError);
 
             // update the request with the results.
-            if (!requestedOrganizerItems.isEmpty() || operationError != QOrganizerItemManager::NoError)
-                updateItemInstanceFetchRequest(r, requestedOrganizerItems, operationError, QOrganizerItemAbstractRequest::FinishedState);
+            if (!requestedOrganizerItems.isEmpty() || operationError != QOrganizerManager::NoError)
+                updateItemInstanceFetchRequest(r, requestedOrganizerItems, operationError, QOrganizerAbstractRequest::FinishedState);
             else
-                updateRequestState(currentRequest, QOrganizerItemAbstractRequest::FinishedState);
+                updateRequestState(currentRequest, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
 
-        case QOrganizerItemAbstractRequest::ItemLocalIdFetchRequest:
+        case QOrganizerAbstractRequest::ItemLocalIdFetchRequest:
         {
             QOrganizerItemLocalIdFetchRequest* r = static_cast<QOrganizerItemLocalIdFetchRequest*>(currentRequest);
             QOrganizerItemFilter filter = r->filter();
@@ -1585,74 +1585,74 @@ void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerItemAbst
             QDateTime startDate = r->startDate();
             QDateTime endDate = r->endDate();
 
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
             QList<QOrganizerItemLocalId> requestedOrganizerItemIds = itemIds(startDate, endDate, filter, sorting, &operationError);
 
-            if (!requestedOrganizerItemIds.isEmpty() || operationError != QOrganizerItemManager::NoError)
-                updateItemLocalIdFetchRequest(r, requestedOrganizerItemIds, operationError, QOrganizerItemAbstractRequest::FinishedState);
+            if (!requestedOrganizerItemIds.isEmpty() || operationError != QOrganizerManager::NoError)
+                updateItemLocalIdFetchRequest(r, requestedOrganizerItemIds, operationError, QOrganizerAbstractRequest::FinishedState);
             else
-                updateRequestState(currentRequest, QOrganizerItemAbstractRequest::FinishedState);
+                updateRequestState(currentRequest, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::ItemSaveRequest:
+        case QOrganizerAbstractRequest::ItemSaveRequest:
         {
             QOrganizerItemSaveRequest* r = static_cast<QOrganizerItemSaveRequest*>(currentRequest);
             QList<QOrganizerItem> organizeritems = r->items();
 
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
-            QMap<int, QOrganizerItemManager::Error> errorMap;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
+            QMap<int, QOrganizerManager::Error> errorMap;
             saveItems(&organizeritems, &errorMap, &operationError);
 
-            updateItemSaveRequest(r, organizeritems, operationError, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+            updateItemSaveRequest(r, organizeritems, operationError, errorMap, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::ItemRemoveRequest:
+        case QOrganizerAbstractRequest::ItemRemoveRequest:
         {
             QOrganizerItemRemoveRequest* r = static_cast<QOrganizerItemRemoveRequest*>(currentRequest);
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
             QList<QOrganizerItemLocalId> organizeritemsToRemove = r->itemIds();
-            QMap<int, QOrganizerItemManager::Error> errorMap;
+            QMap<int, QOrganizerManager::Error> errorMap;
 
             for (int i = 0; i < organizeritemsToRemove.size(); i++) {
-                QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+                QOrganizerManager::Error tempError = QOrganizerManager::NoError;
                 removeItem(organizeritemsToRemove.at(i), changeSet, &tempError);
 
-                if (tempError != QOrganizerItemManager::NoError) {
+                if (tempError != QOrganizerManager::NoError) {
                     errorMap.insert(i, tempError);
                     operationError = tempError;
                 }
             }
 
-            if (!errorMap.isEmpty() || operationError != QOrganizerItemManager::NoError)
-                updateItemRemoveRequest(r, operationError, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+            if (!errorMap.isEmpty() || operationError != QOrganizerManager::NoError)
+                updateItemRemoveRequest(r, operationError, errorMap, QOrganizerAbstractRequest::FinishedState);
             else
-                updateRequestState(currentRequest, QOrganizerItemAbstractRequest::FinishedState);
+                updateRequestState(currentRequest, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::CollectionFetchRequest:
+        case QOrganizerAbstractRequest::CollectionFetchRequest:
         {
             QOrganizerCollectionFetchRequest* r = static_cast<QOrganizerCollectionFetchRequest*>(currentRequest);
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
             QList<QOrganizerCollection> requestedOrganizerCollections = collections(&operationError);
 
             // update the request with the results.
-            updateCollectionFetchRequest(r, requestedOrganizerCollections, operationError, QOrganizerItemAbstractRequest::FinishedState);
+            updateCollectionFetchRequest(r, requestedOrganizerCollections, operationError, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::CollectionSaveRequest:
+        case QOrganizerAbstractRequest::CollectionSaveRequest:
         {
             QOrganizerCollectionSaveRequest* r = static_cast<QOrganizerCollectionSaveRequest*>(currentRequest);
             QList<QOrganizerCollection> collections = r->collections();
             QList<QOrganizerCollection> retn;
 
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
-            QMap<int, QOrganizerItemManager::Error> errorMap;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
+            QMap<int, QOrganizerManager::Error> errorMap;
             for (int i = 0; i < collections.size(); ++i) {
-                QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+                QOrganizerManager::Error tempError = QOrganizerManager::NoError;
                 QOrganizerCollection curr = collections.at(i);
                 if (!saveCollection(&curr, &tempError)) {
                     errorMap.insert(i, tempError);
@@ -1661,108 +1661,108 @@ void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerItemAbst
                 retn.append(curr);
             }
 
-            updateCollectionSaveRequest(r, retn, operationError, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+            updateCollectionSaveRequest(r, retn, operationError, errorMap, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::CollectionRemoveRequest:
+        case QOrganizerAbstractRequest::CollectionRemoveRequest:
         {
             // removes the collections identified in the list of ids.
             QOrganizerCollectionRemoveRequest* r = static_cast<QOrganizerCollectionRemoveRequest*>(currentRequest);
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
             QList<QOrganizerCollectionLocalId> collectionsToRemove = r->collectionIds();
-            QMap<int, QOrganizerItemManager::Error> errorMap;
+            QMap<int, QOrganizerManager::Error> errorMap;
 
             for (int i = 0; i < collectionsToRemove.size(); i++) {
-                QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+                QOrganizerManager::Error tempError = QOrganizerManager::NoError;
                 removeCollection(collectionsToRemove.at(i), &tempError);
 
-                if (tempError != QOrganizerItemManager::NoError) {
+                if (tempError != QOrganizerManager::NoError) {
                     errorMap.insert(i, tempError);
                     operationError = tempError;
                 }
             }
 
-            if (!errorMap.isEmpty() || operationError != QOrganizerItemManager::NoError)
-                updateCollectionRemoveRequest(r, operationError, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+            if (!errorMap.isEmpty() || operationError != QOrganizerManager::NoError)
+                updateCollectionRemoveRequest(r, operationError, errorMap, QOrganizerAbstractRequest::FinishedState);
             else
-                updateRequestState(currentRequest, QOrganizerItemAbstractRequest::FinishedState);
+                updateRequestState(currentRequest, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest:
+        case QOrganizerAbstractRequest::DetailDefinitionFetchRequest:
         {
             QOrganizerItemDetailDefinitionFetchRequest* r = static_cast<QOrganizerItemDetailDefinitionFetchRequest*>(currentRequest);
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
-            QMap<int, QOrganizerItemManager::Error> errorMap;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
+            QMap<int, QOrganizerManager::Error> errorMap;
             QMap<QString, QOrganizerItemDetailDefinition> requestedDefinitions;
             QStringList names = r->definitionNames();
             if (names.isEmpty())
                 names = detailDefinitions(r->itemType(), &operationError).keys(); // all definitions.
 
-            QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error tempError = QOrganizerManager::NoError;
             for (int i = 0; i < names.size(); i++) {
                 QOrganizerItemDetailDefinition current = detailDefinition(names.at(i), r->itemType(), &tempError);
                 requestedDefinitions.insert(names.at(i), current);
 
-                if (tempError != QOrganizerItemManager::NoError) {
+                if (tempError != QOrganizerManager::NoError) {
                     errorMap.insert(i, tempError);
                     operationError = tempError;
                 }
             }
 
-            if (!errorMap.isEmpty() || !requestedDefinitions.isEmpty() || operationError != QOrganizerItemManager::NoError)
-                updateDefinitionFetchRequest(r, requestedDefinitions, operationError, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+            if (!errorMap.isEmpty() || !requestedDefinitions.isEmpty() || operationError != QOrganizerManager::NoError)
+                updateDefinitionFetchRequest(r, requestedDefinitions, operationError, errorMap, QOrganizerAbstractRequest::FinishedState);
             else
-                updateRequestState(currentRequest, QOrganizerItemAbstractRequest::FinishedState);
+                updateRequestState(currentRequest, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest:
+        case QOrganizerAbstractRequest::DetailDefinitionSaveRequest:
         {
             QOrganizerItemDetailDefinitionSaveRequest* r = static_cast<QOrganizerItemDetailDefinitionSaveRequest*>(currentRequest);
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
-            QMap<int, QOrganizerItemManager::Error> errorMap;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
+            QMap<int, QOrganizerManager::Error> errorMap;
             QList<QOrganizerItemDetailDefinition> definitions = r->definitions();
             QList<QOrganizerItemDetailDefinition> savedDefinitions;
 
-            QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+            QOrganizerManager::Error tempError = QOrganizerManager::NoError;
             for (int i = 0; i < definitions.size(); i++) {
                 QOrganizerItemDetailDefinition current = definitions.at(i);
                 saveDetailDefinition(current, r->itemType(), changeSet, &tempError);
                 savedDefinitions.append(current);
 
-                if (tempError != QOrganizerItemManager::NoError) {
+                if (tempError != QOrganizerManager::NoError) {
                     errorMap.insert(i, tempError);
                     operationError = tempError;
                 }
             }
 
             // update the request with the results.
-            updateDefinitionSaveRequest(r, savedDefinitions, operationError, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+            updateDefinitionSaveRequest(r, savedDefinitions, operationError, errorMap, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
-        case QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest:
+        case QOrganizerAbstractRequest::DetailDefinitionRemoveRequest:
         {
             QOrganizerItemDetailDefinitionRemoveRequest* r = static_cast<QOrganizerItemDetailDefinitionRemoveRequest*>(currentRequest);
             QStringList names = r->definitionNames();
 
-            QOrganizerItemManager::Error operationError = QOrganizerItemManager::NoError;
-            QMap<int, QOrganizerItemManager::Error> errorMap;
+            QOrganizerManager::Error operationError = QOrganizerManager::NoError;
+            QMap<int, QOrganizerManager::Error> errorMap;
 
             for (int i = 0; i < names.size(); i++) {
-                QOrganizerItemManager::Error tempError = QOrganizerItemManager::NoError;
+                QOrganizerManager::Error tempError = QOrganizerManager::NoError;
                 removeDetailDefinition(names.at(i), r->itemType(), changeSet, &tempError);
 
-                if (tempError != QOrganizerItemManager::NoError) {
+                if (tempError != QOrganizerManager::NoError) {
                     errorMap.insert(i, tempError);
                     operationError = tempError;
                 }
             }
 
             // there are no results, so just update the status with the error.
-            updateDefinitionRemoveRequest(r, operationError, errorMap, QOrganizerItemAbstractRequest::FinishedState);
+            updateDefinitionRemoveRequest(r, operationError, errorMap, QOrganizerAbstractRequest::FinishedState);
         }
         break;
 
@@ -1777,15 +1777,15 @@ void QOrganizerItemMemoryEngine::performAsynchronousOperation(QOrganizerItemAbst
 /*!
  * \reimp
  */
-bool QOrganizerItemMemoryEngine::hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& organizeritemType) const
+bool QOrganizerItemMemoryEngine::hasFeature(QOrganizerManager::ManagerFeature feature, const QString& organizeritemType) const
 {
     if (!supportedItemTypes().contains(organizeritemType))
         return false;
 
     switch (feature) {
-        case QOrganizerItemManager::MutableDefinitions:
+        case QOrganizerManager::MutableDefinitions:
             return true;
-        case QOrganizerItemManager::Anonymous:
+        case QOrganizerManager::Anonymous:
             return d->m_anonymous;
 
         default:
diff --git a/src/organizer/engines/qorganizeritemmemorybackend_p.h b/src/organizer/engines/qorganizeritemmemorybackend_p.h
index 418c3b86fe..565e4b5475 100644
--- a/src/organizer/engines/qorganizeritemmemorybackend_p.h
+++ b/src/organizer/engines/qorganizeritemmemorybackend_p.h
@@ -66,12 +66,12 @@
 #include <QObject>
 
 #include "qorganizeritem.h"
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanagerengine.h"
+#include "qorganizermanager.h"
+#include "qorganizermanagerengine.h"
 #include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemchangeset.h"
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule.h"
 #include "qorganizeritemenginelocalid.h"
 #include "qorganizercollectionenginelocalid.h"
 
@@ -134,8 +134,8 @@ private:
     friend class QOrganizerItemMemoryEngine;
 };
 
-class QOrganizerItemAbstractRequest;
-class QOrganizerItemManagerEngine;
+class QOrganizerAbstractRequest;
+class QOrganizerManagerEngine;
 class QOrganizerItemMemoryEngineData : public QSharedData
 {
 public:
@@ -160,14 +160,14 @@ public:
 
     void emitSharedSignals(QOrganizerItemChangeSet* cs)
     {
-        foreach(QOrganizerItemManagerEngine* engine, m_sharedEngines)
+        foreach(QOrganizerManagerEngine* engine, m_sharedEngines)
             cs->emitSignals(engine);
     }
 
-    QList<QOrganizerItemManagerEngine*> m_sharedEngines;   // The list of engines that share this data
+    QList<QOrganizerManagerEngine*> m_sharedEngines;   // The list of engines that share this data
 };
 
-class QOrganizerItemMemoryEngine : public QOrganizerItemManagerEngine
+class QOrganizerItemMemoryEngine : public QOrganizerManagerEngine
 {
     Q_OBJECT
 
@@ -182,99 +182,99 @@ public:
     /*! \reimp */
     int managerVersion() const {return 1;}
 
-    virtual QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
+    virtual QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
 
-    virtual QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const;
-    virtual QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    virtual QList<QOrganizerItem> itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    virtual QOrganizerItem item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
+    virtual QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const;
+    virtual QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    virtual QList<QOrganizerItem> itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    virtual QOrganizerItem item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
 
-    virtual bool saveItems(QList<QOrganizerItem>* organizeritems, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
-    virtual bool removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
+    virtual bool saveItems(QList<QOrganizerItem>* organizeritems, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
+    virtual bool removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
 
-    virtual QOrganizerCollection defaultCollection(QOrganizerItemManager::Error* error) const;
-    virtual QOrganizerCollection collection(const QOrganizerCollectionLocalId &collectionId, QOrganizerItemManager::Error *error) const;
-    virtual QList<QOrganizerCollection> collections(QOrganizerItemManager::Error* error) const;
-    virtual bool saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error);
-    virtual bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error);
+    virtual QOrganizerCollection defaultCollection(QOrganizerManager::Error* error) const;
+    virtual QOrganizerCollection collection(const QOrganizerCollectionLocalId &collectionId, QOrganizerManager::Error *error) const;
+    virtual QList<QOrganizerCollection> collections(QOrganizerManager::Error* error) const;
+    virtual bool saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error);
+    virtual bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error);
 
     /*! \reimp */
-    virtual QOrganizerItem compatibleItem(const QOrganizerItem& original, QOrganizerItemManager::Error* error) const
+    virtual QOrganizerItem compatibleItem(const QOrganizerItem& original, QOrganizerManager::Error* error) const
     {
-        return QOrganizerItemManagerEngine::compatibleItem(original, error);
+        return QOrganizerManagerEngine::compatibleItem(original, error);
     }
     /*! \reimp */
-    virtual QOrganizerCollection compatibleCollection(const QOrganizerCollection& original, QOrganizerItemManager::Error* error) const;
+    virtual QOrganizerCollection compatibleCollection(const QOrganizerCollection& original, QOrganizerManager::Error* error) const;
 
     /*! \reimp */
-    virtual bool validateItem(const QOrganizerItem& organizeritem, QOrganizerItemManager::Error* error) const
+    virtual bool validateItem(const QOrganizerItem& organizeritem, QOrganizerManager::Error* error) const
     {
-        return QOrganizerItemManagerEngine::validateItem(organizeritem, error);
+        return QOrganizerManagerEngine::validateItem(organizeritem, error);
     }
     /*! \reimp */
-    virtual bool validateCollection(const QOrganizerCollection& collection, QOrganizerItemManager::Error* error) const
+    virtual bool validateCollection(const QOrganizerCollection& collection, QOrganizerManager::Error* error) const
     {
         Q_UNUSED(collection)
-        *error = QOrganizerItemManager::NoError;
+        *error = QOrganizerManager::NoError;
         return true; // all collections are valid in the memory engine.
     }
     /*! \reimp */
-    virtual bool validateDefinition(const QOrganizerItemDetailDefinition& def, QOrganizerItemManager::Error* error) const
+    virtual bool validateDefinition(const QOrganizerItemDetailDefinition& def, QOrganizerManager::Error* error) const
     {
-        return QOrganizerItemManagerEngine::validateDefinition(def, error);
+        return QOrganizerManagerEngine::validateDefinition(def, error);
     }
 
     /* Definitions - Accessors and Mutators */
-    virtual QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& organizeritemType, QOrganizerItemManager::Error* error) const;
+    virtual QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& organizeritemType, QOrganizerManager::Error* error) const;
     /*! \reimp */
-    virtual QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerItemManager::Error* error) const
+    virtual QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerManager::Error* error) const
     {
-        return QOrganizerItemManagerEngine::detailDefinition(definitionId, organizeritemType, error);
+        return QOrganizerManagerEngine::detailDefinition(definitionId, organizeritemType, error);
     }
-    virtual bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerItemManager::Error* error);
-    virtual bool removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerItemManager::Error* error);
+    virtual bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerManager::Error* error);
+    virtual bool removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerManager::Error* error);
 
     /* Asynchronous Request Support */
-    virtual void requestDestroyed(QOrganizerItemAbstractRequest* req);
-    virtual bool startRequest(QOrganizerItemAbstractRequest* req);
-    virtual bool cancelRequest(QOrganizerItemAbstractRequest* req);
-    virtual bool waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs);
+    virtual void requestDestroyed(QOrganizerAbstractRequest* req);
+    virtual bool startRequest(QOrganizerAbstractRequest* req);
+    virtual bool cancelRequest(QOrganizerAbstractRequest* req);
+    virtual bool waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs);
 
     /* Capabilities reporting */
-    virtual bool hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& organizeritemType) const;
+    virtual bool hasFeature(QOrganizerManager::ManagerFeature feature, const QString& organizeritemType) const;
     virtual bool isFilterSupported(const QOrganizerItemFilter& filter) const;
     /*! \reimp */
     virtual QStringList supportedItemTypes() const
     {
-        return QOrganizerItemManagerEngine::supportedItemTypes();
+        return QOrganizerManagerEngine::supportedItemTypes();
     }
 
 protected:
     QOrganizerItemMemoryEngine(QOrganizerItemMemoryEngineData* data);
 
 private:
-    QList<QOrganizerItem> internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error, bool forExport) const;
-    QList<QOrganizerItem> internalItemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, bool forExport, QOrganizerItemManager::Error* error) const;
+    QList<QOrganizerItem> internalItems(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error, bool forExport) const;
+    QList<QOrganizerItem> internalItemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, bool forExport, QOrganizerManager::Error* error) const;
     void addItemRecurrences(QList<QOrganizerItem>& sorted, const QOrganizerItem& c, const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, bool forExport) const;
 
     /* Implement "signal coalescing" for batch functions via change set */
-    bool saveItem(QOrganizerItem* theOrganizerItem, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error);
-    bool fixOccurrenceReferences(QOrganizerItem* item, QOrganizerItemManager::Error* error);
+    bool saveItem(QOrganizerItem* theOrganizerItem, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error);
+    bool fixOccurrenceReferences(QOrganizerItem* item, QOrganizerManager::Error* error);
     bool typesAreRelated(const QString& occurrenceType, const QString& parentType);
-    bool removeItem(const QOrganizerItemLocalId& organizeritemId, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error);
-    bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error);
-    bool removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerItemManager::Error* error);
+    bool removeItem(const QOrganizerItemLocalId& organizeritemId, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error);
+    bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error);
+    bool removeDetailDefinition(const QString& definitionId, const QString& organizeritemType, QOrganizerItemChangeSet& changeSet, QOrganizerManager::Error* error);
 
-    void performAsynchronousOperation(QOrganizerItemAbstractRequest* request);
+    void performAsynchronousOperation(QOrganizerAbstractRequest* request);
 
     static QOrganizerItem generateInstance(const QOrganizerItem& generator, const QDateTime& rdate);
 
-    QList<QDateTime> generateDateTimes(const QDateTime& initialDateTime, QOrganizerItemRecurrenceRule rrule, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount) const;
-    void inferMissingCriteria(QOrganizerItemRecurrenceRule* rrule, const QDate& initialDate) const;
-    bool inMultipleOfInterval(const QDate& date, const QDate& initialDate, QOrganizerItemRecurrenceRule::Frequency frequency, int interval, Qt::DayOfWeek firstDayOfWeek, int maxCount) const;
-    QDate firstDateInPeriod(const QDate& date, QOrganizerItemRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const;
-    QDate firstDateInNextPeriod(const QDate& date, QOrganizerItemRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const;
-    QList<QDate> matchingDates(const QDate& periodStart, const QDate& periodEnd, const QOrganizerItemRecurrenceRule& rrule) const;
+    QList<QDateTime> generateDateTimes(const QDateTime& initialDateTime, QOrganizerRecurrenceRule rrule, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount) const;
+    void inferMissingCriteria(QOrganizerRecurrenceRule* rrule, const QDate& initialDate) const;
+    bool inMultipleOfInterval(const QDate& date, const QDate& initialDate, QOrganizerRecurrenceRule::Frequency frequency, int interval, Qt::DayOfWeek firstDayOfWeek, int maxCount) const;
+    QDate firstDateInPeriod(const QDate& date, QOrganizerRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const;
+    QDate firstDateInNextPeriod(const QDate& date, QOrganizerRecurrenceRule::Frequency frequency, Qt::DayOfWeek firstDayOfWeek) const;
+    QList<QDate> matchingDates(const QDate& periodStart, const QDate& periodEnd, const QOrganizerRecurrenceRule& rrule) const;
     QList<QDate> filterByPosition(const QList<QDate>& dates, const QSet<int> positions) const;
     bool itemHasReccurence(const QOrganizerItem& oi) const;
 
diff --git a/src/organizer/filters/qorganizeritemchangelogfilter.cpp b/src/organizer/filters/qorganizeritemchangelogfilter.cpp
index 57a097cd29..84579c2f0d 100644
--- a/src/organizer/filters/qorganizeritemchangelogfilter.cpp
+++ b/src/organizer/filters/qorganizeritemchangelogfilter.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemchangelogfilter.h"
 #include "qorganizeritemchangelogfilter_p.h"
 #include "qorganizeritemfilter_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/organizer/filters/qorganizeritemcollectionfilter.cpp b/src/organizer/filters/qorganizeritemcollectionfilter.cpp
index 983fd5ca78..0712631f59 100644
--- a/src/organizer/filters/qorganizeritemcollectionfilter.cpp
+++ b/src/organizer/filters/qorganizeritemcollectionfilter.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemcollectionfilter.h"
 #include "qorganizeritemcollectionfilter_p.h"
 #include "qorganizeritemfilter_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/organizer/filters/qorganizeritemdetailfilter.cpp b/src/organizer/filters/qorganizeritemdetailfilter.cpp
index 370b175786..abfc71ec30 100644
--- a/src/organizer/filters/qorganizeritemdetailfilter.cpp
+++ b/src/organizer/filters/qorganizeritemdetailfilter.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemdetailfilter.h"
 #include "qorganizeritemdetailfilter_p.h"
 #include "qorganizeritemfilter_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/organizer/filters/qorganizeritemdetailrangefilter.cpp b/src/organizer/filters/qorganizeritemdetailrangefilter.cpp
index 2472839cab..6d27697d4c 100644
--- a/src/organizer/filters/qorganizeritemdetailrangefilter.cpp
+++ b/src/organizer/filters/qorganizeritemdetailrangefilter.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemdetailrangefilter.h"
 #include "qorganizeritemdetailrangefilter_p.h"
 #include "qorganizeritemfilter_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/organizer/filters/qorganizeritemintersectionfilter.cpp b/src/organizer/filters/qorganizeritemintersectionfilter.cpp
index ea9d50a395..21def52ce1 100644
--- a/src/organizer/filters/qorganizeritemintersectionfilter.cpp
+++ b/src/organizer/filters/qorganizeritemintersectionfilter.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemintersectionfilter.h"
 #include "qorganizeritemintersectionfilter_p.h"
 #include "qorganizeritemfilter_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/organizer/filters/qorganizeritemlocalidfilter.cpp b/src/organizer/filters/qorganizeritemlocalidfilter.cpp
index d9b5beb812..e156922023 100644
--- a/src/organizer/filters/qorganizeritemlocalidfilter.cpp
+++ b/src/organizer/filters/qorganizeritemlocalidfilter.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemlocalidfilter.h"
 #include "qorganizeritemlocalidfilter_p.h"
 #include "qorganizeritemfilter_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/organizer/filters/qorganizeritemunionfilter.cpp b/src/organizer/filters/qorganizeritemunionfilter.cpp
index 2aea1b32c9..dffde414cb 100644
--- a/src/organizer/filters/qorganizeritemunionfilter.cpp
+++ b/src/organizer/filters/qorganizeritemunionfilter.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemunionfilter.h"
 #include "qorganizeritemunionfilter_p.h"
 #include "qorganizeritemfilter_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 
diff --git a/src/organizer/items/qorganizerevent.cpp b/src/organizer/items/qorganizerevent.cpp
index 5f5509e2e2..55858746f8 100644
--- a/src/organizer/items/qorganizerevent.cpp
+++ b/src/organizer/items/qorganizerevent.cpp
@@ -59,7 +59,7 @@ QTM_USE_NAMESPACE
 /*! Sets the start date time of the event to \a startDateTime */
 void QOrganizerEvent::setStartDateTime(const QDateTime& startDateTime)
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     etr.setStartDateTime(startDateTime);
     saveDetail(&etr);
 }
@@ -67,14 +67,14 @@ void QOrganizerEvent::setStartDateTime(const QDateTime& startDateTime)
 /*! Returns the date time at which the first instance of the event starts */
 QDateTime QOrganizerEvent::startDateTime() const
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     return etr.startDateTime();
 }
 
 /*! Sets the end date time of the event to \a endDateTime */
 void QOrganizerEvent::setEndDateTime(const QDateTime& endDateTime)
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     etr.setEndDateTime(endDateTime);
     saveDetail(&etr);
 }
@@ -82,14 +82,14 @@ void QOrganizerEvent::setEndDateTime(const QDateTime& endDateTime)
 /*! Returns the date time at which the first instance of the event ends */
 QDateTime QOrganizerEvent::endDateTime() const
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     return etr.endDateTime();
 }
 
 /*! Sets whether the time component of the start datetime or end datetime are significant. */
 void QOrganizerEvent::setTimeSpecified(bool isTimeSpecified)
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     etr.setTimeSpecified(isTimeSpecified);
     saveDetail(&etr);
 }
@@ -97,7 +97,7 @@ void QOrganizerEvent::setTimeSpecified(bool isTimeSpecified)
 /*! Returns whether the time component of the start datetime or end datetime are significant. */
 bool QOrganizerEvent::isTimeSpecified() const
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     return etr.isTimeSpecified();
 }
 
@@ -125,7 +125,7 @@ QSet<QDate> QOrganizerEvent::recurrenceDates() const
 
 /*! Sets the list of recurrence rules \a rrules to be the rules which define when the event occurs, other than those dates
     specified explicitly via setRecurrenceDates(). */
-void QOrganizerEvent::setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule>& rrules)
+void QOrganizerEvent::setRecurrenceRules(const QSet<QOrganizerRecurrenceRule>& rrules)
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     rec.setRecurrenceRules(rrules);
@@ -135,13 +135,13 @@ void QOrganizerEvent::setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule
 /*! Sets a single recurrence rule \a rrule to be the rule which define when the event occurs, other than those dates
     specified explicitly via setRecurrenceDates().
     \see setRecurrenceRules()*/
-void QOrganizerEvent::setRecurrenceRule(const QOrganizerItemRecurrenceRule& rrule)
+void QOrganizerEvent::setRecurrenceRule(const QOrganizerRecurrenceRule& rrule)
 {
-    setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rrule);
+    setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rrule);
 }
 
 /*! Returns the list of recurrence rules which define when the event occurs */
-QSet<QOrganizerItemRecurrenceRule> QOrganizerEvent::recurrenceRules() const
+QSet<QOrganizerRecurrenceRule> QOrganizerEvent::recurrenceRules() const
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     return rec.recurrenceRules();
@@ -149,12 +149,12 @@ QSet<QOrganizerItemRecurrenceRule> QOrganizerEvent::recurrenceRules() const
 
 /*! Returns the recurrence rule which has been explicitly set for the event.
     Note: if there are more than one dates exist, the order of the dates is undefined, so any one could be returned.*/
-QOrganizerItemRecurrenceRule QOrganizerEvent::recurrenceRule() const
+QOrganizerRecurrenceRule QOrganizerEvent::recurrenceRule() const
 {
-    QSet<QOrganizerItemRecurrenceRule> rrules = recurrenceRules();
+    QSet<QOrganizerRecurrenceRule> rrules = recurrenceRules();
     if (!rrules.isEmpty())
         return *rrules.begin();
-    return QOrganizerItemRecurrenceRule();
+    return QOrganizerRecurrenceRule();
 }
 
 /*! Sets the given list of dates \a exdates to be dates on which the event explicitly does not occur,
@@ -184,7 +184,7 @@ QSet<QDate> QOrganizerEvent::exceptionDates() const
 
 /*! Sets the given list of recurrence rules \a exrules to be the rules which define when
     the event does not occur. */
-void QOrganizerEvent::setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>& exrules)
+void QOrganizerEvent::setExceptionRules(const QSet<QOrganizerRecurrenceRule>& exrules)
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     rec.setExceptionRules(exrules);
@@ -194,13 +194,13 @@ void QOrganizerEvent::setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>
 /*! Sets the given single recurrence rules\a xrule to be the rule which define when
     the event does not occur.
     \see setExceptionRules.*/
-void QOrganizerEvent::setExceptionRule(const QOrganizerItemRecurrenceRule& xrule)
+void QOrganizerEvent::setExceptionRule(const QOrganizerRecurrenceRule& xrule)
 {
-    setExceptionRules(QSet<QOrganizerItemRecurrenceRule>() << xrule);
+    setExceptionRules(QSet<QOrganizerRecurrenceRule>() << xrule);
 }
 
 /*! Returns the list of exception rules for the event */
-QSet<QOrganizerItemRecurrenceRule> QOrganizerEvent::exceptionRules() const
+QSet<QOrganizerRecurrenceRule> QOrganizerEvent::exceptionRules() const
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     return rec.exceptionRules();
@@ -208,12 +208,12 @@ QSet<QOrganizerItemRecurrenceRule> QOrganizerEvent::exceptionRules() const
 
 /*! Returns the exception rule which has been explicitly set for the event.
     Note: if there are more than one dates exist, the order of the dates is undefined, so any one could be returned.*/
-QOrganizerItemRecurrenceRule QOrganizerEvent::exceptionRule() const
+QOrganizerRecurrenceRule QOrganizerEvent::exceptionRule() const
 {
-    QSet<QOrganizerItemRecurrenceRule> xrules = exceptionRules();
+    QSet<QOrganizerRecurrenceRule> xrules = exceptionRules();
     if (!xrules.isEmpty())
         return *xrules.begin();
-    return QOrganizerItemRecurrenceRule();
+    return QOrganizerRecurrenceRule();
 }
 /*! Sets the priority of this event to \a priority */
 void QOrganizerEvent::setPriority(QOrganizerItemPriority::Priority priority)
diff --git a/src/organizer/items/qorganizerevent.h b/src/organizer/items/qorganizerevent.h
index 66eeca4521..6f7984b340 100644
--- a/src/organizer/items/qorganizerevent.h
+++ b/src/organizer/items/qorganizerevent.h
@@ -69,11 +69,11 @@ public:
     void setRecurrenceDates(const QSet<QDate>& rdates);
     QSet<QDate> recurrenceDates() const;
 
-    void setRecurrenceRule(const QOrganizerItemRecurrenceRule& rrule);
-    QOrganizerItemRecurrenceRule recurrenceRule() const;
+    void setRecurrenceRule(const QOrganizerRecurrenceRule& rrule);
+    QOrganizerRecurrenceRule recurrenceRule() const;
 
-    void setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule>& rrules);
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules() const;
+    void setRecurrenceRules(const QSet<QOrganizerRecurrenceRule>& rrules);
+    QSet<QOrganizerRecurrenceRule> recurrenceRules() const;
 
     void setExceptionDate(const QDate& exdate);
     QDate exceptionDate() const;
@@ -81,11 +81,11 @@ public:
     void setExceptionDates(const QSet<QDate>& exdates);
     QSet<QDate> exceptionDates() const;
 
-    void setExceptionRule(const QOrganizerItemRecurrenceRule& xrule);
-    QOrganizerItemRecurrenceRule exceptionRule() const;
+    void setExceptionRule(const QOrganizerRecurrenceRule& xrule);
+    QOrganizerRecurrenceRule exceptionRule() const;
 
-    void setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>& exrules);
-    QSet<QOrganizerItemRecurrenceRule> exceptionRules() const;
+    void setExceptionRules(const QSet<QOrganizerRecurrenceRule>& exrules);
+    QSet<QOrganizerRecurrenceRule> exceptionRules() const;
 
     void setPriority(QOrganizerItemPriority::Priority);
     QOrganizerItemPriority::Priority priority() const;
diff --git a/src/organizer/items/qorganizereventoccurrence.cpp b/src/organizer/items/qorganizereventoccurrence.cpp
index 3361aa7bf9..da17a583a1 100644
--- a/src/organizer/items/qorganizereventoccurrence.cpp
+++ b/src/organizer/items/qorganizereventoccurrence.cpp
@@ -64,7 +64,7 @@ QTM_USE_NAMESPACE
  */
 void QOrganizerEventOccurrence::setStartDateTime(const QDateTime& startDateTime)
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     etr.setStartDateTime(startDateTime);
     saveDetail(&etr);
 }
@@ -74,7 +74,7 @@ void QOrganizerEventOccurrence::setStartDateTime(const QDateTime& startDateTime)
  */
 QDateTime QOrganizerEventOccurrence::startDateTime() const
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     return etr.startDateTime();
 }
 
@@ -83,7 +83,7 @@ QDateTime QOrganizerEventOccurrence::startDateTime() const
  */
 void QOrganizerEventOccurrence::setEndDateTime(const QDateTime& endDateTime)
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     etr.setEndDateTime(endDateTime);
     saveDetail(&etr);
 }
@@ -93,7 +93,7 @@ void QOrganizerEventOccurrence::setEndDateTime(const QDateTime& endDateTime)
  */
 QDateTime QOrganizerEventOccurrence::endDateTime() const
 {
-    QOrganizerEventTimeRange etr = detail<QOrganizerEventTimeRange>();
+    QOrganizerEventTime etr = detail<QOrganizerEventTime>();
     return etr.endDateTime();
 }
 
diff --git a/src/organizer/items/qorganizerjournal.cpp b/src/organizer/items/qorganizerjournal.cpp
index 6649ed4fab..a4f058ec73 100644
--- a/src/organizer/items/qorganizerjournal.cpp
+++ b/src/organizer/items/qorganizerjournal.cpp
@@ -57,7 +57,7 @@ QTM_USE_NAMESPACE
  */
 void QOrganizerJournal::setDateTime(const QDateTime& dateTime)
 {
-    QOrganizerJournalTimeRange jtr = detail<QOrganizerJournalTimeRange>();
+    QOrganizerJournalTime jtr = detail<QOrganizerJournalTime>();
     jtr.setEntryDateTime(dateTime);
     saveDetail(&jtr);
 }
@@ -67,6 +67,6 @@ void QOrganizerJournal::setDateTime(const QDateTime& dateTime)
  */
 QDateTime QOrganizerJournal::dateTime() const
 {
-    QOrganizerJournalTimeRange jtr = detail<QOrganizerJournalTimeRange>();
+    QOrganizerJournalTime jtr = detail<QOrganizerJournalTime>();
     return jtr.entryDateTime();
 }
diff --git a/src/organizer/items/qorganizertodo.cpp b/src/organizer/items/qorganizertodo.cpp
index eac5854080..62ee2702a3 100644
--- a/src/organizer/items/qorganizertodo.cpp
+++ b/src/organizer/items/qorganizertodo.cpp
@@ -66,7 +66,7 @@ QTM_USE_NAMESPACE
  */
 void QOrganizerTodo::setStartDateTime(const QDateTime& startDateTime)
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     ttr.setStartDateTime(startDateTime);
     saveDetail(&ttr);
 }
@@ -76,7 +76,7 @@ void QOrganizerTodo::setStartDateTime(const QDateTime& startDateTime)
  */
 QDateTime QOrganizerTodo::startDateTime() const
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     return ttr.startDateTime();
 }
 
@@ -85,7 +85,7 @@ QDateTime QOrganizerTodo::startDateTime() const
  */
 void QOrganizerTodo::setDueDateTime(const QDateTime& dueDateTime)
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     ttr.setDueDateTime(dueDateTime);
     saveDetail(&ttr);
 }
@@ -95,7 +95,7 @@ void QOrganizerTodo::setDueDateTime(const QDateTime& dueDateTime)
  */
 QDateTime QOrganizerTodo::dueDateTime() const
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     return ttr.dueDateTime();
 }
 
@@ -104,7 +104,7 @@ the start datetime or end datetime are significant.
 */
 void QOrganizerTodo::setTimeSpecified(bool isTimeSpecified)
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     ttr.setTimeSpecified(isTimeSpecified);
     saveDetail(&ttr);
 }
@@ -112,7 +112,7 @@ void QOrganizerTodo::setTimeSpecified(bool isTimeSpecified)
 /*! Returns whether the time component of the start datetime or end datetime are significant. */
 bool QOrganizerTodo::isTimeSpecified() const
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     return ttr.isTimeSpecified();
 }
 
@@ -139,7 +139,7 @@ QSet<QDate> QOrganizerTodo::recurrenceDates() const
 /*!
   Sets the recurrence rules which define when the todo occurs to \a rrules
  */
-void QOrganizerTodo::setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule>& rrules)
+void QOrganizerTodo::setRecurrenceRules(const QSet<QOrganizerRecurrenceRule>& rrules)
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     rec.setRecurrenceRules(rrules);
@@ -149,7 +149,7 @@ void QOrganizerTodo::setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule>
 /*!
   Returns the list of recurrence rules which define when the todo occurs
  */
-QSet<QOrganizerItemRecurrenceRule> QOrganizerTodo::recurrenceRules() const
+QSet<QOrganizerRecurrenceRule> QOrganizerTodo::recurrenceRules() const
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     return rec.recurrenceRules();
@@ -181,7 +181,7 @@ QSet<QDate> QOrganizerTodo::exceptionDates() const
   not occur, where it otherwise would occur as described by the recurrence rules
   set with \l setRecurrenceRules(), to \a exrules
  */
-void QOrganizerTodo::setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>& exrules)
+void QOrganizerTodo::setExceptionRules(const QSet<QOrganizerRecurrenceRule>& exrules)
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     rec.setExceptionRules(exrules);
@@ -193,7 +193,7 @@ void QOrganizerTodo::setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>&
   does not occur, where it otherwise would occur as described by the recurrence rules
   set the \l setRecurrenceRules().
  */
-QSet<QOrganizerItemRecurrenceRule> QOrganizerTodo::exceptionRules() const
+QSet<QOrganizerRecurrenceRule> QOrganizerTodo::exceptionRules() const
 {
     QOrganizerItemRecurrence rec = detail<QOrganizerItemRecurrence>();
     return rec.exceptionRules();
diff --git a/src/organizer/items/qorganizertodo.h b/src/organizer/items/qorganizertodo.h
index bac5671708..3b79a58894 100644
--- a/src/organizer/items/qorganizertodo.h
+++ b/src/organizer/items/qorganizertodo.h
@@ -66,12 +66,12 @@ public:
 
     void setRecurrenceDates(const QSet<QDate>& rdates);
     QSet<QDate> recurrenceDates() const;
-    void setRecurrenceRules(const QSet<QOrganizerItemRecurrenceRule>& rrules);
-    QSet<QOrganizerItemRecurrenceRule> recurrenceRules() const;
+    void setRecurrenceRules(const QSet<QOrganizerRecurrenceRule>& rrules);
+    QSet<QOrganizerRecurrenceRule> recurrenceRules() const;
     void setExceptionDates(const QSet<QDate>& exdates);
     QSet<QDate> exceptionDates() const;
-    void setExceptionRules(const QSet<QOrganizerItemRecurrenceRule>& exrules);
-    QSet<QOrganizerItemRecurrenceRule> exceptionRules() const;
+    void setExceptionRules(const QSet<QOrganizerRecurrenceRule>& exrules);
+    QSet<QOrganizerRecurrenceRule> exceptionRules() const;
 
     void setPriority(QOrganizerItemPriority::Priority);
     QOrganizerItemPriority::Priority priority() const;
diff --git a/src/organizer/items/qorganizertodooccurrence.cpp b/src/organizer/items/qorganizertodooccurrence.cpp
index 61c8dbe860..fbf06ce50a 100644
--- a/src/organizer/items/qorganizertodooccurrence.cpp
+++ b/src/organizer/items/qorganizertodooccurrence.cpp
@@ -64,7 +64,7 @@ QTM_USE_NAMESPACE
  */
 void QOrganizerTodoOccurrence::setStartDateTime(const QDateTime& startDateTime)
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     ttr.setStartDateTime(startDateTime);
     saveDetail(&ttr);
 }
@@ -74,7 +74,7 @@ void QOrganizerTodoOccurrence::setStartDateTime(const QDateTime& startDateTime)
  */
 QDateTime QOrganizerTodoOccurrence::startDateTime() const
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     return ttr.startDateTime();
 }
 
@@ -83,7 +83,7 @@ QDateTime QOrganizerTodoOccurrence::startDateTime() const
  */
 void QOrganizerTodoOccurrence::setDueDateTime(const QDateTime& dueDateTime)
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     ttr.setDueDateTime(dueDateTime);
     saveDetail(&ttr);
 }
@@ -93,7 +93,7 @@ void QOrganizerTodoOccurrence::setDueDateTime(const QDateTime& dueDateTime)
  */
 QDateTime QOrganizerTodoOccurrence::dueDateTime() const
 {
-    QOrganizerTodoTimeRange ttr = detail<QOrganizerTodoTimeRange>();
+    QOrganizerTodoTime ttr = detail<QOrganizerTodoTime>();
     return ttr.dueDateTime();
 }
 
diff --git a/src/organizer/organizer.pro b/src/organizer/organizer.pro
index 86ec837047..2ce9b02fa0 100644
--- a/src/organizer/organizer.pro
+++ b/src/organizer/organizer.pro
@@ -21,7 +21,7 @@ PUBLIC_HEADERS += \
     qorganizercollectionchangeset.h \
     qorganizercollectionenginelocalid.h \
     qorganizercollectionid.h \
-    qorganizeritemabstractrequest.h \
+    qorganizerabstractrequest.h \
     qorganizeritemchangeset.h \
     qorganizeritemdetail.h \
     qorganizeritemdetaildefinition.h \
@@ -31,10 +31,10 @@ PUBLIC_HEADERS += \
     qorganizeritem.h \
     qorganizeritemid.h \
     qorganizeritemenginelocalid.h \
-    qorganizeritemmanager.h \
-    qorganizeritemmanagerengine.h \
-    qorganizeritemmanagerenginefactory.h \
-    qorganizeritemrecurrencerule.h \
+    qorganizermanager.h \
+    qorganizermanagerengine.h \
+    qorganizermanagerenginefactory.h \
+    qorganizerrecurrencerule.h \
     qorganizeritemsortorder.h \
     qtorganizerglobal.h \
     qtorganizer.h
@@ -43,7 +43,7 @@ PRIVATE_HEADERS += \
     qorganizercollection_p.h \
     qorganizercollectionchangeset_p.h \
     qorganizercollectionid_p.h \
-    qorganizeritemabstractrequest_p.h \
+    qorganizerabstractrequest_p.h \
     qorganizeritemchangeset_p.h \
     qorganizeritem_p.h \
     qorganizeritemdetail_p.h \
@@ -52,8 +52,8 @@ PRIVATE_HEADERS += \
     qorganizeritemfetchhint_p.h \
     qorganizeritemdetailfielddefinition_p.h \
     qorganizeritemdetaildefinition_p.h \
-    qorganizeritemmanager_p.h \
-    qorganizeritemrecurrencerule_p.h \
+    qorganizermanager_p.h \
+    qorganizerrecurrencerule_p.h \
     qorganizeritemsortorder_p.h
 
 SOURCES += \
@@ -61,7 +61,7 @@ SOURCES += \
     qorganizercollectionchangeset.cpp \
     qorganizercollectionenginelocalid.cpp \
     qorganizercollectionid.cpp \
-    qorganizeritemabstractrequest.cpp \
+    qorganizerabstractrequest.cpp \
     qorganizeritemchangeset.cpp \
     qorganizeritem.cpp \
     qorganizeritemdetail.cpp \
@@ -71,12 +71,12 @@ SOURCES += \
     qorganizeritemfilter.cpp \
     qorganizeritemid.cpp \
     qorganizeritemenginelocalid.cpp \
-    qorganizeritemmanager.cpp \
-    qorganizeritemmanagerengine.cpp \
-    qorganizeritemmanagerenginefactory.cpp \
-    qorganizeritemrecurrencerule.cpp \
+    qorganizermanager.cpp \
+    qorganizermanagerengine.cpp \
+    qorganizermanagerenginefactory.cpp \
+    qorganizerrecurrencerule.cpp \
     qorganizeritemsortorder.cpp \
-    qorganizeritemmanager_p.cpp
+    qorganizermanager_p.cpp
 
 HEADERS += $$PUBLIC_HEADERS \
     $$PRIVATE_HEADERS
diff --git a/src/organizer/qorganizeritemabstractrequest.cpp b/src/organizer/qorganizerabstractrequest.cpp
index 5f16a40fda..5602b47162 100644
--- a/src/organizer/qorganizeritemabstractrequest.cpp
+++ b/src/organizer/qorganizerabstractrequest.cpp
@@ -39,19 +39,19 @@
 **
 ****************************************************************************/
 
-#include "qorganizeritemabstractrequest.h"
-#include "qorganizeritemabstractrequest_p.h"
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanager_p.h"
-#include "qorganizeritemmanagerengine.h"
+#include "qorganizerabstractrequest.h"
+#include "qorganizerabstractrequest_p.h"
+#include "qorganizermanager.h"
+#include "qorganizermanager_p.h"
+#include "qorganizermanagerengine.h"
 
 
 QTM_BEGIN_NAMESPACE
 
 /*!
-  \class QOrganizerItemAbstractRequest
+  \class QOrganizerAbstractRequest
 
-  \brief The QOrganizerItemAbstractRequest class provides a mechanism for
+  \brief The QOrganizerAbstractRequest class provides a mechanism for
   asynchronous requests to be made of a manager if it supports them.
 
   \inmodule QtOrganizer
@@ -59,7 +59,7 @@ QTM_BEGIN_NAMESPACE
   \ingroup organizer-main
 
   It allows a client to asynchronously request some functionality of a
-  particular QOrganizerItemManager.  Instances of the class will emit signals
+  particular QOrganizerManager.  Instances of the class will emit signals
   when the state of the request changes, or when more results become
   available.
 
@@ -75,14 +75,14 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn QOrganizerItemAbstractRequest::stateChanged(QOrganizerItemAbstractRequest::State newState)
+  \fn QOrganizerAbstractRequest::stateChanged(QOrganizerAbstractRequest::State newState)
   This signal is emitted when the state of the request is changed.  The new state of
   the request will be contained in \a newState.
  */
 
 
 /*!
-  \fn QOrganizerItemAbstractRequest::resultsAvailable()
+  \fn QOrganizerAbstractRequest::resultsAvailable()
   This signal is emitted when new results are available.  Results can include
   the operation error which may be accessed via error(), or derived-class-specific
   results which are accessible through the derived class API.
@@ -91,7 +91,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \enum QOrganizerItemAbstractRequest::RequestType
+  \enum QOrganizerAbstractRequest::RequestType
   Enumerates the various possible types of asynchronous requests
   \value InvalidRequest An invalid request
   \value ItemInstanceFetchRequest A request to fetch a list of instances of organizer items
@@ -109,7 +109,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \enum QOrganizerItemAbstractRequest::State
+  \enum QOrganizerAbstractRequest::State
   Enumerates the various states that a request may be in at any given time
   \value InactiveState Operation not yet started
   \value ActiveState Operation started, not yet finished
@@ -118,7 +118,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn QOrganizerItemAbstractRequest::QOrganizerItemAbstractRequest(QObject* parent)
+  \fn QOrganizerAbstractRequest::QOrganizerAbstractRequest(QObject* parent)
   Constructs a new, invalid asynchronous request with the specified \a parent
  */
 
@@ -127,16 +127,16 @@ QTM_BEGIN_NAMESPACE
   Constructs a new request from the given request data \a otherd with
   the given parent \a parent
 */
-QOrganizerItemAbstractRequest::QOrganizerItemAbstractRequest(QOrganizerItemAbstractRequestPrivate* otherd, QObject* parent)
+QOrganizerAbstractRequest::QOrganizerAbstractRequest(QOrganizerAbstractRequestPrivate* otherd, QObject* parent)
     : QObject(parent), d_ptr(otherd)
 {
 }
 
 /*! Cleans up the memory used by this request */
-QOrganizerItemAbstractRequest::~QOrganizerItemAbstractRequest()
+QOrganizerAbstractRequest::~QOrganizerAbstractRequest()
 {
     if (d_ptr) {
-        QOrganizerItemManagerEngine *engine = QOrganizerItemManagerData::engine(d_ptr->m_manager);
+        QOrganizerManagerEngine *engine = QOrganizerManagerData::engine(d_ptr->m_manager);
         if (engine) {
             engine->requestDestroyed(this);
         }
@@ -146,51 +146,51 @@ QOrganizerItemAbstractRequest::~QOrganizerItemAbstractRequest()
 }
 
 /*!
-  Returns true if the request is in the \c QOrganizerItemAbstractRequest::InactiveState state; otherwise, returns false
+  Returns true if the request is in the \c QOrganizerAbstractRequest::InactiveState state; otherwise, returns false
 
   \sa state()
  */
-bool QOrganizerItemAbstractRequest::isInactive() const
+bool QOrganizerAbstractRequest::isInactive() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerItemAbstractRequest::InactiveState);
+    return (d_ptr->m_state == QOrganizerAbstractRequest::InactiveState);
 }
 
 /*!
-  Returns true if the request is in the \c QOrganizerItemAbstractRequest::ActiveState state; otherwise, returns false
+  Returns true if the request is in the \c QOrganizerAbstractRequest::ActiveState state; otherwise, returns false
 
   \sa state()
  */
-bool QOrganizerItemAbstractRequest::isActive() const
+bool QOrganizerAbstractRequest::isActive() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerItemAbstractRequest::ActiveState);
+    return (d_ptr->m_state == QOrganizerAbstractRequest::ActiveState);
 }
 
 /*!
-  Returns true if the request is in the \c QOrganizerItemAbstractRequest::FinishedState; otherwise, returns false
+  Returns true if the request is in the \c QOrganizerAbstractRequest::FinishedState; otherwise, returns false
 
   \sa state()
  */
-bool QOrganizerItemAbstractRequest::isFinished() const
+bool QOrganizerAbstractRequest::isFinished() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerItemAbstractRequest::FinishedState);
+    return (d_ptr->m_state == QOrganizerAbstractRequest::FinishedState);
 }
 
 /*!
-  Returns true if the request is in the \c QOrganizerItemAbstractRequest::CanceledState; otherwise, returns false
+  Returns true if the request is in the \c QOrganizerAbstractRequest::CanceledState; otherwise, returns false
 
   \sa state()
  */
-bool QOrganizerItemAbstractRequest::isCanceled() const
+bool QOrganizerAbstractRequest::isCanceled() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
-    return (d_ptr->m_state == QOrganizerItemAbstractRequest::CanceledState);
+    return (d_ptr->m_state == QOrganizerAbstractRequest::CanceledState);
 }
 
 /*! Returns the overall error of the most recent asynchronous operation */
-QOrganizerItemManager::Error QOrganizerItemAbstractRequest::error() const
+QOrganizerManager::Error QOrganizerAbstractRequest::error() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
     return d_ptr->m_error;
@@ -199,7 +199,7 @@ QOrganizerItemManager::Error QOrganizerItemAbstractRequest::error() const
 /*!
   Returns the type of this asynchronous request
  */
-QOrganizerItemAbstractRequest::RequestType QOrganizerItemAbstractRequest::type() const
+QOrganizerAbstractRequest::RequestType QOrganizerAbstractRequest::type() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
     return d_ptr->type();
@@ -208,38 +208,38 @@ QOrganizerItemAbstractRequest::RequestType QOrganizerItemAbstractRequest::type()
 /*!
   Returns the current state of the request.
  */
-QOrganizerItemAbstractRequest::State QOrganizerItemAbstractRequest::state() const
+QOrganizerAbstractRequest::State QOrganizerAbstractRequest::state() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
     return d_ptr->m_state;
 }
 
 /*! Returns a pointer to the manager of which this request instance requests operations */
-QOrganizerItemManager* QOrganizerItemAbstractRequest::manager() const
+QOrganizerManager* QOrganizerAbstractRequest::manager() const
 {
     QMutexLocker ml(&d_ptr->m_mutex);
     return d_ptr->m_manager;
 }
 
 /*! Sets the manager of which this request instance requests operations to \a manager */
-void QOrganizerItemAbstractRequest::setManager(QOrganizerItemManager* manager)
+void QOrganizerAbstractRequest::setManager(QOrganizerManager* manager)
 {
     QMutexLocker ml(&d_ptr->m_mutex);
     // In theory we might have been active and the manager didn't cancel/finish us
-    if (d_ptr->m_state == QOrganizerItemAbstractRequest::ActiveState && d_ptr->m_manager)
+    if (d_ptr->m_state == QOrganizerAbstractRequest::ActiveState && d_ptr->m_manager)
         return;
     d_ptr->m_manager = manager;
-    d_ptr->m_engine = QOrganizerItemManagerData::engine(d_ptr->m_manager);
+    d_ptr->m_engine = QOrganizerManagerData::engine(d_ptr->m_manager);
 }
 
-/*! Attempts to start the request.  Returns false if the request is not in the \c QOrganizerItemAbstractRequest::Inactive, \c QOrganizerItemAbstractRequest::Finished or \c QOrganizerItemAbstractRequest::Cancelled states,
+/*! Attempts to start the request.  Returns false if the request is not in the \c QOrganizerAbstractRequest::Inactive, \c QOrganizerAbstractRequest::Finished or \c QOrganizerAbstractRequest::Cancelled states,
     or if the request was unable to be performed by the manager engine; otherwise returns true. */
-bool QOrganizerItemAbstractRequest::start()
+bool QOrganizerAbstractRequest::start()
 {
     QMutexLocker ml(&d_ptr->m_mutex);
-    if (d_ptr->m_engine && (d_ptr->m_state == QOrganizerItemAbstractRequest::CanceledState
-                   || d_ptr->m_state == QOrganizerItemAbstractRequest::FinishedState
-                   || d_ptr->m_state == QOrganizerItemAbstractRequest::InactiveState)) {
+    if (d_ptr->m_engine && (d_ptr->m_state == QOrganizerAbstractRequest::CanceledState
+                   || d_ptr->m_state == QOrganizerAbstractRequest::FinishedState
+                   || d_ptr->m_state == QOrganizerAbstractRequest::InactiveState)) {
         ml.unlock();
         return d_ptr->m_engine->startRequest(this);
     }
@@ -247,12 +247,12 @@ bool QOrganizerItemAbstractRequest::start()
     return false; // unable to start operation; another operation already in progress or no engine.
 }
 
-/*! Attempts to cancel the request.  Returns false if the request is not in the \c QOrganizerItemAbstractRequest::Active state,
+/*! Attempts to cancel the request.  Returns false if the request is not in the \c QOrganizerAbstractRequest::Active state,
     or if the request is unable to be cancelled by the manager engine; otherwise returns true. */
-bool QOrganizerItemAbstractRequest::cancel()
+bool QOrganizerAbstractRequest::cancel()
 {
     QMutexLocker ml(&d_ptr->m_mutex);
-    if (d_ptr->m_engine && d_ptr->m_state == QOrganizerItemAbstractRequest::ActiveState) {
+    if (d_ptr->m_engine && d_ptr->m_state == QOrganizerAbstractRequest::ActiveState) {
         ml.unlock();
         return d_ptr->m_engine->cancelRequest(this);
     }
@@ -265,16 +265,16 @@ bool QOrganizerItemAbstractRequest::cancel()
     Returns true if the request was cancelled or completed successfully within the given period, otherwise false.
     Some backends are unable to support this operation safely, and will return false immediately.
  */
-bool QOrganizerItemAbstractRequest::waitForFinished(int msecs)
+bool QOrganizerAbstractRequest::waitForFinished(int msecs)
 {
     QMutexLocker ml(&d_ptr->m_mutex);
     if (d_ptr->m_engine) {
         switch (d_ptr->m_state) {
-        case QOrganizerItemAbstractRequest::ActiveState:
+        case QOrganizerAbstractRequest::ActiveState:
             ml.unlock();
             return d_ptr->m_engine->waitForRequestFinished(this, msecs);
-        case QOrganizerItemAbstractRequest::CanceledState:
-        case QOrganizerItemAbstractRequest::FinishedState:
+        case QOrganizerAbstractRequest::CanceledState:
+        case QOrganizerAbstractRequest::FinishedState:
             return true;
         default:
             return false;
@@ -284,7 +284,7 @@ bool QOrganizerItemAbstractRequest::waitForFinished(int msecs)
     return false; // unable to wait for operation; not in progress or no engine
 }
 
-#include "moc_qorganizeritemabstractrequest.cpp"
+#include "moc_qorganizerabstractrequest.cpp"
 
 QTM_END_NAMESPACE
 
diff --git a/src/organizer/qorganizeritemabstractrequest.h b/src/organizer/qorganizerabstractrequest.h
index f5c758ca04..aa7d705193 100644
--- a/src/organizer/qorganizeritemabstractrequest.h
+++ b/src/organizer/qorganizerabstractrequest.h
@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef QORGANIZERITEMABSTRACTREQUEST_H
-#define QORGANIZERITEMABSTRACTREQUEST_H
+#ifndef QORGANIZERABSTRACTREQUEST_H
+#define QORGANIZERABSTRACTREQUEST_H
 
 
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 #include <QObject>
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemManagerEngine;
-class QOrganizerItemAbstractRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemAbstractRequest : public QObject
+class QOrganizerManagerEngine;
+class QOrganizerAbstractRequestPrivate;
+class Q_ORGANIZER_EXPORT QOrganizerAbstractRequest : public QObject
 {
     Q_OBJECT
 
 public:
-    ~QOrganizerItemAbstractRequest();
+    ~QOrganizerAbstractRequest();
 
     enum State {
         InactiveState = 0,   // operation not yet started
@@ -70,7 +70,7 @@ public:
     bool isActive() const;
     bool isFinished() const;
     bool isCanceled() const;
-    QOrganizerItemManager::Error error() const;
+    QOrganizerManager::Error error() const;
 
     enum RequestType {
         InvalidRequest = 0,
@@ -91,8 +91,8 @@ public:
     RequestType type() const;
 
     /* Which manager we want to perform the asynchronous request */
-    QOrganizerItemManager* manager() const;
-    void setManager(QOrganizerItemManager* manager);
+    QOrganizerManager* manager() const;
+    void setManager(QOrganizerManager* manager);
 
 public Q_SLOTS:
     /* Verbs */
@@ -103,18 +103,18 @@ public Q_SLOTS:
     bool waitForFinished(int msecs = 0);
 
 Q_SIGNALS:
-    void stateChanged(QOrganizerItemAbstractRequest::State newState);
+    void stateChanged(QOrganizerAbstractRequest::State newState);
     void resultsAvailable();
 
 protected:
-    QOrganizerItemAbstractRequest(QOrganizerItemAbstractRequestPrivate* otherd, QObject* parent = 0);
-    QOrganizerItemAbstractRequestPrivate* d_ptr;
+    QOrganizerAbstractRequest(QOrganizerAbstractRequestPrivate* otherd, QObject* parent = 0);
+    QOrganizerAbstractRequestPrivate* d_ptr;
 
 private:
-    QOrganizerItemAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr(0) {}
-    Q_DISABLE_COPY(QOrganizerItemAbstractRequest)
-    friend class QOrganizerItemManagerEngine;
-    friend class QOrganizerItemAbstractRequestPrivate;
+    QOrganizerAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr(0) {}
+    Q_DISABLE_COPY(QOrganizerAbstractRequest)
+    friend class QOrganizerManagerEngine;
+    friend class QOrganizerAbstractRequestPrivate;
 };
 
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizeritemabstractrequest_p.h b/src/organizer/qorganizerabstractrequest_p.h
index 05b3ab739b..c5bb8c9440 100644
--- a/src/organizer/qorganizeritemabstractrequest_p.h
+++ b/src/organizer/qorganizerabstractrequest_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QORGANIZERITEMABSTRACTREQUEST_P_H
-#define QORGANIZERITEMABSTRACTREQUEST_P_H
+#ifndef QORGANIZERABSTRACTREQUEST_P_H
+#define QORGANIZERABSTRACTREQUEST_P_H
 
 //
 //  W A R N I N G
@@ -53,9 +53,9 @@
 // We mean it.
 //
 
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanager_p.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizermanager.h"
+#include "qorganizermanager_p.h"
+#include "qorganizerabstractrequest.h"
 
 #include <QList>
 #include <QPointer>
@@ -63,32 +63,32 @@
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemAbstractRequestPrivate
+class QOrganizerAbstractRequestPrivate
 {
 public:
-    QOrganizerItemAbstractRequestPrivate()
-        : m_error(QOrganizerItemManager::NoError),
-            m_state(QOrganizerItemAbstractRequest::InactiveState),
+    QOrganizerAbstractRequestPrivate()
+        : m_error(QOrganizerManager::NoError),
+            m_state(QOrganizerAbstractRequest::InactiveState),
             m_manager(0)
     {
     }
 
-    virtual ~QOrganizerItemAbstractRequestPrivate()
+    virtual ~QOrganizerAbstractRequestPrivate()
     {
     }
 
-    virtual QOrganizerItemAbstractRequest::RequestType type() const
+    virtual QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::InvalidRequest;
+        return QOrganizerAbstractRequest::InvalidRequest;
     }
 
-    static void notifyEngine(QOrganizerItemAbstractRequest* request)
+    static void notifyEngine(QOrganizerAbstractRequest* request)
     {
         Q_ASSERT(request);
-        QOrganizerItemAbstractRequestPrivate* d = request->d_ptr;
+        QOrganizerAbstractRequestPrivate* d = request->d_ptr;
         if (d) {
             QMutexLocker ml(&d->m_mutex);
-            QOrganizerItemManagerEngine *engine = QOrganizerItemManagerData::engine(d->m_manager);
+            QOrganizerManagerEngine *engine = QOrganizerManagerData::engine(d->m_manager);
             ml.unlock();
             if (engine) {
                 engine->requestDestroyed(request);
@@ -96,10 +96,10 @@ public:
         }
     }
 
-    QOrganizerItemManager::Error m_error;
-    QOrganizerItemAbstractRequest::State m_state;
-    QPointer<QOrganizerItemManager> m_manager;
-    QPointer<QOrganizerItemManagerEngine> m_engine;
+    QOrganizerManager::Error m_error;
+    QOrganizerAbstractRequest::State m_state;
+    QPointer<QOrganizerManager> m_manager;
+    QPointer<QOrganizerManagerEngine> m_engine;
 
     mutable QMutex m_mutex;
 };
diff --git a/src/organizer/qorganizercollection.cpp b/src/organizer/qorganizercollection.cpp
index 5d1f39f9f9..b1ba5fd190 100644
--- a/src/organizer/qorganizercollection.cpp
+++ b/src/organizer/qorganizercollection.cpp
@@ -163,7 +163,7 @@ void QOrganizerCollection::setId(const QOrganizerCollectionId& id)
 /*!
   Sets the meta data of the collection to \a metaData.
   Not all managers support arbitrary meta data for collections.  You can see whether the meta data
-  is compatible with the manager by calling \l QOrganizerItemManager::compatibleCollection().
+  is compatible with the manager by calling \l QOrganizerManager::compatibleCollection().
   Attempting to save a collection with unsupported meta data in a manager will cause an error
   in the operation.
  */
diff --git a/src/organizer/qorganizercollection.h b/src/organizer/qorganizercollection.h
index 549acd4d4f..d1dd1a11ee 100644
--- a/src/organizer/qorganizercollection.h
+++ b/src/organizer/qorganizercollection.h
@@ -53,7 +53,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemManagerEngine;
+class QOrganizerManagerEngine;
 class QOrganizerCollectionData;
 class Q_ORGANIZER_EXPORT QOrganizerCollection
 {
@@ -93,7 +93,7 @@ public:
 #endif
 
 private:
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     QSharedDataPointer<QOrganizerCollectionData> d;
 };
 
diff --git a/src/organizer/qorganizercollectionchangeset.cpp b/src/organizer/qorganizercollectionchangeset.cpp
index 8a89ed5e21..a59ca32cd4 100644
--- a/src/organizer/qorganizercollectionchangeset.cpp
+++ b/src/organizer/qorganizercollectionchangeset.cpp
@@ -41,7 +41,7 @@
 
 #include "qorganizercollectionchangeset.h"
 #include "qorganizercollectionchangeset_p.h"
-#include "qorganizeritemmanagerengine.h"
+#include "qorganizermanagerengine.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -49,7 +49,7 @@ QTM_BEGIN_NAMESPACE
    \class QOrganizerCollectionChangeSet
 
    \brief The QOrganizerCollectionChangeSet class provides a simple API to
-   simplify the emission of state-change signals from QOrganizerItemManagerEngine
+   simplify the emission of state-change signals from QOrganizerManagerEngine
    implementations.
 
   \inmodule QtOrganizer
@@ -57,12 +57,12 @@ QTM_BEGIN_NAMESPACE
   
 
    This class can be utilized by backend implementations to ensure
-   correct emission of the \l QOrganizerItemManagerEngine::dataChanged(),
-   \l QOrganizerItemManagerEngine::itemsAdded(),
-   \l QOrganizerItemManagerEngine::itemsChanged() and
-   \l QOrganizerItemManagerEngine::itemsRemoved().
+   correct emission of the \l QOrganizerManagerEngine::dataChanged(),
+   \l QOrganizerManagerEngine::itemsAdded(),
+   \l QOrganizerManagerEngine::itemsChanged() and
+   \l QOrganizerManagerEngine::itemsRemoved().
 
-   \sa QOrganizerItemManagerEngine
+   \sa QOrganizerManagerEngine
  */
 
 /*!
@@ -99,7 +99,7 @@ QOrganizerCollectionChangeSet& QOrganizerCollectionChangeSet::operator=(const QO
 
 /*!
    Sets the data changed flag to \a dataChanged.  If this is set to true prior to calling \l emitSignals(),
-   only the \l QOrganizerItemManagerEngine::dataChanged() signal will be emitted; otherwise, the appropriate
+   only the \l QOrganizerManagerEngine::dataChanged() signal will be emitted; otherwise, the appropriate
    finer-grained signals will be emitted.
  */
 void QOrganizerCollectionChangeSet::setDataChanged(bool dataChanged)
@@ -238,7 +238,7 @@ void QOrganizerCollectionChangeSet::clearAll()
 /*!
    Emits the appropriate signals from the given \a engine given the state of the change set
  */
-void QOrganizerCollectionChangeSet::emitSignals(QOrganizerItemManagerEngine *engine)
+void QOrganizerCollectionChangeSet::emitSignals(QOrganizerManagerEngine *engine)
 {
     if (!engine)
         return;
diff --git a/src/organizer/qorganizercollectionchangeset.h b/src/organizer/qorganizercollectionchangeset.h
index f42de3d0e5..2cea8113c4 100644
--- a/src/organizer/qorganizercollectionchangeset.h
+++ b/src/organizer/qorganizercollectionchangeset.h
@@ -52,7 +52,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemManagerEngine;
+class QOrganizerManagerEngine;
 class QOrganizerCollectionChangeSetData;
 class Q_ORGANIZER_EXPORT QOrganizerCollectionChangeSet
 {
@@ -83,7 +83,7 @@ public:
 
     void clearAll();
 
-    void emitSignals(QOrganizerItemManagerEngine *engine);
+    void emitSignals(QOrganizerManagerEngine *engine);
 
 private:
     QSharedDataPointer<QOrganizerCollectionChangeSetData> d;
diff --git a/src/organizer/qorganizercollectionid.cpp b/src/organizer/qorganizercollectionid.cpp
index 1cfd587d8c..b26e0b63b5 100644
--- a/src/organizer/qorganizercollectionid.cpp
+++ b/src/organizer/qorganizercollectionid.cpp
@@ -42,7 +42,7 @@
 #include "qorganizercollectionid.h"
 #include "qorganizercollectionid_p.h"
 #include "qorganizercollectionenginelocalid.h"
-#include "qorganizeritemmanager_p.h"
+#include "qorganizermanager_p.h"
 #include <QHash>
 #include <QDebug>
 
@@ -336,7 +336,7 @@ QDataStream& operator>>(QDataStream& in, QOrganizerCollectionId& collectionId)
 
         quint8 localIdMarker = static_cast<quint8>(false);
         in >> localIdMarker;
-        QOrganizerCollectionLocalId localId(QOrganizerItemManagerData::createEngineCollectionLocalId(managerUri));
+        QOrganizerCollectionLocalId localId(QOrganizerManagerData::createEngineCollectionLocalId(managerUri));
         if (localIdMarker == static_cast<quint8>(true)) {
             if (localId.d) {
                 // only stream in the local id data if it exists.
diff --git a/src/organizer/qorganizercollectionid.h b/src/organizer/qorganizercollectionid.h
index e68794ee86..88474cc42d 100644
--- a/src/organizer/qorganizercollectionid.h
+++ b/src/organizer/qorganizercollectionid.h
@@ -64,7 +64,7 @@ Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerCollectionLocal
 Q_ORGANIZER_EXPORT QDebug operator<<(QDebug dbg, const QOrganizerCollectionId& id);
 #endif
 
-class QOrganizerItemManagerEngine;
+class QOrganizerManagerEngine;
 class QOrganizerCollectionEngineLocalId;
 
 class QOrganizerCollectionId;
@@ -96,7 +96,7 @@ private:
     Q_ORGANIZER_EXPORT friend QDataStream& operator>>(QDataStream& in, QOrganizerCollectionId& id);
 #endif
     Q_ORGANIZER_EXPORT friend uint qHash(const QOrganizerCollectionLocalId& key);
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
 };
 
 class QOrganizerCollectionIdPrivate;
diff --git a/src/organizer/qorganizeritem.cpp b/src/organizer/qorganizeritem.cpp
index 7763fa7dee..4df0d23cf2 100644
--- a/src/organizer/qorganizeritem.cpp
+++ b/src/organizer/qorganizeritem.cpp
@@ -48,7 +48,7 @@
 #include "qorganizeritem.h"
 #include "qorganizeritem_p.h"
 #include "qorganizeritemdetail_p.h"
-#include "qorganizeritemmanager_p.h"
+#include "qorganizermanager_p.h"
 
 #include "qorganizeritemdetails.h"
 
@@ -82,11 +82,11 @@ QTM_BEGIN_NAMESPACE
   the QOrganizerItem allows retrieving these details in various ways.
 
   A QOrganizerItem instance represents the in-memory version of a calendar organizer item,
-  and has no tie to a specific QOrganizerItemManager.  It is possible for the contents
+  and has no tie to a specific QOrganizerManager.  It is possible for the contents
   of a QOrganizerItem to change independently of the contents that are stored persistently
-  in a QOrganizerItemManager.  A QOrganizerItem has an ID associated with it when it is first
-  retrieved from a QOrganizerItemManager, or after it has been first saved, and this allows
-  clients to track changes using the signals in QOrganizerItemManager.
+  in a QOrganizerManager.  A QOrganizerItem has an ID associated with it when it is first
+  retrieved from a QOrganizerManager, or after it has been first saved, and this allows
+  clients to track changes using the signals in QOrganizerManager.
 
   A QOrganizerItem has a number of mandatory details:
   \list
@@ -98,7 +98,7 @@ QTM_BEGIN_NAMESPACE
   Different subclasses of QOrganizerItem (i.e., QOrganizerEvent, QOrganizerTodo, QOrganizerJournal
   and QOrganizerNote) may have more mandatory details.
 
-  \sa QOrganizerItemManager, QOrganizerItemDetail
+  \sa QOrganizerManager, QOrganizerItemDetail
  */
 
 /*!
@@ -254,7 +254,7 @@ QOrganizerItem::~QOrganizerItem()
     This may have been set when the organizer item was retrieved from
     a particular manager, or when the organizer item was first saved
     in a manager.  The QOrganizerItemId is only valid with a specific
-    manager.  See \l QOrganizerItemManager::saveItem() for more
+    manager.  See \l QOrganizerManager::saveItem() for more
     information.
 
     \sa localId()
@@ -273,7 +273,7 @@ QOrganizerItemId QOrganizerItem::id() const
     manager, but other organizer items with the same local id might exist in
     different managers.
 
-    See \l QOrganizerItemManager::saveItem() for more
+    See \l QOrganizerManager::saveItem() for more
     information.
 
    \sa id()
@@ -288,7 +288,7 @@ QOrganizerItemLocalId QOrganizerItem::localId() const
   in which the item has been saved, if the item has previously been saved in
   a manager.  If the item has not previously been saved in a manager, this function
   will return the id of the collection into which the client wishes the item to be
-  saved when \l QOrganizerItemManager::saveItem() is called, which is set by calling
+  saved when \l QOrganizerManager::saveItem() is called, which is set by calling
   \l setId(); otherwise, returns a null id.
 
   An item always belongs to exactly one collection in a particular manager after it
@@ -297,8 +297,8 @@ QOrganizerItemLocalId QOrganizerItem::localId() const
   the id of a different collection within that manager and then resaves the item,
   the item will be moved from its original collection into the specified collection
   if the move operation is supported by the manager; otherwise, the
-  \l QOrganizerItemManager::saveItem() operation will fail and calling
-  \l QOrganizerItemManager::error() will return \c QOrganizerItemManager::NotSupportedError.
+  \l QOrganizerManager::saveItem() operation will fail and calling
+  \l QOrganizerManager::error() will return \c QOrganizerManager::NotSupportedError.
  */
 QOrganizerCollectionId QOrganizerItem::collectionId() const
 {
@@ -319,7 +319,7 @@ QOrganizerCollectionId QOrganizerItem::collectionId() const
   If the item has previously been saved in a particular manager, and the given
   \a collectionId is the id of a different collection than the one which the
   item is currently a part of in that manager, saving the item with
-  \l QOrganizerItemManager::saveItem() will move the item from its original
+  \l QOrganizerManager::saveItem() will move the item from its original
   collection to the collection whose id is \a collectionId, if \a collectionId
   identifies a valid collection and the operation is supported by the manager.
  */
@@ -342,14 +342,14 @@ QOrganizerCollectionLocalId QOrganizerItem::collectionLocalId() const
  * Sets the id of this organizer item to \a id.
  *
  * Note that this only affects this object, not any corresponding structures stored
- * by a QOrganizerItemManager.
+ * by a QOrganizerManager.
  *
  * If you change the id of a organizer item and save the organizer item
  * in a manager, the previously existing organizer item will still
  * exist.  You can do this to create copies (possibly modified)
  * of an existing organizer item, or to save a organizer item in a different manager.
  *
- * \sa QOrganizerItemManager::saveItem()
+ * \sa QOrganizerManager::saveItem()
  */
 void QOrganizerItem::setId(const QOrganizerItemId& id)
 {
@@ -412,7 +412,7 @@ QOrganizerItemDetail QOrganizerItem::detail(const QString& definitionName) const
     The definitionName string can be determined by the DefinitionName attribute
     of defined objects (e.g. QOrganizerItemPhoneNumber::DefinitionName) or by
     requesting a list of all the definition names using
-    \l {QOrganizerItemManager::detailDefinitions()}{detailDefinitions()} or the
+    \l {QOrganizerManager::detailDefinitions()}{detailDefinitions()} or the
     asynchronous \l
     {QOrganizerItemDetailDefinitionFetchRequest::definitionNames()}{definitionNames()}.*/
 QList<QOrganizerItemDetail> QOrganizerItem::details(const QString& definitionName) const
@@ -440,7 +440,7 @@ QList<QOrganizerItemDetail> QOrganizerItem::details(const QString& definitionNam
     The definitionName string can be determined by the DefinitionName attribute
     of defined objects (e.g. QOrganizerItemPhoneNumber::DefinitionName) or by
     requesting a list of all the definition names using
-    \l {QOrganizerItemManager::detailDefinitions()}{detailDefinitions()} or the
+    \l {QOrganizerManager::detailDefinitions()}{detailDefinitions()} or the
     asynchronous \l
     {QOrganizerItemDetailDefinitionFetchRequest::definitionNames()}{definitionNames()}.*/
 QList<QOrganizerItemDetail> QOrganizerItem::details(const QString& definitionName, const QString& fieldName, const QString& value) const
diff --git a/src/organizer/qorganizeritem.h b/src/organizer/qorganizeritem.h
index be1b15fc08..f3bba4d7fe 100644
--- a/src/organizer/qorganizeritem.h
+++ b/src/organizer/qorganizeritem.h
@@ -61,7 +61,7 @@ class QDataStream;
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemManager;
+class QOrganizerManager;
 class QOrganizerItemData;
 class QOrganizerItemName;
 
@@ -198,9 +198,9 @@ protected:
 
 protected:
     friend class QOrganizerItemData;
-    friend class QOrganizerItemManager;
-    friend class QOrganizerItemManagerData;
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManager;
+    friend class QOrganizerManagerData;
+    friend class QOrganizerManagerEngine;
     Q_ORGANIZER_EXPORT friend QDataStream& operator<<(QDataStream& out, const QOrganizerItem& item);
     Q_ORGANIZER_EXPORT friend QDataStream& operator>>(QDataStream& in, QOrganizerItem& item);
 
diff --git a/src/organizer/qorganizeritemchangeset.cpp b/src/organizer/qorganizeritemchangeset.cpp
index 39ea105410..8505753ed3 100644
--- a/src/organizer/qorganizeritemchangeset.cpp
+++ b/src/organizer/qorganizeritemchangeset.cpp
@@ -41,7 +41,7 @@
 
 #include "qorganizeritemchangeset.h"
 #include "qorganizeritemchangeset_p.h"
-#include "qorganizeritemmanagerengine.h"
+#include "qorganizermanagerengine.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -50,17 +50,17 @@ QTM_BEGIN_NAMESPACE
 
    \brief The QOrganizerItemChangeSet class provides a simple API to
    simplify the emission of state-change signals from
-   QOrganizerItemManagerEngine implementations.
+   QOrganizerManagerEngine implementations.
 
   \inmodule QtOrganizer
 
    This class can be utilised by backend implementations to ensure
-   correct emission of the \l QOrganizerItemManagerEngine::dataChanged(), \l
-   QOrganizerItemManagerEngine::itemsAdded(), \l
-   QOrganizerItemManagerEngine::itemsChanged() and \l
-   QOrganizerItemManagerEngine::itemsRemoved().
+   correct emission of the \l QOrganizerManagerEngine::dataChanged(), \l
+   QOrganizerManagerEngine::itemsAdded(), \l
+   QOrganizerManagerEngine::itemsChanged() and \l
+   QOrganizerManagerEngine::itemsRemoved().
 
-   \sa QOrganizerItemManagerEngine
+   \sa QOrganizerManagerEngine
  */
 
 /*!
@@ -97,7 +97,7 @@ QOrganizerItemChangeSet& QOrganizerItemChangeSet::operator=(const QOrganizerItem
 
 /*!
    Sets the data changed flag to \a dataChanged.  If this is set to true prior to calling \l emitSignals(),
-   only the \l QOrganizerItemManagerEngine::dataChanged() signal will be emitted; otherwise, the appropriate
+   only the \l QOrganizerManagerEngine::dataChanged() signal will be emitted; otherwise, the appropriate
    finer-grained signals will be emitted.
  */
 void QOrganizerItemChangeSet::setDataChanged(bool dataChanged)
@@ -236,7 +236,7 @@ void QOrganizerItemChangeSet::clearAll()
 /*!
    Emits the appropriate signals from the given \a engine given the state of the change set
  */
-void QOrganizerItemChangeSet::emitSignals(QOrganizerItemManagerEngine *engine)
+void QOrganizerItemChangeSet::emitSignals(QOrganizerManagerEngine *engine)
 {
     if (!engine)
         return;
diff --git a/src/organizer/qorganizeritemchangeset.h b/src/organizer/qorganizeritemchangeset.h
index b5a611324c..c0460eb9f6 100644
--- a/src/organizer/qorganizeritemchangeset.h
+++ b/src/organizer/qorganizeritemchangeset.h
@@ -52,7 +52,7 @@
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemManagerEngine;
+class QOrganizerManagerEngine;
 class QOrganizerItemChangeSetData;
 class Q_ORGANIZER_EXPORT QOrganizerItemChangeSet
 {
@@ -83,7 +83,7 @@ public:
 
     void clearAll();
 
-    void emitSignals(QOrganizerItemManagerEngine *engine);
+    void emitSignals(QOrganizerManagerEngine *engine);
 
 private:
     QSharedDataPointer<QOrganizerItemChangeSetData> d;
diff --git a/src/organizer/qorganizeritemdetail.cpp b/src/organizer/qorganizeritemdetail.cpp
index 2e641f27dd..828c9e693b 100644
--- a/src/organizer/qorganizeritemdetail.cpp
+++ b/src/organizer/qorganizeritemdetail.cpp
@@ -41,7 +41,7 @@
 
 #include "qorganizeritemdetail.h"
 #include "qorganizeritemdetail_p.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 #include "qorganizeritemrecurrence.h" //customized operator==() for recurrence detail
 #include <QDebug>
 #include <QDataStream>
@@ -90,19 +90,19 @@ Q_DESTRUCTOR_FUNCTION(qClearAllocatedStringHash)
   as 8-bit strings encoded in Latin 1 for memory conservation.  Note, however, that the values stored
   in each field are not constrained in this way, and full unicode QStrings or QVariant data can be stored.
 
-  When a QOrganizerItemDetail has been retrieved in a QOrganizerItem from a QOrganizerItemManager, it may have certain
+  When a QOrganizerItemDetail has been retrieved in a QOrganizerItem from a QOrganizerManager, it may have certain
   access constraints provided with it, like \l ReadOnly or \l Irremovable.  This might mean that the
   supplied detail is calculated or otherwise not modifiable by the user.
   Also, some details may be marked \l Irremovable.  These are typically things that
   an organizer item has to have - like a QOrganizerItemType.
 
   It is possible to inherit from QOrganizerItemDetail to provide convenience or
-  standardized access to values.  For example, \l QOrganizerEventTimeRange provides
+  standardized access to values.  For example, \l QOrganizerEventTime provides
   a convenient API for manipulating a QOrganizerItemDetail to describe the start and end time
   of an event, according to the schema.
 
-  In general, QOrganizerItemDetail and the built in subclasses (like \l QOrganizerEventTimeRange) provide
-  constants for the names of fields (like \l QOrganizerEventTimeRange::FieldStartDateTime).
+  In general, QOrganizerItemDetail and the built in subclasses (like \l QOrganizerEventTime) provide
+  constants for the names of fields (like \l QOrganizerEventTime::FieldStartDateTime).
   Typically the constants for field names start with \c Field, and the constants for predefined values
     of a field start with the name of that field
   (e.g. \c TypeEvent is a predefined constant for \c FieldType).
@@ -110,7 +110,7 @@ Q_DESTRUCTOR_FUNCTION(qClearAllocatedStringHash)
   If you wish to create your own, customized organizer item detail, you should use
   the \l Q_DECLARE_CUSTOM_ORGANIZER_DETAIL macro in order to ensure proper
   operation, and declare your own field constants with \l Q_DECLARE_LATIN1_CONSTANT.
-  See the predefined detail subclasses (like \l QOrganizerEventTimeRange,
+  See the predefined detail subclasses (like \l QOrganizerEventTime,
   \l QOrganizerItemType) for more information.
 
   QOrganizerItemDetail objects act like type checked values.  In general, you can assign them
@@ -298,7 +298,7 @@ QOrganizerItemDetail::~QOrganizerItemDetail()
 
 /*!
     Returns the (unique) name of the definition which defines the semantics and structure of this detail.
-    The actual QOrganizerItemDetailDefinition should be retrieved from the relevant QOrganizerItemManager using this name.
+    The actual QOrganizerItemDetailDefinition should be retrieved from the relevant QOrganizerManager using this name.
  */
 QString QOrganizerItemDetail::definitionName() const
 {
diff --git a/src/organizer/qorganizeritemdetaildefinition.h b/src/organizer/qorganizeritemdetaildefinition.h
index 931cac5b49..2a111f9f3c 100644
--- a/src/organizer/qorganizeritemdetaildefinition.h
+++ b/src/organizer/qorganizeritemdetaildefinition.h
@@ -58,7 +58,7 @@ QTM_BEGIN_NAMESPACE
 class QOrganizerItemDetailDefinitionData;
 class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinition
 {
-    friend class QOrganizerItemManager;
+    friend class QOrganizerManager;
 
 public:
     // default constructor: produces an invalid QOrganizerItemFieldDefinition.
diff --git a/src/organizer/qorganizeritemfilter.cpp b/src/organizer/qorganizeritemfilter.cpp
index 947a8371e3..cb0fdc041c 100644
--- a/src/organizer/qorganizeritemfilter.cpp
+++ b/src/organizer/qorganizeritemfilter.cpp
@@ -46,20 +46,20 @@
 #include "qorganizeritemintersectionfilter.h"
 #include "qorganizeritemunionfilter.h"
 
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 
 
 /*!
   \class QOrganizerItemFilter
   \brief The QOrganizerItemFilter class is used to select organizer items made available
-  through a QOrganizerItemManager.
+  through a QOrganizerManager.
 
   \inmodule QtOrganizer
 
   \ingroup organizer-main
 
-  This class is used as a parameter to various functions offered by QOrganizerItemManager, to allow
+  This class is used as a parameter to various functions offered by QOrganizerManager, to allow
   selection of items which have certain details or properties.
  */
 
diff --git a/src/organizer/qorganizeritemid.cpp b/src/organizer/qorganizeritemid.cpp
index a00d29d8da..5c48dab81e 100644
--- a/src/organizer/qorganizeritemid.cpp
+++ b/src/organizer/qorganizeritemid.cpp
@@ -42,7 +42,7 @@
 #include "qorganizeritemid.h"
 #include "qorganizeritemid_p.h"
 #include "qorganizeritemenginelocalid.h"
-#include "qorganizeritemmanager_p.h"
+#include "qorganizermanager_p.h"
 #include <QHash>
 #include <QDebug>
 #include <QDataStream>
@@ -69,13 +69,13 @@ QTM_BEGIN_NAMESPACE
   \relates QOrganizerItemId
   \brief The QOrganizerItemLocalId class represents the unique id of an organizer item within its manager.
 
-  Most operations within a \l QOrganizerItemManager accept a QOrganizerItemLocalId.  Some operations
+  Most operations within a \l QOrganizerManager accept a QOrganizerItemLocalId.  Some operations
   (involving links to organizer items outside a particular manager) also accept a manager URI - this
   combination is stored in a \l QOrganizerItemId.
 
   A default-constructed QOrganizerItemLocalId is a null QOrganizerItemLocalId, which does not identify
   any item in a manager.  Clients may wish to set the local id of an item to the default-constructed id
-  if they wish to copy that item from one manager to another (by calling QOrganizerItemManager::saveItem()),
+  if they wish to copy that item from one manager to another (by calling QOrganizerManager::saveItem()),
   whereupon that manager will replace the id with one that identifies the newly created item.
 
   \sa QOrganizerItemId
@@ -352,7 +352,7 @@ QDataStream& operator>>(QDataStream& in, QOrganizerItemId& id)
         }
         quint8 localIdMarker = static_cast<quint8>(false);
         in >> localIdMarker;
-        QOrganizerItemLocalId localId(QOrganizerItemManagerData::createEngineItemLocalId(managerUri));
+        QOrganizerItemLocalId localId(QOrganizerManagerData::createEngineItemLocalId(managerUri));
         if (localIdMarker == static_cast<quint8>(true)) {
             if (localId.d) {
                 // only try to stream in data if it exists and the engine could create an engine
diff --git a/src/organizer/qorganizeritemid.h b/src/organizer/qorganizeritemid.h
index 6a7a46bdb3..7e2272715c 100644
--- a/src/organizer/qorganizeritemid.h
+++ b/src/organizer/qorganizeritemid.h
@@ -66,7 +66,7 @@ Q_ORGANIZER_EXPORT QDataStream& operator<<(QDataStream& out, const QOrganizerIte
 Q_ORGANIZER_EXPORT QDataStream& operator>>(QDataStream& in, QOrganizerItemId& id);
 #endif
 
-class QOrganizerItemManagerEngine;
+class QOrganizerManagerEngine;
 class QOrganizerItemEngineLocalId;
 
 class QOrganizerItemId;
@@ -98,7 +98,7 @@ private:
     Q_ORGANIZER_EXPORT friend QDataStream& operator>>(QDataStream& in, QOrganizerItemId& id);
 #endif
     Q_ORGANIZER_EXPORT friend uint qHash(const QOrganizerItemLocalId& key);
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
 };
 
 class QOrganizerItemIdPrivate;
diff --git a/src/organizer/qorganizeritemmanager.cpp b/src/organizer/qorganizermanager.cpp
index 066416bfe5..7f5432f572 100644
--- a/src/organizer/qorganizeritemmanager.cpp
+++ b/src/organizer/qorganizermanager.cpp
@@ -39,12 +39,12 @@
 **
 ****************************************************************************/
 
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 #include "qorganizeritem_p.h"
 #include "qorganizeritemfilter.h"
 #include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemmanager_p.h"
+#include "qorganizermanager_p.h"
 #include "qorganizeritemfetchhint.h"
 
 #include <QSharedData>
@@ -54,8 +54,8 @@
 QTM_BEGIN_NAMESPACE
 
 /*!
-  \class QOrganizerItemManager
-  \brief The QOrganizerItemManager class provides an interface which allows clients with access to organizer item information stored in a particular backend.
+  \class QOrganizerManager
+  \brief The QOrganizerManager class provides an interface which allows clients with access to organizer item information stored in a particular backend.
 
   \inmodule QtOrganizer
   \ingroup organizer-main
@@ -64,54 +64,54 @@ QTM_BEGIN_NAMESPACE
   It provides methods to retrieve and manipulate organizer item information and supported schema definitions.
   It also provides metadata and error information reporting.
 
-  The functions provided by QOrganizerItemManager are purely synchronous; to access the same functionality in an
-  asynchronous manner, clients should use the use-case-specific classes derived from QOrganizerItemAbstractRequest.
+  The functions provided by QOrganizerManager are purely synchronous; to access the same functionality in an
+  asynchronous manner, clients should use the use-case-specific classes derived from QOrganizerAbstractRequest.
 
-  Some functionality provided by QOrganizerItemManager directly is not accessible using the asynchronous API; see
+  Some functionality provided by QOrganizerManager directly is not accessible using the asynchronous API; see
   the \l{Organizer Synchronous API}{synchronous} and \l{Organizer Asynchronous API}{asynchronous} API
   information from the \l{Organizer}{organizer module} API documentation.
  */
 
 /*!
-  \fn QOrganizerItemManager::dataChanged()
+  \fn QOrganizerManager::dataChanged()
   This signal is emitted by the manager if its internal state changes, and it is unable to determine the changes
   which occurred, or if the manager considers the changes to be radical enough to require clients to reload all data.
   If this signal is emitted, no other signals will be emitted for the associated changes.
  */
 
 /*!
-  \fn QOrganizerItemManager::itemsAdded(const QList<QOrganizerItemLocalId>& itemIds)
+  \fn QOrganizerManager::itemsAdded(const QList<QOrganizerItemLocalId>& itemIds)
   This signal is emitted at some point once the items identified by \a itemIds have been added to a datastore managed by this manager.
   This signal will not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 /*!
-  \fn QOrganizerItemManager::itemsChanged(const QList<QOrganizerItemLocalId>& itemIds)
+  \fn QOrganizerManager::itemsChanged(const QList<QOrganizerItemLocalId>& itemIds)
   This signal is emitted at some point once the items identified by \a itemIds have been modified in a datastore managed by this manager.
   This signal will not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 /*!
-  \fn QOrganizerItemManager::itemsRemoved(const QList<QOrganizerItemLocalId>& itemIds)
+  \fn QOrganizerManager::itemsRemoved(const QList<QOrganizerItemLocalId>& itemIds)
   This signal is emitted at some point once the items identified by \a itemIds have been removed from a datastore managed by this manager.
   This signal will not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 /*!
-  \fn QOrganizerItemManager::collectionsAdded(const QList<QOrganizerCollectionLocalId>& collectionIds)
+  \fn QOrganizerManager::collectionsAdded(const QList<QOrganizerCollectionLocalId>& collectionIds)
   This signal is emitted at some point once the collections identified by \a collectionIds have been added to a datastore managed by this manager.
   This signal will not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 /*!
-  \fn QOrganizerItemManager::collectionsChanged(const QList<QOrganizerCollectionLocalId>& collectionIds)
+  \fn QOrganizerManager::collectionsChanged(const QList<QOrganizerCollectionLocalId>& collectionIds)
   This signal is emitted at some point once the metadata for the collections identified by \a collectionIds have been modified in a datastore managed by this manager.
   This signal is not emitted if one of the items in this collection has changed - itemsChanged() will be emitted instead.
   This signal will not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 /*!
-  \fn QOrganizerItemManager::collectionsRemoved(const QList<QOrganizerCollectionLocalId>& collectionIds)
+  \fn QOrganizerManager::collectionsRemoved(const QList<QOrganizerCollectionLocalId>& collectionIds)
   This signal is emitted at some point once the collections identified by \a collectionIds have been removed from a datastore managed by this manager.
   This signal will not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
@@ -122,15 +122,15 @@ QTM_BEGIN_NAMESPACE
 
 /*!
     Returns a list of available manager ids that can be used when constructing
-    a QOrganizerItemManager.  If an empty id is specified to the constructor, the
+    a QOrganizerManager.  If an empty id is specified to the constructor, the
     first value in this list will be used instead.
   */
-QStringList QOrganizerItemManager::availableManagers()
+QStringList QOrganizerManager::availableManagers()
 {
     QStringList ret;
     ret << QLatin1String("memory") << QLatin1String("invalid");
-    QOrganizerItemManagerData::loadFactories();
-    ret.append(QOrganizerItemManagerData::m_engines.keys());
+    QOrganizerManagerData::loadFactories();
+    ret.append(QOrganizerManagerData::m_engines.keys());
 
     // now swizzle the default engine to pole position
 #if defined(Q_ORGANIZER_DEFAULT_ENGINE)
@@ -145,7 +145,7 @@ QStringList QOrganizerItemManager::availableManagers()
 /*!
   Splits the given \a uri into the manager, store, and parameters that it describes, and places the information into the memory addressed by \a pManagerId and \a pParams respectively.  Returns true if \a uri could be split successfully, otherwise returns false
  */
-bool QOrganizerItemManager::parseUri(const QString& uri, QString* pManagerId, QMap<QString, QString>* pParams)
+bool QOrganizerManager::parseUri(const QString& uri, QString* pManagerId, QMap<QString, QString>* pParams)
 {
     // Format: qtorganizer:<managerid>:<key>=<value>&<key>=<value>
     // 1) parameters are currently a qstringlist.. should they be a map?
@@ -201,7 +201,7 @@ bool QOrganizerItemManager::parseUri(const QString& uri, QString* pManagerId, QM
 }
 
 /*! Returns a URI that completely describes a manager implementation, datastore, and the parameters with which to instantiate the manager, from the given \a managerName, \a params and an optional \a implementationVersion */
-QString QOrganizerItemManager::buildUri(const QString& managerName, const QMap<QString, QString>& params, int implementationVersion)
+QString QOrganizerManager::buildUri(const QString& managerName, const QMap<QString, QString>& params, int implementationVersion)
 {
     QString ret(QLatin1String("qtorganizer:%1:%2"));
     // we have to escape each param
@@ -229,52 +229,52 @@ QString QOrganizerItemManager::buildUri(const QString& managerName, const QMap<Q
 }
 
 /*!
-  Constructs a QOrganizerItemManager whose implementation, store and parameters are specified in the given \a storeUri,
+  Constructs a QOrganizerManager whose implementation, store and parameters are specified in the given \a storeUri,
   and whose parent object is \a parent.
  */
-QOrganizerItemManager* QOrganizerItemManager::fromUri(const QString& storeUri, QObject* parent)
+QOrganizerManager* QOrganizerManager::fromUri(const QString& storeUri, QObject* parent)
 {
     if (storeUri.isEmpty()) {
-        return new QOrganizerItemManager(QString(), QMap<QString, QString>(), parent);
+        return new QOrganizerManager(QString(), QMap<QString, QString>(), parent);
     } else {
         QString id;
         QMap<QString, QString> parameters;
         if (parseUri(storeUri, &id, &parameters)) {
-            return new QOrganizerItemManager(id, parameters, parent);
+            return new QOrganizerManager(id, parameters, parent);
         } else {
             // invalid
-            return new QOrganizerItemManager(QLatin1String("invalid"), QMap<QString, QString>(), parent);
+            return new QOrganizerManager(QLatin1String("invalid"), QMap<QString, QString>(), parent);
         }
     }
 }
 
 /*!
-  Constructs a QOrganizerItemManager whose parent QObject is \a parent.
+  Constructs a QOrganizerManager whose parent QObject is \a parent.
   The default implementation for the platform will be created.
  */
-QOrganizerItemManager::QOrganizerItemManager(QObject* parent)
+QOrganizerManager::QOrganizerManager(QObject* parent)
     : QObject(parent),
-    d(new QOrganizerItemManagerData)
+    d(new QOrganizerManagerData)
 {
     createEngine(QString(), QMap<QString, QString>());
 }
 
 /*!
-  Constructs a QOrganizerItemManager whose implementation is identified by \a managerName with the given \a parameters.
+  Constructs a QOrganizerManager whose implementation is identified by \a managerName with the given \a parameters.
 
-  The \a parent QObject will be used as the parent of this QOrganizerItemManager.
+  The \a parent QObject will be used as the parent of this QOrganizerManager.
 
   If an empty \a managerName is specified, the default implementation for the platform will
   be used.
  */
-QOrganizerItemManager::QOrganizerItemManager(const QString& managerName, const QMap<QString, QString>& parameters, QObject* parent)
+QOrganizerManager::QOrganizerManager(const QString& managerName, const QMap<QString, QString>& parameters, QObject* parent)
     : QObject(parent),
-    d(new QOrganizerItemManagerData)
+    d(new QOrganizerManagerData)
 {
     createEngine(managerName, parameters);
 }
 
-void QOrganizerItemManager::createEngine(const QString& managerName, const QMap<QString, QString>& parameters)
+void QOrganizerManager::createEngine(const QString& managerName, const QMap<QString, QString>& parameters)
 {
     d->createEngine(managerName, parameters);
     connect(d->m_engine, SIGNAL(dataChanged()), this, SIGNAL(dataChanged()));
@@ -287,31 +287,31 @@ void QOrganizerItemManager::createEngine(const QString& managerName, const QMap<
 }
 
 /*!
-  Constructs a QOrganizerItemManager whose backend has the name \a managerName and version \a implementationVersion, where the manager
+  Constructs a QOrganizerManager whose backend has the name \a managerName and version \a implementationVersion, where the manager
   is constructed with the provided \a parameters.
 
-  The \a parent QObject will be used as the parent of this QOrganizerItemManager.
+  The \a parent QObject will be used as the parent of this QOrganizerManager.
 
   If an empty \a managerName is specified, the default implementation for the platform will be instantiated.
   If the specified implementation version is not available, the manager with the name \a managerName with the default implementation version is instantiated.
  */
-QOrganizerItemManager::QOrganizerItemManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters, QObject* parent)
+QOrganizerManager::QOrganizerManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters, QObject* parent)
     : QObject(parent),
-    d(new QOrganizerItemManagerData)
+    d(new QOrganizerManagerData)
 {
     QMap<QString, QString> params = parameters;
     params[QString(QLatin1String(QTORGANIZER_IMPLEMENTATION_VERSION_NAME))] = QString::number(implementationVersion);
     createEngine(managerName, params);
 }
 
-/*! Frees the memory used by the QOrganizerItemManager */
-QOrganizerItemManager::~QOrganizerItemManager()
+/*! Frees the memory used by the QOrganizerManager */
+QOrganizerManager::~QOrganizerManager()
 {
     delete d;
 }
 
 /*!
-  \enum QOrganizerItemManager::Error
+  \enum QOrganizerManager::Error
 
   This enum specifies an error that occurred during the most recent operation:
 
@@ -334,7 +334,7 @@ QOrganizerItemManager::~QOrganizerItemManager()
  */
 
 /*! Return the error code of the most recent operation */
-QOrganizerItemManager::Error QOrganizerItemManager::error() const
+QOrganizerManager::Error QOrganizerManager::error() const
 {
     return d->m_error;
 }
@@ -348,7 +348,7 @@ QOrganizerItemManager::Error QOrganizerItemManager::error() const
   that key in the map) occurred during the batch operation.
   \sa error(), saveItems(), removeItems()
  */
-QMap<int, QOrganizerItemManager::Error> QOrganizerItemManager::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerManager::errorMap() const
 {
     return d->m_errorMap;
 }
@@ -361,9 +361,9 @@ QMap<int, QOrganizerItemManager::Error> QOrganizerItemManager::errorMap() const
   If \a maxCount is negative, it is backend specific as to how many occurrences will be returned.
   Some backends may return no instances, others may return some limited number of occurrences.
   */
-QList<QOrganizerItem> QOrganizerItemManager::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint) const
+QList<QOrganizerItem> QOrganizerManager::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->itemInstances(generator, periodStart, periodEnd, maxCount, fetchHint, &d->m_error);
 }
@@ -372,9 +372,9 @@ QList<QOrganizerItem> QOrganizerItemManager::itemInstances(const QOrganizerItem&
   Returns a list of organizer item ids that match the given \a filter, sorted according to the given list of \a sortOrders.
   Depending on the backend, this filtering operation may involve retrieving all the organizeritems.
  */
-QList<QOrganizerItemLocalId> QOrganizerItemManager::itemIds(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders) const
+QList<QOrganizerItemLocalId> QOrganizerManager::itemIds(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->itemIds(QDateTime(), QDateTime(), filter, sortOrders, &d->m_error);
 }
 
@@ -382,9 +382,9 @@ QList<QOrganizerItemLocalId> QOrganizerItemManager::itemIds(const QOrganizerItem
   Returns a list of organizer item ids that match the given \a filter, sorted according to the given list of \a sortOrders.
   Depending on the backend, this filtering operation may involve retrieving all the organizeritems.
  */
-QList<QOrganizerItemLocalId> QOrganizerItemManager::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders) const
+QList<QOrganizerItemLocalId> QOrganizerManager::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->itemIds(startDate, endDate, filter, sortOrders, &d->m_error);
 }
@@ -401,9 +401,9 @@ QList<QOrganizerItemLocalId> QOrganizerItemManager::itemIds(const QDateTime& sta
 
   \sa QOrganizerItemFetchHint
  */
-QList<QOrganizerItem> QOrganizerItemManager::items(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint) const
+QList<QOrganizerItem> QOrganizerManager::items(const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->items(QDateTime(), QDateTime(), filter, sortOrders, fetchHint, &d->m_error);
 }
@@ -423,9 +423,9 @@ QList<QOrganizerItem> QOrganizerItemManager::items(const QOrganizerItemFilter& f
 
   \sa QOrganizerItemFetchHint
  */
-QList<QOrganizerItem> QOrganizerItemManager::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint) const
+QList<QOrganizerItem> QOrganizerManager::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->items(startDate, endDate, filter, sortOrders, fetchHint, &d->m_error);
 }
@@ -445,9 +445,9 @@ QList<QOrganizerItem> QOrganizerItemManager::items(const QDateTime& startDate, c
 
   \sa QOrganizerItemFetchHint
  */
-QList<QOrganizerItem> QOrganizerItemManager::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint) const
+QList<QOrganizerItem> QOrganizerManager::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->itemsForExport(startDate, endDate, filter, sortOrders, fetchHint, &d->m_error);
 }
@@ -456,7 +456,7 @@ QList<QOrganizerItem> QOrganizerItemManager::itemsForExport(const QDateTime& sta
   Returns the organizer item in the database identified by \a organizeritemId.
 
   If the organizer item does not exist, an empty, default constructed QOrganizerItem will be returned,
-  and the error returned by \l error() will be \c QOrganizerItemManager::DoesNotExistError.
+  and the error returned by \l error() will be \c QOrganizerManager::DoesNotExistError.
 
   The \a fetchHint parameter describes the optimization hints that a manager may take.
   If the \a fetchHint is the default constructed hint, all existing details and relationships
@@ -467,9 +467,9 @@ QList<QOrganizerItem> QOrganizerItemManager::itemsForExport(const QDateTime& sta
 
   \sa QOrganizerItemFetchHint
  */
-QOrganizerItem QOrganizerItemManager::item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint) const
+QOrganizerItem QOrganizerManager::item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->item(organizeritemId, fetchHint, &d->m_error);
 }
@@ -491,14 +491,14 @@ QOrganizerItem QOrganizerItemManager::item(const QOrganizerItemLocalId& organize
   If the manager URI of the id of the \a organizeritem is neither empty nor equal to the URI of
   this manager, or local id of the \a organizeritem is non-zero but does not exist in the
   manager, the operation will fail and calling error() will return
-  \c QOrganizerItemManager::DoesNotExistError.
+  \c QOrganizerManager::DoesNotExistError.
 
   Alternatively, the function will update the existing organizer item in the database if \a organizeritem
   has a non-zero id and currently exists in the database.
 
   If the \a organizeritem contains one or more details whose definitions have
   not yet been saved with the manager, the operation will fail and calling
-  error() will return \c QOrganizerItemManager::UnsupportedError.
+  error() will return \c QOrganizerManager::UnsupportedError.
 
   Returns false on failure, or true on
   success.  On successful save of an organizer item with an id of zero, its
@@ -507,18 +507,18 @@ QOrganizerItem QOrganizerItemManager::item(const QOrganizerItemLocalId& organize
   The manager will automatically synthesize the display label of the organizer item when it is saved.
   The manager is not required to fetch updated details of the organizer item on save,
   and as such, clients should fetch an organizer item if they want the most up-to-date information
-  by calling \l QOrganizerItemManager::item().
+  by calling \l QOrganizerManager::item().
 
   \sa managerUri()
  */
-bool QOrganizerItemManager::saveItem(QOrganizerItem* organizeritem)
+bool QOrganizerManager::saveItem(QOrganizerItem* organizeritem)
 {
     d->m_errorMap.clear();
     if (organizeritem) {
-        d->m_error = QOrganizerItemManager::NoError;
+        d->m_error = QOrganizerManager::NoError;
         return d->m_engine->saveItem(organizeritem, &d->m_error);
     } else {
-        d->m_error = QOrganizerItemManager::BadArgumentError;
+        d->m_error = QOrganizerManager::BadArgumentError;
         return false;
     }
 }
@@ -528,9 +528,9 @@ bool QOrganizerItemManager::saveItem(QOrganizerItem* organizeritem)
   Returns true if the organizer item was removed successfully, otherwise
   returns false.
  */
-bool QOrganizerItemManager::removeItem(const QOrganizerItemLocalId& organizeritemId)
+bool QOrganizerManager::removeItem(const QOrganizerItemLocalId& organizeritemId)
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->removeItem(organizeritemId, &d->m_error);
 }
@@ -553,24 +553,24 @@ bool QOrganizerItemManager::removeItem(const QOrganizerItemLocalId& organizerite
   same manager.
 
   Calling \l errorMap() will return the per-input errors for the latest batch function.
-  The \l QOrganizerItemManager::error() function will only return \c QOrganizerItemManager::NoError
+  The \l QOrganizerManager::error() function will only return \c QOrganizerManager::NoError
   if all organizeritems were saved successfully.
 
   For each newly saved organizer item that was successful, the id of the organizeritem
   in the \a organizeritems list will be updated with the new value.  If a failure occurs
   when saving a new organizeritem, the id will be cleared.
 
-  \sa QOrganizerItemManager::saveItem()
+  \sa QOrganizerManager::saveItem()
  */
-bool QOrganizerItemManager::saveItems(QList<QOrganizerItem>* organizeritems)
+bool QOrganizerManager::saveItems(QList<QOrganizerItem>* organizeritems)
 {
     d->m_errorMap.clear();
     if (!organizeritems) {
-        d->m_error = QOrganizerItemManager::BadArgumentError;
+        d->m_error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->saveItems(organizeritems, &d->m_errorMap, &d->m_error);
 }
 
@@ -580,38 +580,38 @@ bool QOrganizerItemManager::saveItems(QList<QOrganizerItem>* organizeritems)
   otherwise false.
 
   Calling \l errorMap() will return the per-input errors for the latest batch function.
-  The \l QOrganizerItemManager::error() function will
-  only return \c QOrganizerItemManager::NoError if all organizeritems were removed
+  The \l QOrganizerManager::error() function will
+  only return \c QOrganizerManager::NoError if all organizeritems were removed
   successfully.
 
   If the given list of organizer item ids \a organizeritemIds is empty, the function will return false
-  and calling error() will return \c QOrganizerItemManager::BadArgumentError.  If the list is non-empty
+  and calling error() will return \c QOrganizerManager::BadArgumentError.  If the list is non-empty
   and contains ids which do not identify a valid organizer item in the manager, the function will
   remove any organizeritems which are identified by ids in the \a organizeritemIds list, insert
-  \c QOrganizerItemManager::DoesNotExist entries into the error map for the indices of invalid ids
+  \c QOrganizerManager::DoesNotExist entries into the error map for the indices of invalid ids
   in the \a organizeritemIds list, return false, and set the overall operation error to
-  \c QOrganizerItemManager::DoesNotExistError.
+  \c QOrganizerManager::DoesNotExistError.
 
-  \sa QOrganizerItemManager::removeItem()
+  \sa QOrganizerManager::removeItem()
  */
-bool QOrganizerItemManager::removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds)
+bool QOrganizerManager::removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds)
 {
     d->m_errorMap.clear();
     if (organizeritemIds.isEmpty()) {
-        d->m_error = QOrganizerItemManager::BadArgumentError;
+        d->m_error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->removeItems(organizeritemIds, &d->m_errorMap, &d->m_error);
 }
 
 /*!
   Returns the id of the default collection managed by this manager
  */
-QOrganizerCollection QOrganizerItemManager::defaultCollection() const
+QOrganizerCollection QOrganizerManager::defaultCollection() const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->defaultCollection(&d->m_error);
 }
@@ -619,9 +619,9 @@ QOrganizerCollection QOrganizerItemManager::defaultCollection() const
 /*!
   Returns the collection identified by the given \a collectionId which is managed by this manager.
  */
-QOrganizerCollection QOrganizerItemManager::collection(const QOrganizerCollectionLocalId& collectionId) const
+QOrganizerCollection QOrganizerManager::collection(const QOrganizerCollectionLocalId& collectionId) const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->collection(collectionId, &d->m_error);
 }
@@ -629,9 +629,9 @@ QOrganizerCollection QOrganizerItemManager::collection(const QOrganizerCollectio
 /*!
   Returns a list of all of the collections managed by this manager.
  */
-QList<QOrganizerCollection> QOrganizerItemManager::collections() const
+QList<QOrganizerCollection> QOrganizerManager::collections() const
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->collections(&d->m_error);
 }
@@ -652,14 +652,14 @@ QList<QOrganizerCollection> QOrganizerItemManager::collections() const
   attempting to save a new collection in such a manager will
   always fail.
  */
-bool QOrganizerItemManager::saveCollection(QOrganizerCollection* collection)
+bool QOrganizerManager::saveCollection(QOrganizerCollection* collection)
 {
     d->m_errorMap.clear();
     if (collection) {
-        d->m_error = QOrganizerItemManager::NoError;
+        d->m_error = QOrganizerManager::NoError;
         return d->m_engine->saveCollection(collection, &d->m_error);
     } else {
-        d->m_error = QOrganizerItemManager::BadArgumentError;
+        d->m_error = QOrganizerManager::BadArgumentError;
         return false;
     }
 }
@@ -670,11 +670,11 @@ bool QOrganizerItemManager::saveCollection(QOrganizerCollection* collection)
   Returns true on success, false on failure.
 
   Attempting to remove the default collection will fail and calling \l error() will return
-  QOrganizerItemManager::PermissionsError.
+  QOrganizerManager::PermissionsError.
  */
-bool QOrganizerItemManager::removeCollection(const QOrganizerCollectionLocalId& collectionId)
+bool QOrganizerManager::removeCollection(const QOrganizerCollectionLocalId& collectionId)
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->removeCollection(collectionId, &d->m_error);
 }
@@ -685,11 +685,11 @@ bool QOrganizerItemManager::removeCollection(const QOrganizerCollectionLocalId&
   Returns true on success, false on failure.
 
   Attempting to remove the default collection will fail and calling \l error() will return
-  QOrganizerItemManager::PermissionsError.
+  QOrganizerManager::PermissionsError.
  */
-bool QOrganizerItemManager::removeCollection(const QOrganizerCollection& collection)
+bool QOrganizerManager::removeCollection(const QOrganizerCollection& collection)
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->removeCollection(collection.localId(), &d->m_error);
 }
 
@@ -697,9 +697,9 @@ bool QOrganizerItemManager::removeCollection(const QOrganizerCollection& collect
   Returns a pruned or modified version of the \a original organizer item which is valid and can be saved in the manager.
   The returned organizer item might have entire details removed or arbitrarily changed.
  */
-QOrganizerItem QOrganizerItemManager::compatibleItem(const QOrganizerItem& original)
+QOrganizerItem QOrganizerManager::compatibleItem(const QOrganizerItem& original)
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->compatibleItem(original, &d->m_error);
 }
@@ -708,9 +708,9 @@ QOrganizerItem QOrganizerItemManager::compatibleItem(const QOrganizerItem& origi
   Returns a pruned or modified version of the \a original organizer collection which is valid and can be saved in the manager.
   The returned organizer collection might have meta data removed or arbitrarily changed.
  */
-QOrganizerCollection QOrganizerItemManager::compatibleCollection(const QOrganizerCollection& original)
+QOrganizerCollection QOrganizerManager::compatibleCollection(const QOrganizerCollection& original)
 {
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     d->m_errorMap.clear();
     return d->m_engine->compatibleCollection(original, &d->m_error);
 }
@@ -719,59 +719,59 @@ QOrganizerCollection QOrganizerItemManager::compatibleCollection(const QOrganize
   Returns a map of identifier to detail definition for the registered detail definitions which are valid for organizeritems whose type is the given \a organizeritemType
   which are valid for the organizeritems in this store
  */
-QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemManager::detailDefinitions(const QString& organizeritemType) const
+QMap<QString, QOrganizerItemDetailDefinition> QOrganizerManager::detailDefinitions(const QString& organizeritemType) const
 {
     d->m_errorMap.clear();
     if (!supportedItemTypes().contains(organizeritemType)) {
-        d->m_error = QOrganizerItemManager::InvalidItemTypeError;
+        d->m_error = QOrganizerManager::InvalidItemTypeError;
         return QMap<QString, QOrganizerItemDetailDefinition>();
     }
 
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->detailDefinitions(organizeritemType, &d->m_error);
 }
 
 /*! Returns the definition identified by the given \a definitionName that is valid for the organizeritems whose type is the given \a organizeritemType in this store, or a default-constructed QOrganizerItemDetailDefinition if no such definition exists */
-QOrganizerItemDetailDefinition QOrganizerItemManager::detailDefinition(const QString& definitionName, const QString& organizeritemType) const
+QOrganizerItemDetailDefinition QOrganizerManager::detailDefinition(const QString& definitionName, const QString& organizeritemType) const
 {
     d->m_errorMap.clear();
     if (!supportedItemTypes().contains(organizeritemType)) {
-        d->m_error = QOrganizerItemManager::InvalidItemTypeError;
+        d->m_error = QOrganizerManager::InvalidItemTypeError;
         return QOrganizerItemDetailDefinition();
     }
 
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->detailDefinition(definitionName, organizeritemType, &d->m_error);
 }
 
 /*! Persists the given definition \a def in the database, which is valid for organizeritems whose type is the given \a organizeritemType.  Returns true if the definition was saved successfully, otherwise returns false */
-bool QOrganizerItemManager::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType)
+bool QOrganizerManager::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType)
 {
     d->m_errorMap.clear();
     if (!supportedItemTypes().contains(organizeritemType)) {
-        d->m_error = QOrganizerItemManager::InvalidItemTypeError;
+        d->m_error = QOrganizerManager::InvalidItemTypeError;
         return false;
     }
 
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->saveDetailDefinition(def, organizeritemType, &d->m_error);
 }
 
 /*! Removes the detail definition identified by \a definitionName from the database, which is valid for organizeritems whose type is the given \a organizeritemType.  Returns true if the definition was removed successfully, otherwise returns false */
-bool QOrganizerItemManager::removeDetailDefinition(const QString& definitionName, const QString& organizeritemType)
+bool QOrganizerManager::removeDetailDefinition(const QString& definitionName, const QString& organizeritemType)
 {
     d->m_errorMap.clear();
     if (!supportedItemTypes().contains(organizeritemType)) {
-        d->m_error = QOrganizerItemManager::InvalidItemTypeError;
+        d->m_error = QOrganizerManager::InvalidItemTypeError;
         return false;
     }
 
-    d->m_error = QOrganizerItemManager::NoError;
+    d->m_error = QOrganizerManager::NoError;
     return d->m_engine->removeDetailDefinition(definitionName, organizeritemType, &d->m_error);
 }
 
 /*!
-  \enum QOrganizerItemManager::ManagerFeature
+  \enum QOrganizerManager::ManagerFeature
   This enum describes the possible features that a particular manager may support
   \value MutableDefinitions The manager supports saving, updating or removing detail definitions.  Some built-in definitions may still be immutable
   \value ChangeLogs The manager supports reporting of timestamps of changes, and filtering and sorting by those timestamps
@@ -781,7 +781,7 @@ bool QOrganizerItemManager::removeDetailDefinition(const QString& definitionName
 /*!
   Returns true if the given feature \a feature is supported by the manager, for the specified type of organizer item \a organizeritemType
  */
-bool QOrganizerItemManager::hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& organizeritemType) const
+bool QOrganizerManager::hasFeature(QOrganizerManager::ManagerFeature feature, const QString& organizeritemType) const
 {
     return d->m_engine->hasFeature(feature, organizeritemType);
 }
@@ -795,7 +795,7 @@ bool QOrganizerItemManager::hasFeature(QOrganizerItemManager::ManagerFeature fea
   that have changed since a given time depends on having that information
   available.  In these cases, the filter will fail.
  */
-bool QOrganizerItemManager::isFilterSupported(const QOrganizerItemFilter& filter) const
+bool QOrganizerManager::isFilterSupported(const QOrganizerItemFilter& filter) const
 {
     return d->m_engine->isFilterSupported(filter);
 }
@@ -806,7 +806,7 @@ bool QOrganizerItemManager::isFilterSupported(const QOrganizerItemFilter& filter
   for the \c QOrganizerItemType::FieldType field of the QOrganizerItemType definition
   which is valid in this manager.
  */
-QStringList QOrganizerItemManager::supportedItemTypes() const
+QStringList QOrganizerManager::supportedItemTypes() const
 {
     return d->m_engine->supportedItemTypes();
 }
@@ -814,19 +814,19 @@ QStringList QOrganizerItemManager::supportedItemTypes() const
 /*!
   Returns the engine backend implementation version number
  */
-int QOrganizerItemManager::managerVersion() const
+int QOrganizerManager::managerVersion() const
 {
     return d->m_engine->managerVersion();
 }
 
-/*! Returns the manager name for this QOrganizerItemManager */
-QString QOrganizerItemManager::managerName() const
+/*! Returns the manager name for this QOrganizerManager */
+QString QOrganizerManager::managerName() const
 {
     return d->m_engine->managerName();
 }
 
-/*! Return the parameters relevant to the creation of this QOrganizerItemManager */
-QMap<QString, QString> QOrganizerItemManager::managerParameters() const
+/*! Return the parameters relevant to the creation of this QOrganizerManager */
+QMap<QString, QString> QOrganizerManager::managerParameters() const
 {
     QMap<QString, QString> params = d->m_engine->managerParameters();
 
@@ -836,13 +836,13 @@ QMap<QString, QString> QOrganizerItemManager::managerParameters() const
 }
 
 /*!
-  Return the uri describing this QOrganizerItemManager, consisting of the manager name and any parameters.
+  Return the uri describing this QOrganizerManager, consisting of the manager name and any parameters.
  */
-QString QOrganizerItemManager::managerUri() const
+QString QOrganizerManager::managerUri() const
 {
     return d->m_engine->managerUri();
 }
 
-#include "moc_qorganizeritemmanager.cpp"
+#include "moc_qorganizermanager.cpp"
 
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizeritemmanager.h b/src/organizer/qorganizermanager.h
index 14b49ae6bf..0983470532 100644
--- a/src/organizer/qorganizeritemmanager.h
+++ b/src/organizer/qorganizermanager.h
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 
-#ifndef QORGANIZERITEMMANAGER_H
-#define QORGANIZERITEMMANAGER_H
+#ifndef QORGANIZERMANAGER_H
+#define QORGANIZERMANAGER_H
 
 #include <QObject>
 
@@ -63,23 +63,23 @@
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemManagerData;
-class Q_ORGANIZER_EXPORT QOrganizerItemManager : public QObject
+class QOrganizerManagerData;
+class Q_ORGANIZER_EXPORT QOrganizerManager : public QObject
 {
     Q_OBJECT
 
 public:
 #if Q_QDOC // qdoc's parser fails to recognise the default map argument
-    explicit QOrganizerItemManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
-    QOrganizerItemManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
+    explicit QOrganizerManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
+    QOrganizerManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
 #else
-    explicit QOrganizerItemManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
-    QOrganizerItemManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
+    explicit QOrganizerManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
+    QOrganizerManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* parent = 0);
 #endif
-    explicit QOrganizerItemManager(QObject* parent);
+    explicit QOrganizerManager(QObject* parent);
 
-    static QOrganizerItemManager* fromUri(const QString& uri, QObject* parent = 0);
-    ~QOrganizerItemManager();
+    static QOrganizerManager* fromUri(const QString& uri, QObject* parent = 0);
+    ~QOrganizerManager();
 
     QString managerName() const;                       // e.g. "Symbian"
     QMap<QString, QString> managerParameters() const;  // e.g. "filename=private.db"
@@ -109,8 +109,8 @@ public:
     };
 
     /* Error reporting */
-    QOrganizerItemManager::Error error() const;
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QOrganizerManager::Error error() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
     QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart = QDateTime(), const QDateTime& periodEnd = QDateTime(), int maxCount = -1, const QOrganizerItemFetchHint& fetchHint = QOrganizerItemFetchHint()) const;
 
@@ -153,11 +153,11 @@ public:
         Anonymous,
         ChangeLogs
     };
-    bool hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& itemType = QOrganizerItemType::TypeEvent) const;
+    bool hasFeature(QOrganizerManager::ManagerFeature feature, const QString& itemType = QOrganizerItemType::TypeEvent) const;
     bool isFilterSupported(const QOrganizerItemFilter& filter) const;
     QStringList supportedItemTypes() const;
 
-    /* return a list of available backends for which a QOrganizerItemManager can be constructed. */
+    /* return a list of available backends for which a QOrganizerManager can be constructed. */
     static QStringList availableManagers();
 
 Q_SIGNALS:
@@ -170,11 +170,11 @@ Q_SIGNALS:
     void collectionsRemoved(const QList<QOrganizerCollectionLocalId>& collectionIds);
 
 private:
-    friend class QOrganizerItemManagerData;
+    friend class QOrganizerManagerData;
     void createEngine(const QString& managerName, const QMap<QString, QString>& parameters); 
-    Q_DISABLE_COPY(QOrganizerItemManager)
+    Q_DISABLE_COPY(QOrganizerManager)
     // private data pointer
-    QOrganizerItemManagerData* d;
+    QOrganizerManagerData* d;
 };
 
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizeritemmanager_p.cpp b/src/organizer/qorganizermanager_p.cpp
index ece1cf0adb..0179380e0a 100644
--- a/src/organizer/qorganizeritemmanager_p.cpp
+++ b/src/organizer/qorganizermanager_p.cpp
@@ -39,10 +39,10 @@
 **
 ****************************************************************************/
 
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanager_p.h"
-#include "qorganizeritemmanagerengine.h"
-#include "qorganizeritemmanagerenginefactory.h"
+#include "qorganizermanager.h"
+#include "qorganizermanager_p.h"
+#include "qorganizermanagerengine.h"
+#include "qorganizermanagerenginefactory.h"
 
 #include "qorganizeritem_p.h"
 
@@ -66,21 +66,21 @@
 
 QTM_BEGIN_NAMESPACE
 
-/* Shared QOrganizerItemManager stuff here, default engine stuff below */
-QHash<QString, QOrganizerItemManagerEngineFactory*> QOrganizerItemManagerData::m_engines;
+/* Shared QOrganizerManager stuff here, default engine stuff below */
+QHash<QString, QOrganizerManagerEngineFactory*> QOrganizerManagerData::m_engines;
 
-bool QOrganizerItemManagerData::m_discovered;
-bool QOrganizerItemManagerData::m_discoveredStatic;
-QStringList QOrganizerItemManagerData::m_pluginPaths;
+bool QOrganizerManagerData::m_discovered;
+bool QOrganizerManagerData::m_discoveredStatic;
+QStringList QOrganizerManagerData::m_pluginPaths;
 
 static void qOrganizerItemsCleanEngines()
 {
-    QOrganizerItemManagerData::m_discovered = false;
-    QList<QOrganizerItemManagerEngineFactory*> factories = QOrganizerItemManagerData::m_engines.values();
+    QOrganizerManagerData::m_discovered = false;
+    QList<QOrganizerManagerEngineFactory*> factories = QOrganizerManagerData::m_engines.values();
     for (int i=0; i < factories.count(); i++) {
         delete factories.at(i);
     }
-    QOrganizerItemManagerData::m_engines.clear();
+    QOrganizerManagerData::m_engines.clear();
 }
 
 
@@ -96,11 +96,11 @@ static int parameterValue(const QMap<QString, QString>& parameters, const char*
     return defaultValue;
 }
 
-void QOrganizerItemManagerData::createEngine(const QString& managerName, const QMap<QString, QString>& parameters)
+void QOrganizerManagerData::createEngine(const QString& managerName, const QMap<QString, QString>& parameters)
 {
     m_engine = 0;
 
-    QString builtManagerName = managerName.isEmpty() ? QOrganizerItemManager::availableManagers().value(0) : managerName;
+    QString builtManagerName = managerName.isEmpty() ? QOrganizerManager::availableManagers().value(0) : managerName;
     if (builtManagerName == QLatin1String("memory")) {
         m_engine = QOrganizerItemMemoryEngine::createMemoryEngine(parameters);
     } else {
@@ -113,11 +113,11 @@ void QOrganizerItemManagerData::createEngine(const QString& managerName, const Q
         loadStaticFactories();
 
         /* See if we got a fast hit */
-        QList<QOrganizerItemManagerEngineFactory*> factories = m_engines.values(builtManagerName);
-        m_error = QOrganizerItemManager::NoError;
+        QList<QOrganizerManagerEngineFactory*> factories = m_engines.values(builtManagerName);
+        m_error = QOrganizerManager::NoError;
 
         while(!found) {
-            foreach (QOrganizerItemManagerEngineFactory* f, factories) {
+            foreach (QOrganizerManagerEngineFactory* f, factories) {
                 QList<int> versions = f->supportedImplementationVersions();
                 if (implementationVersion == -1 ||//no given implementation version required
                         versions.isEmpty() || //the manager engine factory does not report any version
@@ -141,20 +141,20 @@ void QOrganizerItemManagerData::createEngine(const QString& managerName, const Q
         // XXX remove this
         // the engine factory could lie to us, so check the real implementation version
         if (m_engine && (implementationVersion != -1 && m_engine->managerVersion() != implementationVersion)) {
-            m_error = QOrganizerItemManager::VersionMismatchError;
+            m_error = QOrganizerManager::VersionMismatchError;
             m_engine = 0;
         }
 
         if (!m_engine) {
-            if (m_error == QOrganizerItemManager::NoError)
-                m_error = QOrganizerItemManager::DoesNotExistError;
+            if (m_error == QOrganizerManager::NoError)
+                m_error = QOrganizerManager::DoesNotExistError;
             m_engine = new QOrganizerItemInvalidEngine();
         }
     }
 }
 
 
-void QOrganizerItemManagerData::loadStaticFactories()
+void QOrganizerManagerData::loadStaticFactories()
 {
     if (!m_discoveredStatic) {
 #if !defined QT_NO_DEBUG
@@ -169,7 +169,7 @@ void QOrganizerItemManagerData::loadStaticFactories()
         /* Loop over all the static plugins */
         QObjectList staticPlugins = QPluginLoader::staticInstances();
         for (int i=0; i < staticPlugins.count(); i++ ){
-            QOrganizerItemManagerEngineFactory *f = qobject_cast<QOrganizerItemManagerEngineFactory*>(staticPlugins.at(i));
+            QOrganizerManagerEngineFactory *f = qobject_cast<QOrganizerManagerEngineFactory*>(staticPlugins.at(i));
             if (f) {
                 QString name = f->managerName();
 #if !defined QT_NO_DEBUG
@@ -193,7 +193,7 @@ void QOrganizerItemManagerData::loadStaticFactories()
 
 
 /* Plugin loader */
-void QOrganizerItemManagerData::loadFactories()
+void QOrganizerManagerData::loadFactories()
 {
 #if !defined QT_NO_DEBUG
     const bool showDebug = qgetenv("QT_DEBUG_PLUGINS").toInt() > 0;
@@ -212,7 +212,7 @@ void QOrganizerItemManagerData::loadFactories()
         /* Now discover the dynamic plugins */
         for (int i=0; i < m_pluginPaths.count(); i++) {
             QPluginLoader qpl(m_pluginPaths.at(i));
-            QOrganizerItemManagerEngineFactory *f = qobject_cast<QOrganizerItemManagerEngineFactory*>(qpl.instance());
+            QOrganizerManagerEngineFactory *f = qobject_cast<QOrganizerManagerEngineFactory*>(qpl.instance());
             if (f) {
                 QString name = f->managerName();
 #if !defined QT_NO_DEBUG
@@ -243,7 +243,7 @@ void QOrganizerItemManagerData::loadFactories()
         }
 
         QStringList engineNames;
-        foreach (QOrganizerItemManagerEngineFactory* f, m_engines.values()) {
+        foreach (QOrganizerManagerEngineFactory* f, m_engines.values()) {
             QStringList versions;
             foreach (int v, f->supportedImplementationVersions()) {
                 versions << QString::fromAscii("%1").arg(v);
@@ -259,35 +259,35 @@ void QOrganizerItemManagerData::loadFactories()
 }
 
 /* Caller takes ownership of the id */
-QOrganizerItemEngineLocalId* QOrganizerItemManagerData::createEngineItemLocalId(const QString& uri)
+QOrganizerItemEngineLocalId* QOrganizerManagerData::createEngineItemLocalId(const QString& uri)
 {
     QString managerName;
-    QOrganizerItemManager::parseUri(uri, &managerName, NULL);
+    QOrganizerManager::parseUri(uri, &managerName, NULL);
 
     if (managerName == QLatin1String("memory"))
         return new QOrganizerItemMemoryEngineLocalId();
 
     loadFactories();
-    QOrganizerItemManagerEngineFactory *engineFactory = m_engines.value(managerName);
+    QOrganizerManagerEngineFactory *engineFactory = m_engines.value(managerName);
     return engineFactory ? engineFactory->createItemEngineLocalId() : NULL;
 }
 
 /* Caller takes ownership of the id */
-QOrganizerCollectionEngineLocalId* QOrganizerItemManagerData::createEngineCollectionLocalId(const QString& uri)
+QOrganizerCollectionEngineLocalId* QOrganizerManagerData::createEngineCollectionLocalId(const QString& uri)
 {
     QString managerName;
-    QOrganizerItemManager::parseUri(uri, &managerName, NULL);
+    QOrganizerManager::parseUri(uri, &managerName, NULL);
 
     if (managerName == QLatin1String("memory"))
         return new QOrganizerCollectionMemoryEngineLocalId();
 
     loadFactories();
-    QOrganizerItemManagerEngineFactory *engineFactory = m_engines.value(managerName);
+    QOrganizerManagerEngineFactory *engineFactory = m_engines.value(managerName);
     return engineFactory ? engineFactory->createCollectionEngineLocalId() : NULL;
 }
 
 // trampoline for private classes
-QOrganizerItemManagerEngine* QOrganizerItemManagerData::engine(const QOrganizerItemManager* manager)
+QOrganizerManagerEngine* QOrganizerManagerData::engine(const QOrganizerManager* manager)
 {
     if (manager)
         return manager->d->m_engine;
diff --git a/src/organizer/qorganizeritemmanager_p.h b/src/organizer/qorganizermanager_p.h
index 242ada26cc..66271f069a 100644
--- a/src/organizer/qorganizeritemmanager_p.h
+++ b/src/organizer/qorganizermanager_p.h
@@ -59,39 +59,39 @@
 #include <QList>
 #include <QString>
 
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemmanagerengine.h"
+#include "qorganizermanager.h"
+#include "qorganizermanagerengine.h"
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemManagerEngineFactory;
+class QOrganizerManagerEngineFactory;
 
 /* Data and stuff that is shared amongst all backends */
-class QOrganizerItemManagerData
+class QOrganizerManagerData
 {
 public:
-    QOrganizerItemManagerData()
+    QOrganizerManagerData()
         : m_engine(0),
-        m_error(QOrganizerItemManager::NoError)
+        m_error(QOrganizerManager::NoError)
     {
     }
 
-    ~QOrganizerItemManagerData()
+    ~QOrganizerManagerData()
     {
         delete m_engine;
     }
 
     void createEngine(const QString& managerName, const QMap<QString, QString>& parameters);
-    static QOrganizerItemManagerEngine* engine(const QOrganizerItemManager* manager);
+    static QOrganizerManagerEngine* engine(const QOrganizerManager* manager);
     static QOrganizerItemEngineLocalId* createEngineItemLocalId(const QString& uri);
     static QOrganizerCollectionEngineLocalId* createEngineCollectionLocalId(const QString& uri);
 
-    QOrganizerItemManagerEngine* m_engine;
-    QOrganizerItemManager::Error m_error;
-    QMap<int, QOrganizerItemManager::Error> m_errorMap;
+    QOrganizerManagerEngine* m_engine;
+    QOrganizerManager::Error m_error;
+    QMap<int, QOrganizerManager::Error> m_errorMap;
 
     /* Manager plugins */
-    static QHash<QString, QOrganizerItemManagerEngineFactory*> m_engines;
+    static QHash<QString, QOrganizerManagerEngineFactory*> m_engines;
     static bool m_discovered;
     static bool m_discoveredStatic;
     static QStringList m_pluginPaths;
@@ -99,7 +99,7 @@ public:
     static void loadStaticFactories();
 
 private:
-    Q_DISABLE_COPY(QOrganizerItemManagerData)
+    Q_DISABLE_COPY(QOrganizerManagerData)
 };
 
 
diff --git a/src/organizer/qorganizeritemmanagerengine.cpp b/src/organizer/qorganizermanagerengine.cpp
index d06ecec1f8..27feffdc03 100644
--- a/src/organizer/qorganizeritemmanagerengine.cpp
+++ b/src/organizer/qorganizermanagerengine.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qorganizeritemmanagerengine.h"
+#include "qorganizermanagerengine.h"
 #include "qorganizeritemenginelocalid.h"
 
 #include "qorganizeritemdetaildefinition.h"
@@ -47,8 +47,8 @@
 #include "qorganizeritemdetails.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilters.h"
-#include "qorganizeritemabstractrequest.h"
-#include "qorganizeritemabstractrequest_p.h"
+#include "qorganizerabstractrequest.h"
+#include "qorganizerabstractrequest_p.h"
 #include "qorganizeritemrequests.h"
 #include "qorganizeritemrequests_p.h"
 #include "qorganizeritem.h"
@@ -61,15 +61,15 @@
 QTM_BEGIN_NAMESPACE
 
 /*!
-  \class QOrganizerItemManagerEngine
-  \brief The QOrganizerItemManagerEngine class provides the interface for all
+  \class QOrganizerManagerEngine
+  \brief The QOrganizerManagerEngine class provides the interface for all
   implementations of the organizer item manager backend functionality.
 
   \inmodule QtOrganizer
   \ingroup organizer-backends
 
   Instances of this class are usually provided by a
-  \l QOrganizerItemManagerEngineFactory, which is loaded from a plugin.
+  \l QOrganizerManagerEngineFactory, which is loaded from a plugin.
 
   The default implementation of this interface provides a basic
   level of functionality for some functions so that specific engines
@@ -79,17 +79,17 @@ QTM_BEGIN_NAMESPACE
   More information on writing a organizer items engine plugin is available in
   the \l{Qt Organizer Manager Engines} documentation.
 
-  \sa QOrganizerItemManager, QOrganizerItemManagerEngineFactory
+  \sa QOrganizerManager, QOrganizerManagerEngineFactory
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::QOrganizerItemManagerEngine()
+  \fn QOrganizerManagerEngine::QOrganizerManagerEngine()
 
   A default, empty constructor.
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::dataChanged()
+  \fn QOrganizerManagerEngine::dataChanged()
 
   This signal is emitted some time after changes occur to the data managed by this
   engine, and the engine is unable to determine which changes occurred, or if the
@@ -104,7 +104,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::itemsAdded(const QList<QOrganizerItemLocalId>& organizeritemIds);
+  \fn QOrganizerManagerEngine::itemsAdded(const QList<QOrganizerItemLocalId>& organizeritemIds);
 
   This signal is emitted some time after a set of organizer items has been added to
   this engine where the \l dataChanged() signal was not emitted for those changes.
@@ -118,7 +118,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::itemsChanged(const QList<QOrganizerItemLocalId>& organizeritemIds);
+  \fn QOrganizerManagerEngine::itemsChanged(const QList<QOrganizerItemLocalId>& organizeritemIds);
 
   This signal is emitted some time after a set of organizer items has been modified in
   this engine where the \l dataChanged() signal was not emitted for those changes.
@@ -132,7 +132,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::itemsRemoved(const QList<QOrganizerItemLocalId>& organizeritemIds);
+  \fn QOrganizerManagerEngine::itemsRemoved(const QList<QOrganizerItemLocalId>& organizeritemIds);
 
   This signal is emitted some time after a set of organizer items has been removed from
   this engine where the \l dataChanged() signal was not emitted for those changes.
@@ -146,28 +146,28 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::collectionsAdded(const QList<QOrganizerCollectionLocalId>& collectionIds)
+  \fn QOrganizerManagerEngine::collectionsAdded(const QList<QOrganizerCollectionLocalId>& collectionIds)
   This signal should be emitted at some point once the collections identified by \a collectionIds have been added to a datastore managed by this engine.
   This signal must not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::collectionsChanged(const QList<QOrganizerCollectionLocalId>& collectionIds)
+  \fn QOrganizerManagerEngine::collectionsChanged(const QList<QOrganizerCollectionLocalId>& collectionIds)
   This signal should be emitted at some point once the metadata for the collections identified by \a collectionIds have been modified in a datastore managed by this engine.
   This signal is not emitted if one of the items in this collection has changed - itemsChanged() will be emitted instead.
   This signal must not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 /*!
-  \fn QOrganizerItemManagerEngine::collectionsRemoved(const QList<QOrganizerCollectionLocalId>& collectionIds)
+  \fn QOrganizerManagerEngine::collectionsRemoved(const QList<QOrganizerCollectionLocalId>& collectionIds)
   This signal should be emitted at some point once the collections identified by \a collectionIds have been removed from a datastore managed by this engine.
   This signal must not be emitted if the dataChanged() signal was previously emitted for these changes.
  */
 
 
 
-/*! Returns the manager name for this QOrganizerItemManagerEngine */
-QString QOrganizerItemManagerEngine::managerName() const
+/*! Returns the manager name for this QOrganizerManagerEngine */
+QString QOrganizerManagerEngine::managerName() const
 {
     return QString(QLatin1String("base"));
 }
@@ -177,7 +177,7 @@ QString QOrganizerItemManagerEngine::managerName() const
   the engine may have discarded unused or invalid parameters at the time of
   construction, and these will not be returned.
  */
-QMap<QString, QString> QOrganizerItemManagerEngine::managerParameters() const
+QMap<QString, QString> QOrganizerManagerEngine::managerParameters() const
 {
     return QMap<QString, QString>(); // default implementation requires no parameters.
 }
@@ -186,9 +186,9 @@ QMap<QString, QString> QOrganizerItemManagerEngine::managerParameters() const
   Returns the unique URI of this manager, which is built from the manager name and the parameters
   used to construct it.
  */
-QString QOrganizerItemManagerEngine::managerUri() const
+QString QOrganizerManagerEngine::managerUri() const
 {
-    return QOrganizerItemManager::buildUri(managerName(), managerParameters());
+    return QOrganizerManager::buildUri(managerName(), managerParameters());
 }
 
 /*!
@@ -197,7 +197,7 @@ QString QOrganizerItemManagerEngine::managerUri() const
   \a periodEnd date.
 
   If \a periodStart is after \a periodEnd, the operation will fail, and \a error will be set to \c
-  QOrganizerItemManager::BadArgumentError.
+  QOrganizerManager::BadArgumentError.
   If \a maxCount is negative, it is backend specific as to how many occurrences will be returned.
   Some backends may return no instances, others may return some limited number of occurrences.
 
@@ -214,7 +214,7 @@ QString QOrganizerItemManagerEngine::managerUri() const
   If the \a generator does not exist in the backend, or if there are no instances matching the
   criteria, an empty list should be returned.
   */
-QList<QOrganizerItem> QOrganizerItemManagerEngine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerManagerEngine::itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(generator);
     Q_UNUSED(periodStart);
@@ -222,7 +222,7 @@ QList<QOrganizerItem> QOrganizerItemManagerEngine::itemInstances(const QOrganize
     Q_UNUSED(maxCount);
     Q_UNUSED(fetchHint);
 
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItem>();
 }
 
@@ -231,14 +231,14 @@ QList<QOrganizerItem> QOrganizerItemManagerEngine::itemInstances(const QOrganize
   list of \a sortOrders.  Depending on the backend, this filtering operation may involve retrieving
   all the organizer items.  Any error which occurs will be saved in \a error.
  */
-QList<QOrganizerItemLocalId> QOrganizerItemManagerEngine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItemLocalId> QOrganizerManagerEngine::itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(startDate);
     Q_UNUSED(endDate);
     Q_UNUSED(filter);
     Q_UNUSED(sortOrders);
 
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItemLocalId>();
 }
 
@@ -263,14 +263,14 @@ QList<QOrganizerItemLocalId> QOrganizerItemManagerEngine::itemIds(const QDateTim
 
   \sa QOrganizerItemFetchHint
  */
-QList<QOrganizerItem> QOrganizerItemManagerEngine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerManagerEngine::items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(startDate);
     Q_UNUSED(endDate);
     Q_UNUSED(filter);
     Q_UNUSED(sortOrders);
     Q_UNUSED(fetchHint);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItem>();
 }
 
@@ -295,14 +295,14 @@ QList<QOrganizerItem> QOrganizerItemManagerEngine::items(const QDateTime& startD
 
   \sa QOrganizerItemFetchHint
  */
-QList<QOrganizerItem> QOrganizerItemManagerEngine::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QList<QOrganizerItem> QOrganizerManagerEngine::itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(startDate);
     Q_UNUSED(endDate);
     Q_UNUSED(filter);
     Q_UNUSED(sortOrders);
     Q_UNUSED(fetchHint);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerItem>();
 }
 
@@ -310,7 +310,7 @@ QList<QOrganizerItem> QOrganizerItemManagerEngine::itemsForExport(const QDateTim
   Returns the organizer item in the database identified by \a organizeritemId.
 
   If the item does not exist, an empty, default constructed QOrganizerItem will be returned,
-  and the \a error will be set to  \c QOrganizerItemManager::DoesNotExistError.
+  and the \a error will be set to  \c QOrganizerManager::DoesNotExistError.
 
   Any operation error which occurs will be saved in \a error.
 
@@ -323,18 +323,18 @@ QList<QOrganizerItem> QOrganizerItemManagerEngine::itemsForExport(const QDateTim
 
   \sa QOrganizerItemFetchHint
  */
-QOrganizerItem QOrganizerItemManagerEngine::item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const
+QOrganizerItem QOrganizerManagerEngine::item(const QOrganizerItemLocalId& organizeritemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(organizeritemId);
     Q_UNUSED(fetchHint);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QOrganizerItem();
 }
 
 /*!
   Returns true if the given \a feature is supported by this engine for organizer items of the given \a organizeritemType
  */
-bool QOrganizerItemManagerEngine::hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& organizeritemType) const
+bool QOrganizerManagerEngine::hasFeature(QOrganizerManager::ManagerFeature feature, const QString& organizeritemType) const
 {
     Q_UNUSED(feature);
     Q_UNUSED(organizeritemType);
@@ -361,7 +361,7 @@ bool QOrganizerItemManagerEngine::hasFeature(QOrganizerItemManager::ManagerFeatu
    \o A QOrganizerItemDetailRangeFilter with no range specified will be converted to a QOrganizerItemDetailFilter
   \endlist
 */
-QOrganizerItemFilter QOrganizerItemManagerEngine::canonicalizedFilter(const QOrganizerItemFilter &filter)
+QOrganizerItemFilter QOrganizerManagerEngine::canonicalizedFilter(const QOrganizerItemFilter &filter)
 {
     switch(filter.type()) {
         case QOrganizerItemFilter::IntersectionFilter:
@@ -468,7 +468,7 @@ QOrganizerItemFilter QOrganizerItemManagerEngine::canonicalizedFilter(const QOrg
   natively by this engine.  If not, the base class implementation
   will emulate the functionality.
  */
-bool QOrganizerItemManagerEngine::isFilterSupported(const QOrganizerItemFilter& filter) const
+bool QOrganizerManagerEngine::isFilterSupported(const QOrganizerItemFilter& filter) const
 {
     Q_UNUSED(filter);
 
@@ -481,9 +481,9 @@ bool QOrganizerItemManagerEngine::isFilterSupported(const QOrganizerItemFilter&
   for the \c QOrganizerItemType::FieldType field of the QOrganizerItemType definition
   which is valid in this engine.
  */
-QStringList QOrganizerItemManagerEngine::supportedItemTypes() const
+QStringList QOrganizerManagerEngine::supportedItemTypes() const
 {
-    QOrganizerItemManager::Error error;
+    QOrganizerManager::Error error;
     // XXX TODO: ensure that the TYPE field value for EVERY SINGLE TYPE contains all possible types...
     // XXX TODO: don't use TypeNote because some collections won't support Notes, only Journals / Events...
     QList<QVariant> allowableVals = detailDefinition(QOrganizerItemType::DefinitionName, QOrganizerItemType::TypeNote, &error).fields().value(QOrganizerItemType::FieldType).allowableValues();
@@ -494,7 +494,7 @@ QStringList QOrganizerItemManagerEngine::supportedItemTypes() const
 }
 
 /*!
-  \fn int QOrganizerItemManagerEngine::managerVersion() const
+  \fn int QOrganizerManagerEngine::managerVersion() const
 
   Returns the engine backend implementation version number
  */
@@ -503,7 +503,7 @@ QStringList QOrganizerItemManagerEngine::supportedItemTypes() const
    Returns the default schema definitions for the given \a version of the schema.
    Version 1 of the schema corresponds to version 1.1 of the Qt Mobility APIs.
  */
-QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemManagerEngine::schemaDefinitions(int version)
+QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerManagerEngine::schemaDefinitions(int version)
 {
     // This implementation provides the base schema.
     // The schema documentation (organizeritemsschema.qdoc)
@@ -657,7 +657,7 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
     f.setAllowableValues(QVariantList());
     fields.insert(QOrganizerItemRecurrence::FieldExceptionDates, f);
     fields.insert(QOrganizerItemRecurrence::FieldRecurrenceDates, f);
-    f.setDataType(qMetaTypeId< QSet<QOrganizerItemRecurrenceRule> >());
+    f.setDataType(qMetaTypeId< QSet<QOrganizerRecurrenceRule> >());
     fields.insert(QOrganizerItemRecurrence::FieldExceptionRules, f);
     fields.insert(QOrganizerItemRecurrence::FieldRecurrenceRules, f);
     d.setFields(fields);
@@ -730,14 +730,14 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
     retn.insert(d.name(), d);
 
     // event time range
-    d.setName(QOrganizerEventTimeRange::DefinitionName);
+    d.setName(QOrganizerEventTime::DefinitionName);
     fields.clear();
     f.setDataType(QVariant::DateTime);
     f.setAllowableValues(QVariantList());
-    fields.insert(QOrganizerEventTimeRange::FieldStartDateTime, f);
-    fields.insert(QOrganizerEventTimeRange::FieldEndDateTime, f);
+    fields.insert(QOrganizerEventTime::FieldStartDateTime, f);
+    fields.insert(QOrganizerEventTime::FieldEndDateTime, f);
     f.setDataType(QVariant::Bool);
-    fields.insert(QOrganizerEventTimeRange::FieldTimeSpecified, f);
+    fields.insert(QOrganizerEventTime::FieldTimeSpecified, f);
     d.setFields(fields);
     d.setUnique(true);
     retn.insert(d.name(), d);
@@ -861,14 +861,14 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
     retn.insert(d.name(), d);
 
     // event time range
-    d.setName(QOrganizerEventTimeRange::DefinitionName);
+    d.setName(QOrganizerEventTime::DefinitionName);
     fields.clear();
     f.setDataType(QVariant::DateTime);
     f.setAllowableValues(QVariantList());
-    fields.insert(QOrganizerEventTimeRange::FieldStartDateTime, f);
-    fields.insert(QOrganizerEventTimeRange::FieldEndDateTime, f);
+    fields.insert(QOrganizerEventTime::FieldStartDateTime, f);
+    fields.insert(QOrganizerEventTime::FieldEndDateTime, f);
     f.setDataType(QVariant::Bool);
-    fields.insert(QOrganizerEventTimeRange::FieldTimeSpecified, f);
+    fields.insert(QOrganizerEventTime::FieldTimeSpecified, f);
     d.setFields(fields);
     d.setUnique(true);
     retn.insert(d.name(), d);
@@ -1051,7 +1051,7 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
     f.setAllowableValues(QVariantList());
     fields.insert(QOrganizerItemRecurrence::FieldExceptionDates, f);
     fields.insert(QOrganizerItemRecurrence::FieldRecurrenceDates, f);
-    f.setDataType(qMetaTypeId< QSet<QOrganizerItemRecurrenceRule> >());
+    f.setDataType(qMetaTypeId< QSet<QOrganizerRecurrenceRule> >());
     fields.insert(QOrganizerItemRecurrence::FieldExceptionRules, f);
     fields.insert(QOrganizerItemRecurrence::FieldRecurrenceRules, f);
     d.setFields(fields);
@@ -1137,14 +1137,14 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
     retn.insert(d.name(), d);
 
     // todo time range
-    d.setName(QOrganizerTodoTimeRange::DefinitionName);
+    d.setName(QOrganizerTodoTime::DefinitionName);
     fields.clear();
     f.setDataType(QVariant::DateTime);
     f.setAllowableValues(QVariantList());
-    fields.insert(QOrganizerTodoTimeRange::FieldStartDateTime, f);
-    fields.insert(QOrganizerTodoTimeRange::FieldDueDateTime, f);
+    fields.insert(QOrganizerTodoTime::FieldStartDateTime, f);
+    fields.insert(QOrganizerTodoTime::FieldDueDateTime, f);
     f.setDataType(QVariant::Bool);
-    fields.insert(QOrganizerTodoTimeRange::FieldTimeSpecified, f);
+    fields.insert(QOrganizerTodoTime::FieldTimeSpecified, f);
     d.setFields(fields);
     d.setUnique(true);
     retn.insert(d.name(), d);
@@ -1332,14 +1332,14 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
     retn.insert(d.name(), d);
 
     // todo time range
-    d.setName(QOrganizerTodoTimeRange::DefinitionName);
+    d.setName(QOrganizerTodoTime::DefinitionName);
     fields.clear();
     f.setDataType(QVariant::DateTime);
     f.setAllowableValues(QVariantList());
-    fields.insert(QOrganizerTodoTimeRange::FieldStartDateTime, f);
-    fields.insert(QOrganizerTodoTimeRange::FieldDueDateTime, f);
+    fields.insert(QOrganizerTodoTime::FieldStartDateTime, f);
+    fields.insert(QOrganizerTodoTime::FieldDueDateTime, f);
     f.setDataType(QVariant::Bool);
-    fields.insert(QOrganizerTodoTimeRange::FieldTimeSpecified, f);
+    fields.insert(QOrganizerTodoTime::FieldTimeSpecified, f);
     d.setFields(fields);
     d.setUnique(true);
     retn.insert(d.name(), d);
@@ -1437,11 +1437,11 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
     retn.insert(d.name(), d);
 
     // journal time range
-    d.setName(QOrganizerJournalTimeRange::DefinitionName);
+    d.setName(QOrganizerJournalTime::DefinitionName);
     fields.clear();
     f.setDataType(QVariant::DateTime);
     f.setAllowableValues(QVariantList());
-    fields.insert(QOrganizerJournalTimeRange::FieldEntryDateTime, f);
+    fields.insert(QOrganizerJournalTime::FieldEntryDateTime, f);
     d.setFields(fields);
     d.setUnique(true);
     retn.insert(d.name(), d);
@@ -1483,7 +1483,7 @@ QMap<QString, QMap<QString, QOrganizerItemDetailDefinition> > QOrganizerItemMana
   Any errors encountered during this operation should be stored to
   \a error.
  */
-bool QOrganizerItemManagerEngine::validateItem(const QOrganizerItem& organizeritem, QOrganizerItemManager::Error* error) const
+bool QOrganizerManagerEngine::validateItem(const QOrganizerItem& organizeritem, QOrganizerManager::Error* error) const
 {
     QList<QString> uniqueDefinitionIds;
 
@@ -1492,15 +1492,15 @@ bool QOrganizerItemManagerEngine::validateItem(const QOrganizerItem& organizerit
         QVariantMap values = detail.variantValues();
         QOrganizerItemDetailDefinition def = detailDefinition(detail.definitionName(), organizeritem.type(), error);
         // check that the definition is supported
-        if (*error != QOrganizerItemManager::NoError) {
-            *error = QOrganizerItemManager::InvalidDetailError;
+        if (*error != QOrganizerManager::NoError) {
+            *error = QOrganizerManager::InvalidDetailError;
             return false; // this definition is not supported.
         }
 
         // check uniqueness
         if (def.isUnique()) {
             if (uniqueDefinitionIds.contains(def.name())) {
-                *error = QOrganizerItemManager::AlreadyExistsError;
+                *error = QOrganizerManager::AlreadyExistsError;
                 return false; // can't have two of a unique detail.
             }
             uniqueDefinitionIds.append(def.name());
@@ -1513,14 +1513,14 @@ bool QOrganizerItemManagerEngine::validateItem(const QOrganizerItem& organizerit
             const QVariant& variant = fieldIt.value();
             // check that no values exist for nonexistent fields.
             if (!def.fields().contains(key)) {
-                *error = QOrganizerItemManager::InvalidDetailError;
+                *error = QOrganizerManager::InvalidDetailError;
                 return false; // value for nonexistent field.
             }
 
             QOrganizerItemDetailFieldDefinition field = def.fields().value(key);
             // check that the type of each value corresponds to the allowable field type
             if (static_cast<int>(field.dataType()) != variant.userType()) {
-                *error = QOrganizerItemManager::InvalidDetailError;
+                *error = QOrganizerManager::InvalidDetailError;
                 return false; // type doesn't match.
             }
 
@@ -1533,13 +1533,13 @@ bool QOrganizerItemManagerEngine::validateItem(const QOrganizerItem& organizerit
                     QListIterator<QVariant> it(innerValues);
                     while (it.hasNext()) {
                         if (!field.allowableValues().contains(it.next())) {
-                            *error = QOrganizerItemManager::InvalidDetailError;
+                            *error = QOrganizerManager::InvalidDetailError;
                             return false; // value not allowed.
                         }
                     }
                 } else if (!field.allowableValues().contains(variant)) {
                     // the datatype is not a list; the value wasn't allowed.
-                    *error = QOrganizerItemManager::InvalidDetailError;
+                    *error = QOrganizerManager::InvalidDetailError;
                     return false; // value not allowed.
                 }
             }
@@ -1552,13 +1552,13 @@ bool QOrganizerItemManagerEngine::validateItem(const QOrganizerItem& organizerit
 /*!
   Returns true if the \a collection is valid and can be saved in the engine.
   By default, modifiable collections are not supported, so this function returns false,
-  and \a error is set to QOrganizerItemManager::NotSupportedError.
+  and \a error is set to QOrganizerManager::NotSupportedError.
   Engines which do implement mutable collections should reimplement this function.
  */
-bool QOrganizerItemManagerEngine::validateCollection(const QOrganizerCollection& collection, QOrganizerItemManager::Error* error) const
+bool QOrganizerManagerEngine::validateCollection(const QOrganizerCollection& collection, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(collection);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
@@ -1574,15 +1574,15 @@ bool QOrganizerItemManagerEngine::validateCollection(const QOrganizerCollection&
   Any errors encountered during this operation should be stored to
   \a error.
  */
-bool QOrganizerItemManagerEngine::validateDefinition(const QOrganizerItemDetailDefinition& definition, QOrganizerItemManager::Error* error) const
+bool QOrganizerManagerEngine::validateDefinition(const QOrganizerItemDetailDefinition& definition, QOrganizerManager::Error* error) const
 {
     if (definition.name().isEmpty()) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
     if (definition.fields().count() == 0) {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
 
@@ -1591,19 +1591,19 @@ bool QOrganizerItemManagerEngine::validateDefinition(const QOrganizerItemDetailD
     while(it.hasNext()) {
         it.next();
         if (it.key().isEmpty()) {
-            *error = QOrganizerItemManager::BadArgumentError;
+            *error = QOrganizerManager::BadArgumentError;
             return false;
         }
 
         // Check that each allowed value is the same type
         for (int i=0; i < it.value().allowableValues().count(); i++) {
             if (it.value().allowableValues().at(i).userType() != it.value().dataType()) {
-                *error = QOrganizerItemManager::BadArgumentError;
+                *error = QOrganizerManager::BadArgumentError;
                 return false;
             }
         }
     }
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     return true;
 }
 
@@ -1613,10 +1613,10 @@ bool QOrganizerItemManagerEngine::validateDefinition(const QOrganizerItemDetailD
   Any errors encountered during this operation should be stored to
   \a error.
  */
-QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemManagerEngine::detailDefinitions(const QString& organizeritemType, QOrganizerItemManager::Error* error) const
+QMap<QString, QOrganizerItemDetailDefinition> QOrganizerManagerEngine::detailDefinitions(const QString& organizeritemType, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(organizeritemType);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QMap<QString, QOrganizerItemDetailDefinition>();
 }
 
@@ -1628,14 +1628,14 @@ QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemManagerEngine::detai
   Any errors encountered during this operation should be stored to
   \a error.
  */
-QOrganizerItemDetailDefinition QOrganizerItemManagerEngine::detailDefinition(const QString& definitionName, const QString& organizeritemType, QOrganizerItemManager::Error* error) const
+QOrganizerItemDetailDefinition QOrganizerManagerEngine::detailDefinition(const QString& definitionName, const QString& organizeritemType, QOrganizerManager::Error* error) const
 {
     QMap<QString, QOrganizerItemDetailDefinition> definitions = detailDefinitions(organizeritemType, error);
     if (definitions.contains(definitionName))  {
-        *error = QOrganizerItemManager::NoError;
+        *error = QOrganizerManager::NoError;
         return definitions.value(definitionName);
     } else {
-        *error = QOrganizerItemManager::DoesNotExistError;
+        *error = QOrganizerManager::DoesNotExistError;
         return QOrganizerItemDetailDefinition();
     }
 }
@@ -1651,12 +1651,12 @@ QOrganizerItemDetailDefinition QOrganizerItemManagerEngine::detailDefinition(con
   Any errors encountered during this operation should be stored to
   \a error.
  */
-bool QOrganizerItemManagerEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& organizeritemType, QOrganizerManager::Error* error)
 {
     Q_UNUSED(def);
     Q_UNUSED(organizeritemType);
 
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
@@ -1671,12 +1671,12 @@ bool QOrganizerItemManagerEngine::saveDetailDefinition(const QOrganizerItemDetai
   Any errors encountered during this operation should be stored to
   \a error.
  */
-bool QOrganizerItemManagerEngine::removeDetailDefinition(const QString& definitionName, const QString& organizeritemType, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::removeDetailDefinition(const QString& definitionName, const QString& organizeritemType, QOrganizerManager::Error* error)
 {
     Q_UNUSED(definitionName);
     Q_UNUSED(organizeritemType);
 
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
@@ -1690,7 +1690,7 @@ bool QOrganizerItemManagerEngine::removeDetailDefinition(const QString& definiti
   Application code should not call this function, since validation of the
   detail will happen in the engine in any case.
  */
-void QOrganizerItemManagerEngine::setDetailAccessConstraints(QOrganizerItemDetail *detail, QOrganizerItemDetail::AccessConstraints constraints)
+void QOrganizerManagerEngine::setDetailAccessConstraints(QOrganizerItemDetail *detail, QOrganizerItemDetail::AccessConstraints constraints)
 {
     if (detail) {
         QOrganizerItemDetailPrivate::setAccessConstraints(detail, constraints);
@@ -1704,17 +1704,17 @@ void QOrganizerItemManagerEngine::setDetailAccessConstraints(QOrganizerItemDetai
   the database which has the same id to be the given \a organizeritem.
   If the id is non-zero but does not identify any item stored in the
   manager, the function will return false and \a error will be set to
-  \c QOrganizerItemManager::DoesNotExistError.
+  \c QOrganizerManager::DoesNotExistError.
 
   The \a organizeritem will be added to the collection identified by the given
   \a collectionId if it exists, and the item conforms to the schema supported
   for that collection.  If the collection exists but the item does not conform
   to the schema supported for that collection, the function will return false,
-  and the \a error will be set to QOrganizerItemManager::InvalidDetailError.
+  and the \a error will be set to QOrganizerManager::InvalidDetailError.
 
   If the given \a collectionId is not the default (zero) id, but does not identify
   a valid collection, the function will return false, and \a error will be set
-  to QOrganizerItemManager::InvalidCollectionError.  If the given \a collectionId
+  to QOrganizerManager::InvalidCollectionError.  If the given \a collectionId
   is the default (zero) id, the item should be saved in the collection in which
   it is already saved (if it is already saved in this manager), or in the default
   collection (if it is a new item in this manager).
@@ -1726,14 +1726,14 @@ void QOrganizerItemManagerEngine::setDetailAccessConstraints(QOrganizerItemDetai
 
   \sa managerUri()
  */
-bool QOrganizerItemManagerEngine::saveItem(QOrganizerItem* organizeritem, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::saveItem(QOrganizerItem* organizeritem, QOrganizerManager::Error* error)
 {
     // Convert to a list op
     if (organizeritem) {
         QList<QOrganizerItem> list;
         list.append(*organizeritem);
 
-        QMap<int, QOrganizerItemManager::Error> errors;
+        QMap<int, QOrganizerManager::Error> errors;
         bool ret = saveItems(&list, &errors, error);
 
         if (errors.count() > 0)
@@ -1742,7 +1742,7 @@ bool QOrganizerItemManagerEngine::saveItem(QOrganizerItem* organizeritem, QOrgan
         *organizeritem = list.value(0);
         return ret;
     } else {
-        *error = QOrganizerItemManager::BadArgumentError;
+        *error = QOrganizerManager::BadArgumentError;
         return false;
     }
 }
@@ -1757,13 +1757,13 @@ bool QOrganizerItemManagerEngine::saveItem(QOrganizerItem* organizeritem, QOrgan
 
   The default implementation will convert this into a call to removeItems.
  */
-bool QOrganizerItemManagerEngine::removeItem(const QOrganizerItemLocalId& organizeritemId, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::removeItem(const QOrganizerItemLocalId& organizeritemId, QOrganizerManager::Error* error)
 {
     // Convert to a list op
     QList<QOrganizerItemLocalId> list;
     list.append(organizeritemId);
 
-    QMap<int, QOrganizerItemManager::Error> errors;
+    QMap<int, QOrganizerManager::Error> errors;
     bool ret = removeItems(list, &errors, error);
 
     if (errors.count() > 0)
@@ -1779,7 +1779,7 @@ bool QOrganizerItemManagerEngine::removeItem(const QOrganizerItemLocalId& organi
   The engine might populate \a errorMap (the map of indices of the \a organizeritems list to
   the error which occurred when saving the item at that index) for
   every index for which the item could not be saved, if it is able.
-  The \l QOrganizerItemManager::error() function will only return \c QOrganizerItemManager::NoError
+  The \l QOrganizerManager::error() function will only return \c QOrganizerManager::NoError
   if all organizer items were saved successfully.
 
   For each newly saved item that was successful, the id of the item
@@ -1791,11 +1791,11 @@ bool QOrganizerItemManagerEngine::removeItem(const QOrganizerItemLocalId& organi
   for that collection.  If the collection exists but an item does not conform
   to the schema supported for that collection, the function will return false,
   and the error in the \a errorMap for the item at that index will be set to
-  QOrganizerItemManager::InvalidDetailError.
+  QOrganizerManager::InvalidDetailError.
 
   If the given \a collectionId is not the default (zero) id, but does not identify
   a valid collection, the function will return false, and \a error will be set
-  to QOrganizerItemManager::InvalidCollectionError.  If the given \a collectionId
+  to QOrganizerManager::InvalidCollectionError.  If the given \a collectionId
   is the default (zero) id, the items should be saved in the collection in which
   they is already saved (if they are already saved in this manager), or in the default
   collection (if they are new items in this manager).
@@ -1803,14 +1803,14 @@ bool QOrganizerItemManagerEngine::removeItem(const QOrganizerItemLocalId& organi
   Any errors encountered during this operation should be stored to
   \a error.
 
-  \sa QOrganizerItemManager::saveItem()
+  \sa QOrganizerManager::saveItem()
  */
-bool QOrganizerItemManagerEngine::saveItems(QList<QOrganizerItem>* organizeritems, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::saveItems(QList<QOrganizerItem>* organizeritems, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     Q_UNUSED(organizeritems);
     Q_UNUSED(errorMap);
 
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
@@ -1825,26 +1825,26 @@ bool QOrganizerItemManagerEngine::saveItems(QList<QOrganizerItem>* organizeritem
   The manager might populate \a errorMap (the map of indices of the \a organizeritemIds list to
   the error which occurred when saving the item at that index) for every
   index for which the item could not be removed, if it is able.
-  The \l QOrganizerItemManager::error() function will
-  only return \c QOrganizerItemManager::NoError if all organizer items were removed
+  The \l QOrganizerManager::error() function will
+  only return \c QOrganizerManager::NoError if all organizer items were removed
   successfully.
 
   If the list contains ids which do not identify a valid item in the manager, the function will
   remove any organizer items which are identified by ids in the \a organizeritemIds list, insert
-  \c QOrganizerItemManager::DoesNotExist entries into the \a errorMap for the indices of invalid ids
+  \c QOrganizerManager::DoesNotExist entries into the \a errorMap for the indices of invalid ids
   in the \a organizeritemIds list, return false, and set the overall operation error to
-  \c QOrganizerItemManager::DoesNotExistError.
+  \c QOrganizerManager::DoesNotExistError.
 
   Any errors encountered during this operation should be stored to
   \a error.
 
-  \sa QOrganizerItemManager::removeItem()
+  \sa QOrganizerManager::removeItem()
  */
-bool QOrganizerItemManagerEngine::removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::removeItems(const QList<QOrganizerItemLocalId>& organizeritemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error)
 {
     Q_UNUSED(organizeritemIds);
     Q_UNUSED(errorMap);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
@@ -1853,9 +1853,9 @@ bool QOrganizerItemManagerEngine::removeItems(const QList<QOrganizerItemLocalId>
     Any errors encountered during this operation should be stored to
    \a error.
 */
-QOrganizerCollection QOrganizerItemManagerEngine::defaultCollection(QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerManagerEngine::defaultCollection(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QOrganizerCollection();
 }
 
@@ -1863,12 +1863,12 @@ QOrganizerCollection QOrganizerItemManagerEngine::defaultCollection(QOrganizerIt
     Returns the collection identified by the given \a collectionId in the manager.
     Any errors encountered during this operation should be stored to \a error.
     If the given \a collectionId does not specify a valid collection, \a error will
-    be set to \c QOrganizerItemManager::DoesNotExistError.
+    be set to \c QOrganizerManager::DoesNotExistError.
 */
-QOrganizerCollection QOrganizerItemManagerEngine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerManagerEngine::collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(collectionId);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QOrganizerCollection();
 }
 
@@ -1877,9 +1877,9 @@ QOrganizerCollection QOrganizerItemManagerEngine::collection(const QOrganizerCol
     Any errors encountered during this operation should be stored to
     \a error.
  */
-QList<QOrganizerCollection> QOrganizerItemManagerEngine::collections(QOrganizerItemManager::Error* error) const
+QList<QOrganizerCollection> QOrganizerManagerEngine::collections(QOrganizerManager::Error* error) const
 {
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QList<QOrganizerCollection>();
 }
 
@@ -1888,11 +1888,11 @@ QList<QOrganizerCollection> QOrganizerItemManagerEngine::collections(QOrganizerI
     Any errors encountered during this operation should be stored to
     \a error.
 */
-bool QOrganizerItemManagerEngine::saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error)
 {
     Q_UNUSED(collection);
 
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
@@ -1901,11 +1901,11 @@ bool QOrganizerItemManagerEngine::saveCollection(QOrganizerCollection* collectio
     Any errors encountered during this operation should be stored to
     \a error.
 */
-bool QOrganizerItemManagerEngine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error)
+bool QOrganizerManagerEngine::removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error)
 {
     Q_UNUSED(collectionId);
 
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return false;
 }
 
@@ -1915,12 +1915,12 @@ bool QOrganizerItemManagerEngine::removeCollection(const QOrganizerCollectionLoc
   in the item are ignored entirely when considering compatibility with the backend, as they are
   saved and validated separately.  Any error which occurs will be saved to \a error.
  */
-QOrganizerItem QOrganizerItemManagerEngine::compatibleItem(const QOrganizerItem& original, QOrganizerItemManager::Error* error) const
+QOrganizerItem QOrganizerManagerEngine::compatibleItem(const QOrganizerItem& original, QOrganizerManager::Error* error) const
 {
     QOrganizerItem conforming;
     conforming.setType(original.type());
     conforming.setId(original.id());
-    QOrganizerItemManager::Error tempError;
+    QOrganizerManager::Error tempError;
     QList<QString> uniqueDefinitionIds;
     foreach (QOrganizerItemDetail detail, original.details()) {
         // check that the detail conforms to the definition in this manager.
@@ -1929,7 +1929,7 @@ QOrganizerItem QOrganizerItemManagerEngine::compatibleItem(const QOrganizerItem&
         QVariantMap values = detail.variantValues();
         QOrganizerItemDetailDefinition def = detailDefinition(detail.definitionName(), original.type(), &tempError);
         // check that the definition is supported
-        if (tempError != QOrganizerItemManager::NoError) {
+        if (tempError != QOrganizerManager::NoError) {
             continue; // this definition is not supported.
         }
 
@@ -1986,9 +1986,9 @@ QOrganizerItem QOrganizerItemManagerEngine::compatibleItem(const QOrganizerItem&
         }
     }
 
-    *error = QOrganizerItemManager::NoError;
+    *error = QOrganizerManager::NoError;
     if (conforming.isEmpty())
-        *error = QOrganizerItemManager::DoesNotExistError;
+        *error = QOrganizerManager::DoesNotExistError;
     return conforming;
 }
 
@@ -1998,10 +1998,10 @@ QOrganizerItem QOrganizerItemManagerEngine::compatibleItem(const QOrganizerItem&
   By default, modifiable collections are not supported, and so this function always returns false.
   Any engine which supports mutable collections should reimplement this function.
  */
-QOrganizerCollection QOrganizerItemManagerEngine::compatibleCollection(const QOrganizerCollection& original, QOrganizerItemManager::Error* error) const
+QOrganizerCollection QOrganizerManagerEngine::compatibleCollection(const QOrganizerCollection& original, QOrganizerManager::Error* error) const
 {
     Q_UNUSED(original);
-    *error = QOrganizerItemManager::NotSupportedError;
+    *error = QOrganizerManager::NotSupportedError;
     return QOrganizerCollection();
 }
 
@@ -2018,7 +2018,7 @@ QOrganizerCollection QOrganizerItemManagerEngine::compatibleCollection(const QOr
   The results are undefined if the variants are different types, or
   cannot be compared.
  */
-int QOrganizerItemManagerEngine::compareVariant(const QVariant& first, const QVariant& second, Qt::CaseSensitivity sensitivity)
+int QOrganizerManagerEngine::compareVariant(const QVariant& first, const QVariant& second, Qt::CaseSensitivity sensitivity)
 {
     switch(first.type()) {
         case QVariant::Int:
@@ -2072,7 +2072,7 @@ int QOrganizerItemManagerEngine::compareVariant(const QVariant& first, const QVa
 
   This function will test each condition in the filter, possibly recursing.
  */
-bool QOrganizerItemManagerEngine::testFilter(const QOrganizerItemFilter &filter, const QOrganizerItem &organizeritem)
+bool QOrganizerManagerEngine::testFilter(const QOrganizerItemFilter &filter, const QOrganizerItem &organizeritem)
 {
     switch(filter.type()) {
         case QOrganizerItemFilter::InvalidFilter:
@@ -2320,7 +2320,7 @@ bool QOrganizerItemManagerEngine::testFilter(const QOrganizerItemFilter &filter,
     return false;
 }
 
-bool QOrganizerItemManagerEngine::isItemBetweenDates(const QOrganizerItem& item, const QDateTime& startPeriod, const QDateTime& endPeriod)
+bool QOrganizerManagerEngine::isItemBetweenDates(const QOrganizerItem& item, const QDateTime& startPeriod, const QDateTime& endPeriod)
 {
     if (startPeriod.isNull() && endPeriod.isNull())
         return true;
@@ -2329,11 +2329,11 @@ bool QOrganizerItemManagerEngine::isItemBetweenDates(const QOrganizerItem& item,
     QDateTime itemDateEnd;
 
     if (item.type() == QOrganizerItemType::TypeEvent || item.type() == QOrganizerItemType::TypeEventOccurrence) {
-        QOrganizerEventTimeRange etr = item.detail<QOrganizerEventTimeRange>();
+        QOrganizerEventTime etr = item.detail<QOrganizerEventTime>();
         itemDateStart = etr.startDateTime();
         itemDateEnd = etr.endDateTime();
     } else if (item.type() == QOrganizerItemType::TypeTodo || item.type() == QOrganizerItemType::TypeTodoOccurrence) {
-        QOrganizerTodoTimeRange ttr = item.detail<QOrganizerTodoTimeRange>();
+        QOrganizerTodoTime ttr = item.detail<QOrganizerTodoTime>();
         itemDateStart = ttr.startDateTime();
         itemDateEnd = ttr.dueDateTime();
     } else if (item.type() == QOrganizerItemType::TypeJournal) {
@@ -2373,7 +2373,7 @@ bool QOrganizerItemManagerEngine::isItemBetweenDates(const QOrganizerItem& item,
   before \a b according to the sort order, a positive number if \a a should appear after \a b according to the sort order,
   and zero if the two are unable to be sorted.
  */
-int QOrganizerItemManagerEngine::compareItem(const QOrganizerItem& a, const QOrganizerItem& b, const QList<QOrganizerItemSortOrder>& sortOrders)
+int QOrganizerManagerEngine::compareItem(const QOrganizerItem& a, const QOrganizerItem& b, const QList<QOrganizerItemSortOrder>& sortOrders)
 {
     QList<QOrganizerItemSortOrder> copy = sortOrders;
     while (copy.size()) {
@@ -2422,7 +2422,7 @@ int QOrganizerItemManagerEngine::compareItem(const QOrganizerItem& a, const QOrg
   in the \a sorted list, the second QOrganizerItemSortOrder in the list is used (and so on until either the item is inserted
   or there are no more sort order objects in the list).
  */
-void QOrganizerItemManagerEngine::addSorted(QList<QOrganizerItem>* sorted, const QOrganizerItem& toAdd, const QList<QOrganizerItemSortOrder>& sortOrders)
+void QOrganizerManagerEngine::addSorted(QList<QOrganizerItem>* sorted, const QOrganizerItem& toAdd, const QList<QOrganizerItemSortOrder>& sortOrders)
 {
     if (sortOrders.count() > 0) {
         for (int i = 0; i < sorted->size(); i++) {
@@ -2440,13 +2440,13 @@ void QOrganizerItemManagerEngine::addSorted(QList<QOrganizerItem>* sorted, const
 }
 
 /*! Sorts the given list of organizer items \a cs according to the provided \a sortOrders */
-QList<QOrganizerItemLocalId> QOrganizerItemManagerEngine::sortItems(const QList<QOrganizerItem>& cs, const QList<QOrganizerItemSortOrder>& sortOrders)
+QList<QOrganizerItemLocalId> QOrganizerManagerEngine::sortItems(const QList<QOrganizerItem>& cs, const QList<QOrganizerItemSortOrder>& sortOrders)
 {
     QList<QOrganizerItemLocalId> sortedIds;
     QList<QOrganizerItem> sortedOrganizerItems;
     if (!sortOrders.isEmpty()) {
         foreach (const QOrganizerItem& c, cs) {
-            QOrganizerItemManagerEngine::addSorted(&sortedOrganizerItems, c, sortOrders);
+            QOrganizerManagerEngine::addSorted(&sortedOrganizerItems, c, sortOrders);
         }
 
         foreach(const QOrganizerItem& c, sortedOrganizerItems) {
@@ -2464,7 +2464,7 @@ QList<QOrganizerItemLocalId> QOrganizerItemManagerEngine::sortItems(const QList<
   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.
  */
-QOrganizerItemEngineLocalId* QOrganizerItemManagerEngine::engineLocalItemId(const QOrganizerItemLocalId& localId)
+QOrganizerItemEngineLocalId* QOrganizerManagerEngine::engineLocalItemId(const QOrganizerItemLocalId& localId)
 {
     return localId.d;
 }
@@ -2473,7 +2473,7 @@ QOrganizerItemEngineLocalId* QOrganizerItemManagerEngine::engineLocalItemId(cons
   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.
  */
-QOrganizerCollectionEngineLocalId* QOrganizerItemManagerEngine::engineLocalCollectionId(const QOrganizerCollectionLocalId& localId)
+QOrganizerCollectionEngineLocalId* QOrganizerManagerEngine::engineLocalCollectionId(const QOrganizerCollectionLocalId& localId)
 {
     return localId.d;
 }
@@ -2491,14 +2491,14 @@ QOrganizerCollectionEngineLocalId* QOrganizerItemManagerEngine::engineLocalColle
   
   This means that if there is a worker thread, the engine needs to let that thread know that the
   request object is not valid and block until that thread acknowledges it.  One way to do this is to
-  have a QSet<QOrganizerItemAbstractRequest*> (or QMap<QOrganizerItemAbstractRequest,
+  have a QSet<QOrganizerAbstractRequest*> (or QMap<QOrganizerAbstractRequest,
   MyCustomRequestState>) that tracks active requests, and insert into that set in startRequest, and
   remove in requestDestroyed (or when it finishes or is cancelled).  Protect that set/map with a
   mutex, and make sure you take the mutex in the worker thread before calling any of the
-  QOrganizerItemAbstractRequest::updateXXXXXXRequest functions.  And be careful of lock ordering
+  QOrganizerAbstractRequest::updateXXXXXXRequest functions.  And be careful of lock ordering
   problems :D
  */
-void QOrganizerItemManagerEngine::requestDestroyed(QOrganizerItemAbstractRequest* req)
+void QOrganizerManagerEngine::requestDestroyed(QOrganizerAbstractRequest* req)
 {
     Q_UNUSED(req);
 }
@@ -2522,9 +2522,9 @@ void QOrganizerItemManagerEngine::requestDestroyed(QOrganizerItemAbstractRequest
   the request is still valid, and that function should block until the worker thread (etc.) has been
   notified not to touch that request any more.
 
-  \sa QOrganizerItemAbstractRequest::start()
+  \sa QOrganizerAbstractRequest::start()
  */
-bool QOrganizerItemManagerEngine::startRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerManagerEngine::startRequest(QOrganizerAbstractRequest* req)
 {
     Q_UNUSED(req);
     return false;
@@ -2536,9 +2536,9 @@ bool QOrganizerItemManagerEngine::startRequest(QOrganizerItemAbstractRequest* re
   Returns true if cancellation of the request was started successfully,
   otherwise returns false.
 
-  \sa startRequest(), QOrganizerItemAbstractRequest::cancel()
+  \sa startRequest(), QOrganizerAbstractRequest::cancel()
  */
-bool QOrganizerItemManagerEngine::cancelRequest(QOrganizerItemAbstractRequest* req)
+bool QOrganizerManagerEngine::cancelRequest(QOrganizerAbstractRequest* req)
 {
     Q_UNUSED(req);
     return false;
@@ -2548,14 +2548,14 @@ bool QOrganizerItemManagerEngine::cancelRequest(QOrganizerItemAbstractRequest* r
   Blocks until the manager engine has completed the given request \a req
   which was previously started, or until \a msecs milliseconds have passed.
   Returns true if the request was completed, and false if the request was not in the
-  \c QOrganizerItemAbstractRequest::Active state or no progress could be reported.
+  \c QOrganizerAbstractRequest::Active state or no progress could be reported.
 
   It is important that this function is implemented by the engine, at least merely as a delay, since
   clients may call it in a loop.
 
   \sa startRequest()
  */
-bool QOrganizerItemManagerEngine::waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs)
+bool QOrganizerManagerEngine::waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs)
 {
     Q_UNUSED(req);
     Q_UNUSED(msecs);
@@ -2567,7 +2567,7 @@ bool QOrganizerItemManagerEngine::waitForRequestFinished(QOrganizerItemAbstractR
   of the request.  If the new state is different, the stateChanged() signal
   will be emitted by the request.
  */
-void QOrganizerItemManagerEngine::updateRequestState(QOrganizerItemAbstractRequest* req, QOrganizerItemAbstractRequest::State state)
+void QOrganizerManagerEngine::updateRequestState(QOrganizerAbstractRequest* req, QOrganizerAbstractRequest::State state)
 {
     if (req) {
         QMutexLocker ml(&req->d_ptr->m_mutex);
@@ -2587,7 +2587,7 @@ void QOrganizerItemManagerEngine::updateRequestState(QOrganizerItemAbstractReque
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateItemInstanceFetchRequest(QOrganizerItemInstanceFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateItemInstanceFetchRequest(QOrganizerItemInstanceFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemInstanceFetchRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2612,7 +2612,7 @@ void QOrganizerItemManagerEngine::updateItemInstanceFetchRequest(QOrganizerItemI
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateItemLocalIdFetchRequest(QOrganizerItemLocalIdFetchRequest* req, const QList<QOrganizerItemLocalId>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateItemLocalIdFetchRequest(QOrganizerItemLocalIdFetchRequest* req, const QList<QOrganizerItemLocalId>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemLocalIdFetchRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2637,7 +2637,7 @@ void QOrganizerItemManagerEngine::updateItemLocalIdFetchRequest(QOrganizerItemLo
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateItemFetchRequest(QOrganizerItemFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateItemFetchRequest(QOrganizerItemFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemFetchRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2662,7 +2662,7 @@ void QOrganizerItemManagerEngine::updateItemFetchRequest(QOrganizerItemFetchRequ
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateItemFetchForExportRequest(QOrganizerItemFetchForExportRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateItemFetchForExportRequest(QOrganizerItemFetchForExportRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemFetchForExportRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2687,7 +2687,7 @@ void QOrganizerItemManagerEngine::updateItemFetchForExportRequest(QOrganizerItem
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateItemRemoveRequest(QOrganizerItemRemoveRequest* req, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateItemRemoveRequest(QOrganizerItemRemoveRequest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemRemoveRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2712,7 +2712,7 @@ void QOrganizerItemManagerEngine::updateItemRemoveRequest(QOrganizerItemRemoveRe
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateItemSaveRequest(QOrganizerItemSaveRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateItemSaveRequest(QOrganizerItemSaveRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemSaveRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2738,7 +2738,7 @@ void QOrganizerItemManagerEngine::updateItemSaveRequest(QOrganizerItemSaveReques
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateDefinitionSaveRequest(QOrganizerItemDetailDefinitionSaveRequest* req, const QList<QOrganizerItemDetailDefinition>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateDefinitionSaveRequest(QOrganizerItemDetailDefinitionSaveRequest* req, const QList<QOrganizerItemDetailDefinition>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemDetailDefinitionSaveRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2764,7 +2764,7 @@ void QOrganizerItemManagerEngine::updateDefinitionSaveRequest(QOrganizerItemDeta
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateDefinitionRemoveRequest(QOrganizerItemDetailDefinitionRemoveRequest* req, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateDefinitionRemoveRequest(QOrganizerItemDetailDefinitionRemoveRequest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemDetailDefinitionRemoveRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2789,7 +2789,7 @@ void QOrganizerItemManagerEngine::updateDefinitionRemoveRequest(QOrganizerItemDe
 
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateDefinitionFetchRequest(QOrganizerItemDetailDefinitionFetchRequest* req, const QMap<QString, QOrganizerItemDetailDefinition>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateDefinitionFetchRequest(QOrganizerItemDetailDefinitionFetchRequest* req, const QMap<QString, QOrganizerItemDetailDefinition>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerItemDetailDefinitionFetchRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2814,7 +2814,7 @@ void QOrganizerItemManagerEngine::updateDefinitionFetchRequest(QOrganizerItemDet
   It then causes the request to emit its resultsAvailable() signal to notify clients of the request progress.
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateCollectionFetchRequest(QOrganizerCollectionFetchRequest* req, const QList<QOrganizerCollection>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateCollectionFetchRequest(QOrganizerCollectionFetchRequest* req, const QList<QOrganizerCollection>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerCollectionFetchRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2838,7 +2838,7 @@ void QOrganizerItemManagerEngine::updateCollectionFetchRequest(QOrganizerCollect
   It then causes the request to emit its resultsAvailable() signal to notify clients of the request progress.
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateCollectionRemoveRequest(QOrganizerCollectionRemoveRequest* req, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateCollectionRemoveRequest(QOrganizerCollectionRemoveRequest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerCollectionRemoveRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2862,7 +2862,7 @@ void QOrganizerItemManagerEngine::updateCollectionRemoveRequest(QOrganizerCollec
   It then causes the request to emit its resultsAvailable() signal to notify clients of the request progress.
   If the new request state is different from the previous state, the stateChanged() signal will also be emitted from the request.
  */
-void QOrganizerItemManagerEngine::updateCollectionSaveRequest(QOrganizerCollectionSaveRequest* req, const QList<QOrganizerCollection>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState)
+void QOrganizerManagerEngine::updateCollectionSaveRequest(QOrganizerCollectionSaveRequest* req, const QList<QOrganizerCollection>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState)
 {
     if (req) {
         QWeakPointer<QOrganizerCollectionSaveRequest> ireq(req); // Take this in case the first emit deletes us
@@ -2881,6 +2881,6 @@ void QOrganizerItemManagerEngine::updateCollectionSaveRequest(QOrganizerCollecti
 }
 
 
-#include "moc_qorganizeritemmanagerengine.cpp"
+#include "moc_qorganizermanagerengine.cpp"
 
 QTM_END_NAMESPACE
diff --git a/src/organizer/qorganizeritemmanagerengine.h b/src/organizer/qorganizermanagerengine.h
index 067c97233f..7dd5833ef1 100644
--- a/src/organizer/qorganizeritemmanagerengine.h
+++ b/src/organizer/qorganizermanagerengine.h
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 
-#ifndef QORGANIZERITEMMANAGERENGINE_H
-#define QORGANIZERITEMMANAGERENGINE_H
+#ifndef QORGANIZERMANAGERENGINE_H
+#define QORGANIZERMANAGERENGINE_H
 
 #include <QSharedData>
 #include <QMap>
@@ -55,8 +55,8 @@
 #include "qorganizercollectionid.h"
 #include "qorganizeritem.h"
 #include "qorganizeritemdetaildefinition.h"
-#include "qorganizeritemmanager.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizermanager.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemfetchhint.h"
 #include "qorganizeritemrequests.h"
 
@@ -77,12 +77,12 @@ class QOrganizerItemDetailDefinitionRemoveRequest;
 class QOrganizerItemDetailDefinitionFetchRequest;
 class QOrganizerItemFetchForExportRequest;
 
-class Q_ORGANIZER_EXPORT QOrganizerItemManagerEngine : public QObject
+class Q_ORGANIZER_EXPORT QOrganizerManagerEngine : public QObject
 {
     Q_OBJECT
 
 public:
-    QOrganizerItemManagerEngine() {}
+    QOrganizerManagerEngine() {}
 
     /* URI reporting */
     virtual QString managerName() const = 0;                       // e.g. "Symbian"
@@ -93,48 +93,48 @@ public:
     QString managerUri() const;
 
     /* Filtering */
-    virtual QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    virtual QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerItemManager::Error* error) const;
-    virtual QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    virtual QList<QOrganizerItem> itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
-    virtual QOrganizerItem item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerItemManager::Error* error) const;
+    virtual QList<QOrganizerItem> itemInstances(const QOrganizerItem& generator, const QDateTime& periodStart, const QDateTime& periodEnd, int maxCount, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    virtual QList<QOrganizerItemLocalId> itemIds(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, QOrganizerManager::Error* error) const;
+    virtual QList<QOrganizerItem> items(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    virtual QList<QOrganizerItem> itemsForExport(const QDateTime& startDate, const QDateTime& endDate, const QOrganizerItemFilter& filter, const QList<QOrganizerItemSortOrder>& sortOrders, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
+    virtual QOrganizerItem item(const QOrganizerItemLocalId& itemId, const QOrganizerItemFetchHint& fetchHint, QOrganizerManager::Error* error) const;
 
-    virtual bool saveItem(QOrganizerItem* item, QOrganizerItemManager::Error* error);
-    virtual bool removeItem(const QOrganizerItemLocalId& itemId, QOrganizerItemManager::Error* error);
+    virtual bool saveItem(QOrganizerItem* item, QOrganizerManager::Error* error);
+    virtual bool removeItem(const QOrganizerItemLocalId& itemId, QOrganizerManager::Error* error);
 
-    virtual bool saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
-    virtual bool removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerItemManager::Error>* errorMap, QOrganizerItemManager::Error* error);
+    virtual bool saveItems(QList<QOrganizerItem>* items, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
+    virtual bool removeItems(const QList<QOrganizerItemLocalId>& itemIds, QMap<int, QOrganizerManager::Error>* errorMap, QOrganizerManager::Error* error);
 
     /* Collections - every item belongs to exactly one collection */
-    virtual QOrganizerCollection defaultCollection(QOrganizerItemManager::Error* error) const;
-    virtual QOrganizerCollection collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error) const;
-    virtual QList<QOrganizerCollection> collections(QOrganizerItemManager::Error* error) const;
-    virtual bool saveCollection(QOrganizerCollection* collection, QOrganizerItemManager::Error* error);
-    virtual bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerItemManager::Error* error);
+    virtual QOrganizerCollection defaultCollection(QOrganizerManager::Error* error) const;
+    virtual QOrganizerCollection collection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error) const;
+    virtual QList<QOrganizerCollection> collections(QOrganizerManager::Error* error) const;
+    virtual bool saveCollection(QOrganizerCollection* collection, QOrganizerManager::Error* error);
+    virtual bool removeCollection(const QOrganizerCollectionLocalId& collectionId, QOrganizerManager::Error* error);
 
     /* Return a pruned or modified item which is valid and can be saved in the backend */
-    virtual QOrganizerItem compatibleItem(const QOrganizerItem& original, QOrganizerItemManager::Error* error) const;
-    virtual QOrganizerCollection compatibleCollection(const QOrganizerCollection& original, QOrganizerItemManager::Error* error) const;
+    virtual QOrganizerItem compatibleItem(const QOrganizerItem& original, QOrganizerManager::Error* error) const;
+    virtual QOrganizerCollection compatibleCollection(const QOrganizerCollection& original, QOrganizerManager::Error* error) const;
 
     /* Validation for saving */
-    virtual bool validateItem(const QOrganizerItem& item, QOrganizerItemManager::Error* error) const;
-    virtual bool validateCollection(const QOrganizerCollection& collection, QOrganizerItemManager::Error* error) const;
-    virtual bool validateDefinition(const QOrganizerItemDetailDefinition& def, QOrganizerItemManager::Error* error) const;
+    virtual bool validateItem(const QOrganizerItem& item, QOrganizerManager::Error* error) const;
+    virtual bool validateCollection(const QOrganizerCollection& collection, QOrganizerManager::Error* error) const;
+    virtual bool validateDefinition(const QOrganizerItemDetailDefinition& def, QOrganizerManager::Error* error) const;
 
     /* Definitions - Accessors and Mutators */
-    virtual QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& itemType, QOrganizerItemManager::Error* error) const;
-    virtual QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error) const;
-    virtual bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerItemManager::Error* error);
-    virtual bool removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerItemManager::Error* error);
+    virtual QMap<QString, QOrganizerItemDetailDefinition> detailDefinitions(const QString& itemType, QOrganizerManager::Error* error) const;
+    virtual QOrganizerItemDetailDefinition detailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error) const;
+    virtual bool saveDetailDefinition(const QOrganizerItemDetailDefinition& def, const QString& itemType, QOrganizerManager::Error* error);
+    virtual bool removeDetailDefinition(const QString& definitionId, const QString& itemType, QOrganizerManager::Error* error);
 
     /* Asynchronous Request Support */
-    virtual void requestDestroyed(QOrganizerItemAbstractRequest* req);
-    virtual bool startRequest(QOrganizerItemAbstractRequest* req);
-    virtual bool cancelRequest(QOrganizerItemAbstractRequest* req);
-    virtual bool waitForRequestFinished(QOrganizerItemAbstractRequest* req, int msecs);
+    virtual void requestDestroyed(QOrganizerAbstractRequest* req);
+    virtual bool startRequest(QOrganizerAbstractRequest* req);
+    virtual bool cancelRequest(QOrganizerAbstractRequest* req);
+    virtual bool waitForRequestFinished(QOrganizerAbstractRequest* req, int msecs);
 
     /* Capabilities reporting */
-    virtual bool hasFeature(QOrganizerItemManager::ManagerFeature feature, const QString& itemType) const;
+    virtual bool hasFeature(QOrganizerManager::ManagerFeature feature, const QString& itemType) const;
     virtual bool isFilterSupported(const QOrganizerItemFilter& filter) const;
     virtual QStringList supportedItemTypes() const;
 
@@ -152,20 +152,20 @@ Q_SIGNALS:
 
 public:
     // Async update functions
-    static void updateRequestState(QOrganizerItemAbstractRequest* req, QOrganizerItemAbstractRequest::State state);
-
-    static void updateItemInstanceFetchRequest(QOrganizerItemInstanceFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState);
-    static void updateItemLocalIdFetchRequest(QOrganizerItemLocalIdFetchRequest* req, const QList<QOrganizerItemLocalId>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState);
-    static void updateItemFetchRequest(QOrganizerItemFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState);
-    static void updateItemFetchForExportRequest(QOrganizerItemFetchForExportRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState);
-    static void updateItemRemoveRequest(QOrganizerItemRemoveRequest* req, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState);
-    static void updateItemSaveRequest(QOrganizerItemSaveRequest* req, const QList<QOrganizerItem>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState);
-    static void updateDefinitionSaveRequest(QOrganizerItemDetailDefinitionSaveRequest* req, const QList<QOrganizerItemDetailDefinition>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState);
-    static void updateDefinitionRemoveRequest(QOrganizerItemDetailDefinitionRemoveRequest* req, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState);
-    static void updateDefinitionFetchRequest(QOrganizerItemDetailDefinitionFetchRequest* req, const QMap<QString, QOrganizerItemDetailDefinition>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState);
-    static void updateCollectionFetchRequest(QOrganizerCollectionFetchRequest* req, const QList<QOrganizerCollection>& result, QOrganizerItemManager::Error error, QOrganizerItemAbstractRequest::State newState);
-    static void updateCollectionRemoveRequest(QOrganizerCollectionRemoveRequest* req, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState);
-    static void updateCollectionSaveRequest(QOrganizerCollectionSaveRequest* req, const QList<QOrganizerCollection>& result, QOrganizerItemManager::Error error, const QMap<int, QOrganizerItemManager::Error>& errorMap, QOrganizerItemAbstractRequest::State newState);
+    static void updateRequestState(QOrganizerAbstractRequest* req, QOrganizerAbstractRequest::State state);
+
+    static void updateItemInstanceFetchRequest(QOrganizerItemInstanceFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState);
+    static void updateItemLocalIdFetchRequest(QOrganizerItemLocalIdFetchRequest* req, const QList<QOrganizerItemLocalId>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState);
+    static void updateItemFetchRequest(QOrganizerItemFetchRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState);
+    static void updateItemFetchForExportRequest(QOrganizerItemFetchForExportRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState);
+    static void updateItemRemoveRequest(QOrganizerItemRemoveRequest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState);
+    static void updateItemSaveRequest(QOrganizerItemSaveRequest* req, const QList<QOrganizerItem>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState);
+    static void updateDefinitionSaveRequest(QOrganizerItemDetailDefinitionSaveRequest* req, const QList<QOrganizerItemDetailDefinition>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState);
+    static void updateDefinitionRemoveRequest(QOrganizerItemDetailDefinitionRemoveRequest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState);
+    static void updateDefinitionFetchRequest(QOrganizerItemDetailDefinitionFetchRequest* req, const QMap<QString, QOrganizerItemDetailDefinition>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState);
+    static void updateCollectionFetchRequest(QOrganizerCollectionFetchRequest* req, const QList<QOrganizerCollection>& result, QOrganizerManager::Error error, QOrganizerAbstractRequest::State newState);
+    static void updateCollectionRemoveRequest(QOrganizerCollectionRemoveRequest* req, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState);
+    static void updateCollectionSaveRequest(QOrganizerCollectionSaveRequest* req, const QList<QOrganizerCollection>& result, QOrganizerManager::Error error, const QMap<int, QOrganizerManager::Error>& errorMap, QOrganizerAbstractRequest::State newState);
 
     // Other protected area update functions
     static void setDetailAccessConstraints(QOrganizerItemDetail* detail, QOrganizerItemDetail::AccessConstraints constraints);
diff --git a/src/organizer/qorganizeritemmanagerenginefactory.cpp b/src/organizer/qorganizermanagerenginefactory.cpp
index 5d7b41b831..2f5c443ade 100644
--- a/src/organizer/qorganizeritemmanagerenginefactory.cpp
+++ b/src/organizer/qorganizermanagerenginefactory.cpp
@@ -40,14 +40,14 @@
 ****************************************************************************/
 
 
-#include "qorganizeritemmanagerenginefactory.h"
+#include "qorganizermanagerenginefactory.h"
 
 QTM_BEGIN_NAMESPACE
 
 /*!
-  \class QOrganizerItemManagerEngineFactory
-  \brief The QOrganizerItemManagerEngineFactory class provides the interface for
- plugins that implement QOrganizerItemManagerEngine functionality.
+  \class QOrganizerManagerEngineFactory
+  \brief The QOrganizerManagerEngineFactory class provides the interface for
+ plugins that implement QOrganizerManagerEngine functionality.
 
   \inmodule QtOrganizer
   \ingroup organizer-backends
@@ -55,37 +55,37 @@ QTM_BEGIN_NAMESPACE
   This class provides a simple interface for the creation of
   manager engine instances.  Each factory has a specific id
   associated with it, which forms the \c managerName parameter
-  when creating \l QOrganizerItemManager objects.
+  when creating \l QOrganizerManager objects.
 
   More information on writing a organizeritems engine plugin is available in
   the \l{Qt Organizer Manager Engines} documentation.
 
-  \sa QOrganizerItemManager, QOrganizerItemManagerEngine
+  \sa QOrganizerManager, QOrganizerManagerEngine
  */
 
 /*!
   A default, empty destructor.
  */
-QOrganizerItemManagerEngineFactory::~QOrganizerItemManagerEngineFactory()
+QOrganizerManagerEngineFactory::~QOrganizerManagerEngineFactory()
 {
 }
 
 /*!
-  \fn QOrganizerItemManagerEngineFactory::engine(const QMap<QString, QString>& parameters, QOrganizerItemManager::Error* error)
+  \fn QOrganizerManagerEngineFactory::engine(const QMap<QString, QString>& parameters, QOrganizerManager::Error* error)
 
-  This function is called by the QOrganizerItemManager implementation to
+  This function is called by the QOrganizerManager implementation to
   create an instance of the engine provided by this factory.
 
   The \a parameters supplied can be ignored or interpreted as desired.
 
   If a supplied parameter results in an unfulfillable request, or some other error
   occurs, this function may return a null pointer, and the client developer will get an
-  invalid QOrganizerItemManager in return.  Any error should be stored in the supplied \a error
+  invalid QOrganizerManager in return.  Any error should be stored in the supplied \a error
   reference.
  */
 
 /*!
-  \fn QOrganizerItemManagerEngineFactory::managerName() const
+  \fn QOrganizerManagerEngineFactory::managerName() const
 
   This function should return a unique string that identifies
   the engines provided by this factory.
@@ -95,11 +95,11 @@ QOrganizerItemManagerEngineFactory::~QOrganizerItemManagerEngineFactory()
  */
 
 /*!
-  \fn QOrganizerItemManagerEngineFactory::supportedImplementationVersions() const
+  \fn QOrganizerManagerEngineFactory::supportedImplementationVersions() const
 
   This function should return a list of versions of the engine which this factory can instantiate.
  */
-QList<int> QOrganizerItemManagerEngineFactory::supportedImplementationVersions() const
+QList<int> QOrganizerManagerEngineFactory::supportedImplementationVersions() const
 {
     return QList<int>();
 }
diff --git a/src/organizer/qorganizeritemmanagerenginefactory.h b/src/organizer/qorganizermanagerenginefactory.h
index e5bfa0220b..57f433ef14 100644
--- a/src/organizer/qorganizeritemmanagerenginefactory.h
+++ b/src/organizer/qorganizermanagerenginefactory.h
@@ -40,26 +40,26 @@
 ****************************************************************************/
 
 
-#ifndef QORGANIZERITEMMANAGERENGINEFACTORY_H
-#define QORGANIZERITEMMANAGERENGINEFACTORY_H
+#ifndef QORGANIZERMANAGERENGINEFACTORY_H
+#define QORGANIZERMANAGERENGINEFACTORY_H
 
 #include <QtPlugin>
 #include <QMap>
 #include <QString>
 
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 QTM_BEGIN_NAMESPACE
 /* Backend plugin API interface, creates engines for us */
-class QOrganizerItemManagerEngine;
+class QOrganizerManagerEngine;
 class QOrganizerCollectionEngineLocalId;
-class Q_ORGANIZER_EXPORT QOrganizerItemManagerEngineFactory
+class Q_ORGANIZER_EXPORT QOrganizerManagerEngineFactory
 {
 public:
     // engine factory functions
     virtual QList<int> supportedImplementationVersions() const;
-    virtual ~QOrganizerItemManagerEngineFactory();
-    virtual QOrganizerItemManagerEngine* engine(const QMap<QString, QString>& parameters, QOrganizerItemManager::Error* error) = 0;
+    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;
@@ -68,7 +68,7 @@ QTM_END_NAMESPACE
 
 QT_BEGIN_NAMESPACE
 #define QT_ORGANIZER_BACKEND_INTERFACE "com.nokia.qt.mobility.organizeritems.enginefactory/1.0"
-Q_DECLARE_INTERFACE(QtMobility::QOrganizerItemManagerEngineFactory, QT_ORGANIZER_BACKEND_INTERFACE);
+Q_DECLARE_INTERFACE(QtMobility::QOrganizerManagerEngineFactory, QT_ORGANIZER_BACKEND_INTERFACE);
 QT_END_NAMESPACE
 
 #endif
diff --git a/src/organizer/qorganizeritemrecurrencerule.cpp b/src/organizer/qorganizerrecurrencerule.cpp
index 66888d3820..5365d62cb5 100644
--- a/src/organizer/qorganizeritemrecurrencerule.cpp
+++ b/src/organizer/qorganizerrecurrencerule.cpp
@@ -44,16 +44,16 @@
 #include <QList>
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemrecurrencerule_p.h"
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule_p.h"
+#include "qorganizerrecurrencerule.h"
 
 QTM_BEGIN_NAMESPACE
 
 
 /*!
- * \class QOrganizerItemRecurrenceRule
+ * \class QOrganizerRecurrenceRule
  *
- * \brief The QOrganizerItemRecurrenceRule class describes the a rule by which a QOrganizerItem repeats.
+ * \brief The QOrganizerRecurrenceRule class describes the a rule by which a QOrganizerItem repeats.
 
   \inmodule QtOrganizer
  *
@@ -103,7 +103,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
- * \enum QOrganizerItemRecurrenceRule::Frequency
+ * \enum QOrganizerRecurrenceRule::Frequency
  * \value Invalid Signifies that the entire rrule is invalid.
  * \value Daily
  * \value Weekly
@@ -112,7 +112,7 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
- * \enum QOrganizerItemRecurrenceRule::Month
+ * \enum QOrganizerRecurrenceRule::Month
  * \value January
  * \value February
  * \value March
@@ -128,24 +128,24 @@ QTM_BEGIN_NAMESPACE
  */
 
 /*!
- * Constructs a QOrganizerItemRecurrenceRule object describing a weekly recurrence.
+ * Constructs a QOrganizerRecurrenceRule object describing a weekly recurrence.
  */
-QOrganizerItemRecurrenceRule::QOrganizerItemRecurrenceRule()
-    : d(new QOrganizerItemRecurrenceRulePrivate)
+QOrganizerRecurrenceRule::QOrganizerRecurrenceRule()
+    : d(new QOrganizerRecurrenceRulePrivate)
 {
 }
 
 /*!
- * Destroys the QOrganizerItemRecurrenceRule object.
+ * Destroys the QOrganizerRecurrenceRule object.
  */
-QOrganizerItemRecurrenceRule::~QOrganizerItemRecurrenceRule()
+QOrganizerRecurrenceRule::~QOrganizerRecurrenceRule()
 {
 }
 
 /*!
- * Constructs a QOrganizerItemRecurrenceRule object as a copy of \a other.
+ * Constructs a QOrganizerRecurrenceRule object as a copy of \a other.
  */
-QOrganizerItemRecurrenceRule::QOrganizerItemRecurrenceRule(const QOrganizerItemRecurrenceRule& other)
+QOrganizerRecurrenceRule::QOrganizerRecurrenceRule(const QOrganizerRecurrenceRule& other)
     : d(other.d)
 {
 }
@@ -153,7 +153,7 @@ QOrganizerItemRecurrenceRule::QOrganizerItemRecurrenceRule(const QOrganizerItemR
 /*!
  * Assigns this detail to be equal to \a other.
  */
-QOrganizerItemRecurrenceRule& QOrganizerItemRecurrenceRule::operator=(const QOrganizerItemRecurrenceRule& other)
+QOrganizerRecurrenceRule& QOrganizerRecurrenceRule::operator=(const QOrganizerRecurrenceRule& other)
 {
     this->d = other.d;
     return *this;
@@ -161,7 +161,7 @@ QOrganizerItemRecurrenceRule& QOrganizerItemRecurrenceRule::operator=(const QOrg
 /*!
   Returns true if this recurrence rule is equal to the \a other; otherwise returns false.
  */
-bool QOrganizerItemRecurrenceRule::operator==(const QOrganizerItemRecurrenceRule& other) const
+bool QOrganizerRecurrenceRule::operator==(const QOrganizerRecurrenceRule& other) const
 {
     // if both ids are null then they are equal.
     if (d == 0 && other.d == 0)
@@ -189,7 +189,7 @@ bool QOrganizerItemRecurrenceRule::operator==(const QOrganizerItemRecurrenceRule
  *
  * This corresponds to the FREQ fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setFrequency(Frequency freq)
+void QOrganizerRecurrenceRule::setFrequency(Frequency freq)
 {
     d->frequency = freq;
 }
@@ -197,7 +197,7 @@ void QOrganizerItemRecurrenceRule::setFrequency(Frequency freq)
 /*!
  * Returns the frequency with which the item recurs.  The default frequency is Invalid.
  */
-QOrganizerItemRecurrenceRule::Frequency QOrganizerItemRecurrenceRule::frequency() const
+QOrganizerRecurrenceRule::Frequency QOrganizerRecurrenceRule::frequency() const
 {
     return d->frequency;
 }
@@ -211,12 +211,12 @@ QOrganizerItemRecurrenceRule::Frequency QOrganizerItemRecurrenceRule::frequency(
  * This corresponds to the COUNT fragment in iCalendar's RRULE.
  * \sa clearLimit()
  */
-void QOrganizerItemRecurrenceRule::setLimit(int count)
+void QOrganizerRecurrenceRule::setLimit(int count)
 {
     if (count < 0) {
         clearLimit();
     } else {
-        d->limitType = QOrganizerItemRecurrenceRule::CountLimit;
+        d->limitType = QOrganizerRecurrenceRule::CountLimit;
         d->limitCount = count;
         d->limitDate = QDate();
     }
@@ -231,12 +231,12 @@ void QOrganizerItemRecurrenceRule::setLimit(int count)
  * This corresponds to the UNTIL fragment in iCalendar's RRULE.
  * \sa clearLimit()
  */
-void QOrganizerItemRecurrenceRule::setLimit(const QDate& date)
+void QOrganizerRecurrenceRule::setLimit(const QDate& date)
 {
     if (!date.isValid()) {
         clearLimit();
     } else {
-        d->limitType = QOrganizerItemRecurrenceRule::DateLimit;
+        d->limitType = QOrganizerRecurrenceRule::DateLimit;
         d->limitDate = date;
         d->limitCount = -1;
     }
@@ -244,9 +244,9 @@ void QOrganizerItemRecurrenceRule::setLimit(const QDate& date)
 
 /*! Clear any recurrence rule limitation conditions.
  */
-void QOrganizerItemRecurrenceRule::clearLimit()
+void QOrganizerRecurrenceRule::clearLimit()
 {
-    d->limitType = QOrganizerItemRecurrenceRule::NoLimit;
+    d->limitType = QOrganizerRecurrenceRule::NoLimit;
     d->limitCount = -1;
     d->limitDate = QDate();
 }
@@ -254,7 +254,7 @@ void QOrganizerItemRecurrenceRule::clearLimit()
 /*! Returns the type of limitation specified by the recurrence rule.  The default limit type is NoLimit (ie.
  * unlimited)
  */
-QOrganizerItemRecurrenceRule::LimitType QOrganizerItemRecurrenceRule::limitType() const
+QOrganizerRecurrenceRule::LimitType QOrganizerRecurrenceRule::limitType() const
 {
     return d->limitType;
 }
@@ -262,9 +262,9 @@ QOrganizerItemRecurrenceRule::LimitType QOrganizerItemRecurrenceRule::limitType(
 /*! Returns the "count" condition specified by the recurrence rule.  The default count is -1 (ie.
  * unlimited)
  */
-int QOrganizerItemRecurrenceRule::limitCount() const
+int QOrganizerRecurrenceRule::limitCount() const
 {
-    if (d->limitType == QOrganizerItemRecurrenceRule::CountLimit)
+    if (d->limitType == QOrganizerRecurrenceRule::CountLimit)
         return d->limitCount;
     return -1;
 }
@@ -273,9 +273,9 @@ int QOrganizerItemRecurrenceRule::limitCount() const
 /*! Returns the end-date condition specified by the recurrence rule.  The default end date is the
  * null date (ie. no end date).
  */
-QDate QOrganizerItemRecurrenceRule::limitDate() const
+QDate QOrganizerRecurrenceRule::limitDate() const
 {
-    if (d->limitType == QOrganizerItemRecurrenceRule::DateLimit)
+    if (d->limitType == QOrganizerRecurrenceRule::DateLimit)
         return d->limitDate;
     return QDate();
 }
@@ -284,12 +284,12 @@ QDate QOrganizerItemRecurrenceRule::limitDate() const
  * Sets the interval, between cycles of length given by frequency(), in which the item should recur
  * to \a interval.
  *
- * For example, if the frequency() is QOrganizerItemRecurrenceRule::Daily and the interval is set to
+ * For example, if the frequency() is QOrganizerRecurrenceRule::Daily and the interval is set to
  * 2, the item should recur every second day.
  *
  * This corresponds to the INTERVAL fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setInterval(int interval)
+void QOrganizerRecurrenceRule::setInterval(int interval)
 {
     if (interval > 0)
         d->interval = interval;
@@ -298,7 +298,7 @@ void QOrganizerItemRecurrenceRule::setInterval(int interval)
 /*!
  * Returns the interval of recurrence.  The default interval is 1.
  */
-int QOrganizerItemRecurrenceRule::interval() const
+int QOrganizerRecurrenceRule::interval() const
 {
     return d->interval > 0 ? d->interval : 1;
 }
@@ -310,7 +310,7 @@ int QOrganizerItemRecurrenceRule::interval() const
  *
  * This corresponds to the BYDAY fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setDaysOfWeek(const QSet<Qt::DayOfWeek>& days)
+void QOrganizerRecurrenceRule::setDaysOfWeek(const QSet<Qt::DayOfWeek>& days)
 {
     d->daysOfWeek = days;
 }
@@ -319,7 +319,7 @@ void QOrganizerItemRecurrenceRule::setDaysOfWeek(const QSet<Qt::DayOfWeek>& days
  * Returns a list of the days of week that the item should recur on.  If not set, this is the empty
  * list, which signifies that it should be implied, if necessary, by the day-of-week of the item.
  */
-QSet<Qt::DayOfWeek> QOrganizerItemRecurrenceRule::daysOfWeek() const
+QSet<Qt::DayOfWeek> QOrganizerRecurrenceRule::daysOfWeek() const
 {
     return d->daysOfWeek;
 }
@@ -331,7 +331,7 @@ QSet<Qt::DayOfWeek> QOrganizerItemRecurrenceRule::daysOfWeek() const
  *
  * This corresponds to the BYMONTHDAY fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setDaysOfMonth(const QSet<int>& days)
+void QOrganizerRecurrenceRule::setDaysOfMonth(const QSet<int>& days)
 {
     d->daysOfMonth = days;
 }
@@ -341,7 +341,7 @@ void QOrganizerItemRecurrenceRule::setDaysOfMonth(const QSet<int>& days)
  * empty list, which signifies that it should be implied, if necessary, by the day-of-month of the
  * item.
  */
-QSet<int> QOrganizerItemRecurrenceRule::daysOfMonth() const
+QSet<int> QOrganizerRecurrenceRule::daysOfMonth() const
 {
     return d->daysOfMonth;
 }
@@ -353,7 +353,7 @@ QSet<int> QOrganizerItemRecurrenceRule::daysOfMonth() const
  *
  * This corresponds to the BYYEARDAY fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setDaysOfYear(const QSet<int>& days)
+void QOrganizerRecurrenceRule::setDaysOfYear(const QSet<int>& days)
 {
     d->daysOfYear = days;
 }
@@ -363,7 +363,7 @@ void QOrganizerItemRecurrenceRule::setDaysOfYear(const QSet<int>& days)
  * empty list, which signifies that it should be implied, if necessary, by the day-of-year of the
  * item.
  */
-QSet<int> QOrganizerItemRecurrenceRule::daysOfYear() const
+QSet<int> QOrganizerRecurrenceRule::daysOfYear() const
 {
     return d->daysOfYear;
 }
@@ -373,7 +373,7 @@ QSet<int> QOrganizerItemRecurrenceRule::daysOfYear() const
  *
  * This corresponds to the BYMONTHDAY fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setMonthsOfYear(const QSet<Month>& months)
+void QOrganizerRecurrenceRule::setMonthsOfYear(const QSet<Month>& months)
 {
     d->monthsOfYear = months;
 }
@@ -383,7 +383,7 @@ void QOrganizerItemRecurrenceRule::setMonthsOfYear(const QSet<Month>& months)
  * empty list, which signifies that it should be implied, if necessary, by the month of the
  * item.
  */
-QSet<QOrganizerItemRecurrenceRule::Month> QOrganizerItemRecurrenceRule::monthsOfYear() const
+QSet<QOrganizerRecurrenceRule::Month> QOrganizerRecurrenceRule::monthsOfYear() const
 {
     return d->monthsOfYear;
 }
@@ -395,7 +395,7 @@ QSet<QOrganizerItemRecurrenceRule::Month> QOrganizerItemRecurrenceRule::monthsOf
  *
  * This corresponds to the BYWEEK fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setWeeksOfYear(const QSet<int>& weeks)
+void QOrganizerRecurrenceRule::setWeeksOfYear(const QSet<int>& weeks)
 {
     d->weeksOfYear = weeks;
 }
@@ -405,7 +405,7 @@ void QOrganizerItemRecurrenceRule::setWeeksOfYear(const QSet<int>& weeks)
  * empty list, which signifies that it should be implied, if necessary, by the week number of the
  * item.
  */
-QSet<int> QOrganizerItemRecurrenceRule::weeksOfYear() const
+QSet<int> QOrganizerRecurrenceRule::weeksOfYear() const
 {
     return d->weeksOfYear;
 }
@@ -423,7 +423,7 @@ QSet<int> QOrganizerItemRecurrenceRule::weeksOfYear() const
  *
  * This corresponds to the BYSETPOS fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setPositions(const QSet<int>& pos)
+void QOrganizerRecurrenceRule::setPositions(const QSet<int>& pos)
 {
     d->positions = pos;
 }
@@ -432,7 +432,7 @@ void QOrganizerItemRecurrenceRule::setPositions(const QSet<int>& pos)
  * Returns the position-list of the recurrence rule.  If not set, this is the empty list, which
  * signifies that the recurrence dates should not be restricted by position.
  */
-QSet<int> QOrganizerItemRecurrenceRule::positions() const
+QSet<int> QOrganizerRecurrenceRule::positions() const
 {
     return d->positions;
 }
@@ -443,7 +443,7 @@ QSet<int> QOrganizerItemRecurrenceRule::positions() const
  *
  * This corresponds to the BYWKST fragment in iCalendar's RRULE.
  */
-void QOrganizerItemRecurrenceRule::setFirstDayOfWeek(Qt::DayOfWeek day)
+void QOrganizerRecurrenceRule::setFirstDayOfWeek(Qt::DayOfWeek day)
 {
     d->firstDayOfWeek = day;
 }
@@ -451,13 +451,13 @@ void QOrganizerItemRecurrenceRule::setFirstDayOfWeek(Qt::DayOfWeek day)
 /*!
  * Returns the day that the week starts on.  If not set, this is Monday.
  */
-Qt::DayOfWeek QOrganizerItemRecurrenceRule::firstDayOfWeek() const
+Qt::DayOfWeek QOrganizerRecurrenceRule::firstDayOfWeek() const
 {
     return d->firstDayOfWeek;
 }
 
 
-uint qHash(const QOrganizerItemRecurrenceRule& r)
+uint qHash(const QOrganizerRecurrenceRule& r)
 {
     uint hash(0);
     static const unsigned int prime1 = 11;
@@ -479,7 +479,7 @@ uint qHash(const QOrganizerItemRecurrenceRule& r)
     }
     hash *= prime3;
 
-    foreach(QOrganizerItemRecurrenceRule::Month month, r.monthsOfYear()){
+    foreach(QOrganizerRecurrenceRule::Month month, r.monthsOfYear()){
         hash += month;
     }
     hash *= prime1;
diff --git a/src/organizer/qorganizeritemrecurrencerule.h b/src/organizer/qorganizerrecurrencerule.h
index a472c351d2..4bfaf22c68 100644
--- a/src/organizer/qorganizeritemrecurrencerule.h
+++ b/src/organizer/qorganizerrecurrencerule.h
@@ -40,8 +40,8 @@
 ****************************************************************************/
 
 
-#ifndef QORGANIZERITEMRECURRENCERULE_H
-#define QORGANIZERITEMRECURRENCERULE_H
+#ifndef QORGANIZERRECURRENCERULE_H
+#define QORGANIZERRECURRENCERULE_H
 
 #include <QString>
 #include <QDateTime>
@@ -53,16 +53,16 @@
 
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemRecurrenceRulePrivate;
+class QOrganizerRecurrenceRulePrivate;
 
-class Q_ORGANIZER_EXPORT QOrganizerItemRecurrenceRule
+class Q_ORGANIZER_EXPORT QOrganizerRecurrenceRule
 {
 public:
-    QOrganizerItemRecurrenceRule();
-    ~QOrganizerItemRecurrenceRule();
-    QOrganizerItemRecurrenceRule(const QOrganizerItemRecurrenceRule& other);
-    QOrganizerItemRecurrenceRule& operator=(const QOrganizerItemRecurrenceRule& other);
-    bool operator==(const QOrganizerItemRecurrenceRule& other) const;
+    QOrganizerRecurrenceRule();
+    ~QOrganizerRecurrenceRule();
+    QOrganizerRecurrenceRule(const QOrganizerRecurrenceRule& other);
+    QOrganizerRecurrenceRule& operator=(const QOrganizerRecurrenceRule& other);
+    bool operator==(const QOrganizerRecurrenceRule& other) const;
     // enums
     enum Frequency {
         Invalid = 0,
@@ -137,14 +137,14 @@ public:
     QSet<int> positions() const;
 
 private:
-    QSharedDataPointer<QOrganizerItemRecurrenceRulePrivate> d;
+    QSharedDataPointer<QOrganizerRecurrenceRulePrivate> d;
 };
 
 //hash functions
-Q_ORGANIZER_EXPORT uint qHash(const QOrganizerItemRecurrenceRule& rule);
+Q_ORGANIZER_EXPORT uint qHash(const QOrganizerRecurrenceRule& rule);
 
 
-inline uint qHash(QOrganizerItemRecurrenceRule::Month month)
+inline uint qHash(QOrganizerRecurrenceRule::Month month)
 {
     return static_cast<uint>(month);
 }
@@ -157,9 +157,9 @@ inline uint qHash(const QDate &date)
 }
 
 
-Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerItemRecurrenceRule), Q_MOVABLE_TYPE);
-Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QOrganizerItemRecurrenceRule));
-Q_DECLARE_METATYPE(QSet<QTM_PREPEND_NAMESPACE(QOrganizerItemRecurrenceRule)>);
+Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QOrganizerRecurrenceRule), Q_MOVABLE_TYPE);
+Q_DECLARE_METATYPE(QTM_PREPEND_NAMESPACE(QOrganizerRecurrenceRule));
+Q_DECLARE_METATYPE(QSet<QTM_PREPEND_NAMESPACE(QOrganizerRecurrenceRule)>);
 Q_DECLARE_METATYPE(QSet<QDate>);
 
 
diff --git a/src/organizer/qorganizeritemrecurrencerule_p.h b/src/organizer/qorganizerrecurrencerule_p.h
index eb2a7df29e..f5b5c4c83c 100644
--- a/src/organizer/qorganizeritemrecurrencerule_p.h
+++ b/src/organizer/qorganizerrecurrencerule_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QORGANIZERITEMRECURRENCERULE_P_H
-#define QORGANIZERITEMRECURRENCERULE_P_H
+#ifndef QORGANIZERRECURRENCERULE_P_H
+#define QORGANIZERRECURRENCERULE_P_H
 
 //
 //  W A R N I N G
@@ -55,25 +55,25 @@
 
 #include <QSet>
 #include <QSharedData>
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule.h"
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemRecurrenceRulePrivate : public QSharedData
+class QOrganizerRecurrenceRulePrivate : public QSharedData
 {
 public:
-    QOrganizerItemRecurrenceRulePrivate()
+    QOrganizerRecurrenceRulePrivate()
             : QSharedData(),
-            frequency(QOrganizerItemRecurrenceRule::Invalid),
+            frequency(QOrganizerRecurrenceRule::Invalid),
             limitCount(-1),
-            limitType(QOrganizerItemRecurrenceRule::NoLimit),
+            limitType(QOrganizerRecurrenceRule::NoLimit),
             interval(1),
             firstDayOfWeek(Qt::Monday)
     {
 
     }
 
-    QOrganizerItemRecurrenceRulePrivate(const QOrganizerItemRecurrenceRulePrivate& other)
+    QOrganizerRecurrenceRulePrivate(const QOrganizerRecurrenceRulePrivate& other)
             : QSharedData(other),
             frequency(other.frequency),
             limitCount(other.limitCount),
@@ -91,19 +91,19 @@ public:
     {
     }
 
-    ~QOrganizerItemRecurrenceRulePrivate()
+    ~QOrganizerRecurrenceRulePrivate()
     {
     }
 
-    QOrganizerItemRecurrenceRule::Frequency frequency;
+    QOrganizerRecurrenceRule::Frequency frequency;
     int limitCount;
     QDate limitDate;
-    QOrganizerItemRecurrenceRule::LimitType limitType;
+    QOrganizerRecurrenceRule::LimitType limitType;
     int interval;
     QSet<Qt::DayOfWeek> daysOfWeek;
     QSet<int> daysOfMonth;
     QSet<int> daysOfYear;
-    QSet<QOrganizerItemRecurrenceRule::Month> monthsOfYear;
+    QSet<QOrganizerRecurrenceRule::Month> monthsOfYear;
     QSet<int> weeksOfYear;
     QSet<int> positions;
     Qt::DayOfWeek firstDayOfWeek;
diff --git a/src/organizer/qtorganizer.h b/src/organizer/qtorganizer.h
index 747558a464..dd7fd61dd3 100644
--- a/src/organizer/qtorganizer.h
+++ b/src/organizer/qtorganizer.h
@@ -47,7 +47,7 @@
 
 #include "qtorganizerglobal.h"                        // global exports
 
-#include "qorganizeritemabstractrequest.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 "qorganizeritemmanager.h"                    // manager
-#include "qorganizeritemmanagerengine.h"              // manager backend
-#include "qorganizeritemmanagerenginefactory.h"       // manage backend instantiator
-#include "qorganizeritemrecurrencerule.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
diff --git a/src/organizer/requests/qorganizercollectionfetchrequest.cpp b/src/organizer/requests/qorganizercollectionfetchrequest.cpp
index 522a6f103e..9206f24148 100644
--- a/src/organizer/requests/qorganizercollectionfetchrequest.cpp
+++ b/src/organizer/requests/qorganizercollectionfetchrequest.cpp
@@ -59,7 +59,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizeritem fetch request whose parent is the specified \a parent */
 QOrganizerCollectionFetchRequest::QOrganizerCollectionFetchRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerCollectionFetchRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerCollectionFetchRequestPrivate, parent)
 {
 }
 
diff --git a/src/organizer/requests/qorganizercollectionfetchrequest.h b/src/organizer/requests/qorganizercollectionfetchrequest.h
index cbc3aeb526..7da427c4d5 100644
--- a/src/organizer/requests/qorganizercollectionfetchrequest.h
+++ b/src/organizer/requests/qorganizercollectionfetchrequest.h
@@ -43,9 +43,9 @@
 #define QORGANIZERCOLLECTIONFETCHREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizercollection.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 #include <QList>
 #include <QMap>
@@ -53,7 +53,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerCollectionFetchRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerCollectionFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerCollectionFetchRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -68,7 +68,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QOrganizerCollectionFetchRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerCollectionFetchRequest)
 };
 
diff --git a/src/organizer/requests/qorganizercollectionremoverequest.cpp b/src/organizer/requests/qorganizercollectionremoverequest.cpp
index 28e908d350..3aca8af25c 100644
--- a/src/organizer/requests/qorganizercollectionremoverequest.cpp
+++ b/src/organizer/requests/qorganizercollectionremoverequest.cpp
@@ -59,7 +59,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizeritem fetch request whose parent is the specified \a parent */
 QOrganizerCollectionRemoveRequest::QOrganizerCollectionRemoveRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerCollectionRemoveRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerCollectionRemoveRequestPrivate, parent)
 {
 }
 
@@ -86,7 +86,7 @@ QList<QOrganizerCollectionLocalId> QOrganizerCollectionRemoveRequest::collection
 }
 
 /*! Returns any errors which occurred during the request */
-QMap<int, QOrganizerItemManager::Error> QOrganizerCollectionRemoveRequest::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerCollectionRemoveRequest::errorMap() const
 {
     Q_D(const QOrganizerCollectionRemoveRequest);
     return d->m_errors;
diff --git a/src/organizer/requests/qorganizercollectionremoverequest.h b/src/organizer/requests/qorganizercollectionremoverequest.h
index 27c3031813..4841ad7922 100644
--- a/src/organizer/requests/qorganizercollectionremoverequest.h
+++ b/src/organizer/requests/qorganizercollectionremoverequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERCOLLECTIONREMOVEREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizercollection.h"
 
 #include <QList>
@@ -52,7 +52,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerCollectionRemoveRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerCollectionRemoveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerCollectionRemoveRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -65,11 +65,11 @@ public:
     QList<QOrganizerCollectionLocalId> collectionIds() const;
 
     /* Results */
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
 private:
     Q_DISABLE_COPY(QOrganizerCollectionRemoveRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerCollectionRemoveRequest)
 };
 
diff --git a/src/organizer/requests/qorganizercollectionsaverequest.cpp b/src/organizer/requests/qorganizercollectionsaverequest.cpp
index 0a00fbcb9b..a668f160e2 100644
--- a/src/organizer/requests/qorganizercollectionsaverequest.cpp
+++ b/src/organizer/requests/qorganizercollectionsaverequest.cpp
@@ -59,7 +59,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizeritem fetch request whose parent is the specified \a parent */
 QOrganizerCollectionSaveRequest::QOrganizerCollectionSaveRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerCollectionSaveRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerCollectionSaveRequestPrivate, parent)
 {
 }
 
@@ -87,7 +87,7 @@ QList<QOrganizerCollection> QOrganizerCollectionSaveRequest::collections() const
 }
 
 /*! Returns any errors which occurred during the request */
-QMap<int, QOrganizerItemManager::Error> QOrganizerCollectionSaveRequest::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerCollectionSaveRequest::errorMap() const
 {
     Q_D(const QOrganizerCollectionSaveRequest);
     return d->m_errors;
diff --git a/src/organizer/requests/qorganizercollectionsaverequest.h b/src/organizer/requests/qorganizercollectionsaverequest.h
index 24bfe30831..8e0b10815f 100644
--- a/src/organizer/requests/qorganizercollectionsaverequest.h
+++ b/src/organizer/requests/qorganizercollectionsaverequest.h
@@ -43,9 +43,9 @@
 #define QORGANIZERCOLLECTIONSAVEREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizercollection.h"
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 #include <QList>
 #include <QStringList>
@@ -53,7 +53,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerCollectionSaveRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerCollectionSaveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerCollectionSaveRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -66,11 +66,11 @@ public:
 
     /* Results */
     QList<QOrganizerCollection> collections() const;
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
 private:
     Q_DISABLE_COPY(QOrganizerCollectionSaveRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerCollectionSaveRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.cpp b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.cpp
index a1eb01ece9..af07bcaac9 100644
--- a/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.cpp
@@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new detail definition fetch request whose parent is the specified \a parent */
 QOrganizerItemDetailDefinitionFetchRequest::QOrganizerItemDetailDefinitionFetchRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemDetailDefinitionFetchRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemDetailDefinitionFetchRequestPrivate, parent)
 {
 }
 
@@ -115,7 +115,7 @@ QMap<QString, QOrganizerItemDetailDefinition> QOrganizerItemDetailDefinitionFetc
 }
 
 /*! Returns the map of input name list indices to errors which occurred */
-QMap<int, QOrganizerItemManager::Error> QOrganizerItemDetailDefinitionFetchRequest::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerItemDetailDefinitionFetchRequest::errorMap() const
 {
     Q_D(const QOrganizerItemDetailDefinitionFetchRequest);
     return d->m_errors;
diff --git a/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.h b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.h
index bf63e54ca0..f00c64f59f 100644
--- a/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.h
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionfetchrequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMDETAILDEFINITIONFETCHREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemdetaildefinition.h"
 #include "qorganizercollectionid.h"
 
@@ -53,7 +53,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailDefinitionFetchRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionFetchRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -69,11 +69,11 @@ public:
 
     /* Results */
     QMap<QString, QOrganizerItemDetailDefinition> definitions() const;
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
 private:
     Q_DISABLE_COPY(QOrganizerItemDetailDefinitionFetchRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemDetailDefinitionFetchRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.cpp b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.cpp
index bd22244b40..01020e0b15 100644
--- a/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.cpp
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.cpp
@@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new detail definition remove request whose parent is the specified \a parent */
 QOrganizerItemDetailDefinitionRemoveRequest::QOrganizerItemDetailDefinitionRemoveRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemDetailDefinitionRemoveRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemDetailDefinitionRemoveRequestPrivate, parent)
 {
 }
 
@@ -118,7 +118,7 @@ QString QOrganizerItemDetailDefinitionRemoveRequest::itemType() const
 }
 
 /*! Returns the map of input name list indices to errors which occurred */
-QMap<int, QOrganizerItemManager::Error> QOrganizerItemDetailDefinitionRemoveRequest::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerItemDetailDefinitionRemoveRequest::errorMap() const
 {
     Q_D(const QOrganizerItemDetailDefinitionRemoveRequest);
     return d->m_errors;
diff --git a/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.h b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.h
index 57688ab614..cb6a8141da 100644
--- a/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.h
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionremoverequest.h
@@ -43,14 +43,14 @@
 #define QORGANIZERITEMDETAILDEFINITIONREMOVEREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 
 #include <QStringList>
 
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailDefinitionRemoveRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionRemoveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionRemoveRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -65,11 +65,11 @@ public:
     QString itemType() const;
 
     /* Results */
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
 private:
     Q_DISABLE_COPY(QOrganizerItemDetailDefinitionRemoveRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemDetailDefinitionRemoveRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.cpp b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.cpp
index 50be0a5130..fccc660d9b 100644
--- a/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.cpp
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.cpp
@@ -61,7 +61,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new detail definition save request whose parent is the specified \a parent */
 QOrganizerItemDetailDefinitionSaveRequest::QOrganizerItemDetailDefinitionSaveRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemDetailDefinitionSaveRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemDetailDefinitionSaveRequestPrivate, parent)
 {
 }
 
@@ -109,7 +109,7 @@ QString QOrganizerItemDetailDefinitionSaveRequest::itemType() const
 }
 
 /*! Returns the map of input definition list indices to errors which occurred */
-QMap<int, QOrganizerItemManager::Error> QOrganizerItemDetailDefinitionSaveRequest::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerItemDetailDefinitionSaveRequest::errorMap() const
 {
     Q_D(const QOrganizerItemDetailDefinitionSaveRequest);
     return d->m_errors;
diff --git a/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.h b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.h
index b040516edc..2d565ad0d9 100644
--- a/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.h
+++ b/src/organizer/requests/qorganizeritemdetaildefinitionsaverequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMDETAILDEFINITIONSAVEREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemdetaildefinition.h"
 
 #include <QList>
@@ -52,7 +52,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemDetailDefinitionSaveRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionSaveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemDetailDefinitionSaveRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -67,11 +67,11 @@ public:
 
     /* Results */
     QList<QOrganizerItemDetailDefinition> definitions() const;
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
 private:
     Q_DISABLE_COPY(QOrganizerItemDetailDefinitionSaveRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemDetailDefinitionSaveRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp b/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp
index 10c23f1e41..0a2bfa5cf8 100644
--- a/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp
+++ b/src/organizer/requests/qorganizeritemfetchforexportrequest.cpp
@@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizer item fetch request whose parent is the specified \a parent */
 QOrganizerItemFetchForExportRequest::QOrganizerItemFetchForExportRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemFetchForExportRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemFetchForExportRequestPrivate, parent)
 {
 }
 
diff --git a/src/organizer/requests/qorganizeritemfetchforexportrequest.h b/src/organizer/requests/qorganizeritemfetchforexportrequest.h
index 909851fe83..f625197c6e 100644
--- a/src/organizer/requests/qorganizeritemfetchforexportrequest.h
+++ b/src/organizer/requests/qorganizeritemfetchforexportrequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMFETCHFOREXPORTREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilter.h"
 #include "qorganizeritem.h"
@@ -55,7 +55,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemFetchForExportRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemFetchForExportRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemFetchForExportRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -79,7 +79,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QOrganizerItemFetchForExportRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemFetchForExportRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemfetchrequest.cpp b/src/organizer/requests/qorganizeritemfetchrequest.cpp
index eef840d8c6..e74924bd30 100644
--- a/src/organizer/requests/qorganizeritemfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemfetchrequest.cpp
@@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizer item fetch request whose parent is the specified \a parent */
 QOrganizerItemFetchRequest::QOrganizerItemFetchRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemFetchRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemFetchRequestPrivate, parent)
 {
 }
 
diff --git a/src/organizer/requests/qorganizeritemfetchrequest.h b/src/organizer/requests/qorganizeritemfetchrequest.h
index f45f11a38a..77d1314995 100644
--- a/src/organizer/requests/qorganizeritemfetchrequest.h
+++ b/src/organizer/requests/qorganizeritemfetchrequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMFETCHREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilter.h"
 #include "qorganizeritem.h"
@@ -55,7 +55,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemFetchRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemFetchRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -79,7 +79,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QOrganizerItemFetchRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemFetchRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeriteminstancefetchrequest.cpp b/src/organizer/requests/qorganizeriteminstancefetchrequest.cpp
index 92700ea888..41736b9d59 100644
--- a/src/organizer/requests/qorganizeriteminstancefetchrequest.cpp
+++ b/src/organizer/requests/qorganizeriteminstancefetchrequest.cpp
@@ -59,7 +59,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizer item fetch request whose parent is the specified \a parent */
 QOrganizerItemInstanceFetchRequest::QOrganizerItemInstanceFetchRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemInstanceFetchRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemInstanceFetchRequestPrivate, parent)
 {
 }
 
diff --git a/src/organizer/requests/qorganizeriteminstancefetchrequest.h b/src/organizer/requests/qorganizeriteminstancefetchrequest.h
index db4c2e4961..d1f2d13619 100644
--- a/src/organizer/requests/qorganizeriteminstancefetchrequest.h
+++ b/src/organizer/requests/qorganizeriteminstancefetchrequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMINSTANCEFETCHREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilter.h"
 #include "qorganizeritem.h"
@@ -55,7 +55,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemInstanceFetchRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemInstanceFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemInstanceFetchRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -79,7 +79,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QOrganizerItemInstanceFetchRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemInstanceFetchRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemlocalidfetchrequest.cpp b/src/organizer/requests/qorganizeritemlocalidfetchrequest.cpp
index 604eabf0db..3261d49a0a 100644
--- a/src/organizer/requests/qorganizeritemlocalidfetchrequest.cpp
+++ b/src/organizer/requests/qorganizeritemlocalidfetchrequest.cpp
@@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizer item id fetch request whose parent is the specified \a parent */
 QOrganizerItemLocalIdFetchRequest::QOrganizerItemLocalIdFetchRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemLocalIdFetchRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemLocalIdFetchRequestPrivate, parent)
 {
 }
 
diff --git a/src/organizer/requests/qorganizeritemlocalidfetchrequest.h b/src/organizer/requests/qorganizeritemlocalidfetchrequest.h
index 33c2ad7553..52d30f976e 100644
--- a/src/organizer/requests/qorganizeritemlocalidfetchrequest.h
+++ b/src/organizer/requests/qorganizeritemlocalidfetchrequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMIDFETCHREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritemfilter.h"
 
@@ -53,7 +53,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemLocalIdFetchRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemLocalIdFetchRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemLocalIdFetchRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -75,7 +75,7 @@ public:
 
 private:
     Q_DISABLE_COPY(QOrganizerItemLocalIdFetchRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemLocalIdFetchRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemremoverequest.cpp b/src/organizer/requests/qorganizeritemremoverequest.cpp
index b5bff5afbc..703cea2d82 100644
--- a/src/organizer/requests/qorganizeritemremoverequest.cpp
+++ b/src/organizer/requests/qorganizeritemremoverequest.cpp
@@ -59,7 +59,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizer item remove request whose parent is the specified \a parent */
 QOrganizerItemRemoveRequest::QOrganizerItemRemoveRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemRemoveRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemRemoveRequestPrivate, parent)
 {
 }
 
@@ -92,7 +92,7 @@ QList<QOrganizerItemLocalId> QOrganizerItemRemoveRequest::itemIds() const
 }
 
 /*! Returns the map of input organizer item list indices to errors which occurred */
-QMap<int, QOrganizerItemManager::Error> QOrganizerItemRemoveRequest::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerItemRemoveRequest::errorMap() const
 {
     Q_D(const QOrganizerItemRemoveRequest);
     return d->m_errors;
diff --git a/src/organizer/requests/qorganizeritemremoverequest.h b/src/organizer/requests/qorganizeritemremoverequest.h
index 599da9bc55..769bb5f4e3 100644
--- a/src/organizer/requests/qorganizeritemremoverequest.h
+++ b/src/organizer/requests/qorganizeritemremoverequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMREMOVEREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritemfilter.h"
 
 #include <QList>
@@ -51,7 +51,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemRemoveRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemRemoveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemRemoveRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -64,11 +64,11 @@ public:
     QList<QOrganizerItemLocalId> itemIds() const;
 
     /* Results */
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
 private:
     Q_DISABLE_COPY(QOrganizerItemRemoveRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemRemoveRequest)
 };
 
diff --git a/src/organizer/requests/qorganizeritemrequests_p.h b/src/organizer/requests/qorganizeritemrequests_p.h
index 131c5604ba..17fc8bd3f7 100644
--- a/src/organizer/requests/qorganizeritemrequests_p.h
+++ b/src/organizer/requests/qorganizeritemrequests_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qorganizercollectionid.h"
-#include "qorganizeritemabstractrequest_p.h"
+#include "qorganizerabstractrequest_p.h"
 #include "qorganizeritemfilter.h"
 #include "qorganizeritemsortorder.h"
 #include "qorganizeritem.h"
@@ -65,11 +65,11 @@
 
 QTM_BEGIN_NAMESPACE
 
-class QOrganizerItemSaveRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemSaveRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemSaveRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -77,20 +77,20 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::ItemSaveRequest;
+        return QOrganizerAbstractRequest::ItemSaveRequest;
     }
 
     QList<QOrganizerItem> m_organizeritems;
-    QMap<int, QOrganizerItemManager::Error> m_errors;
+    QMap<int, QOrganizerManager::Error> m_errors;
 };
 
-class QOrganizerItemFetchRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemFetchRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemFetchRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -98,9 +98,9 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::ItemFetchRequest;
+        return QOrganizerAbstractRequest::ItemFetchRequest;
     }
 
     QOrganizerItemFilter m_filter;
@@ -113,11 +113,11 @@ public:
     QDateTime m_endDate;
 };
 
-class QOrganizerItemFetchForExportRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemFetchForExportRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemFetchForExportRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -125,9 +125,9 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::ItemFetchForExportRequest;
+        return QOrganizerAbstractRequest::ItemFetchForExportRequest;
     }
 
     QOrganizerItemFilter m_filter;
@@ -140,11 +140,11 @@ public:
     QDateTime m_endDate;
 };
 
-class QOrganizerItemInstanceFetchRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemInstanceFetchRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemInstanceFetchRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate(),
+        : QOrganizerAbstractRequestPrivate(),
           m_maxOccurrences(-1)
     {
     }
@@ -153,9 +153,9 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::ItemInstanceFetchRequest;
+        return QOrganizerAbstractRequest::ItemInstanceFetchRequest;
     }
 
     QOrganizerItem m_generator;
@@ -167,11 +167,11 @@ public:
     QList<QOrganizerItem> m_organizeritems;
 };
 
-class QOrganizerItemRemoveRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemRemoveRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemRemoveRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -179,20 +179,20 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::ItemRemoveRequest;
+        return QOrganizerAbstractRequest::ItemRemoveRequest;
     }
 
     QList<QOrganizerItemLocalId> m_organizeritemIds;
-    QMap<int, QOrganizerItemManager::Error> m_errors;
+    QMap<int, QOrganizerManager::Error> m_errors;
 };
 
-class QOrganizerItemLocalIdFetchRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemLocalIdFetchRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemLocalIdFetchRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -200,9 +200,9 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::ItemLocalIdFetchRequest;
+        return QOrganizerAbstractRequest::ItemLocalIdFetchRequest;
     }
 
     QOrganizerItemFilter m_filter;
@@ -214,11 +214,11 @@ public:
     QDateTime m_endDate;
 };
 
-class QOrganizerItemDetailDefinitionFetchRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemDetailDefinitionFetchRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemDetailDefinitionFetchRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate(),
+        : QOrganizerAbstractRequestPrivate(),
         m_organizeritemType(QString(QLatin1String(QOrganizerItemType::TypeNote)))
     {
     }
@@ -227,23 +227,23 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest;
+        return QOrganizerAbstractRequest::DetailDefinitionFetchRequest;
     }
 
     QString m_organizeritemType;
     QStringList m_names;
     QMap<QString, QOrganizerItemDetailDefinition> m_definitions;
     QOrganizerCollectionLocalId m_collectionId;
-    QMap<int, QOrganizerItemManager::Error> m_errors;
+    QMap<int, QOrganizerManager::Error> m_errors;
 };
 
-class QOrganizerItemDetailDefinitionSaveRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemDetailDefinitionSaveRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemDetailDefinitionSaveRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate(),
+        : QOrganizerAbstractRequestPrivate(),
         m_organizeritemType(QString(QLatin1String(QOrganizerItemType::TypeNote)))
     {
     }
@@ -252,22 +252,22 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest;
+        return QOrganizerAbstractRequest::DetailDefinitionSaveRequest;
     }
 
     QString m_organizeritemType;
     QList<QOrganizerItemDetailDefinition> m_definitions;
     QOrganizerCollectionLocalId m_collectionId;
-    QMap<int, QOrganizerItemManager::Error> m_errors;
+    QMap<int, QOrganizerManager::Error> m_errors;
 };
 
-class QOrganizerItemDetailDefinitionRemoveRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerItemDetailDefinitionRemoveRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerItemDetailDefinitionRemoveRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate(),
+        : QOrganizerAbstractRequestPrivate(),
         m_organizeritemType(QString(QLatin1String(QOrganizerItemType::TypeNote)))
     {
     }
@@ -276,22 +276,22 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest;
+        return QOrganizerAbstractRequest::DetailDefinitionRemoveRequest;
     }
 
     QString m_organizeritemType;
     QStringList m_names;
     QOrganizerCollectionLocalId m_collectionId;
-    QMap<int, QOrganizerItemManager::Error> m_errors;
+    QMap<int, QOrganizerManager::Error> m_errors;
 };
 
-class QOrganizerCollectionFetchRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerCollectionFetchRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerCollectionFetchRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -299,19 +299,19 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::CollectionFetchRequest;
+        return QOrganizerAbstractRequest::CollectionFetchRequest;
     }
 
     QList<QOrganizerCollection> m_collections;
 };
 
-class QOrganizerCollectionRemoveRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerCollectionRemoveRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerCollectionRemoveRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -319,20 +319,20 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::CollectionRemoveRequest;
+        return QOrganizerAbstractRequest::CollectionRemoveRequest;
     }
 
     QList<QOrganizerCollectionLocalId> m_collectionIds;
-    QMap<int, QOrganizerItemManager::Error> m_errors;
+    QMap<int, QOrganizerManager::Error> m_errors;
 };
 
-class QOrganizerCollectionSaveRequestPrivate : public QOrganizerItemAbstractRequestPrivate
+class QOrganizerCollectionSaveRequestPrivate : public QOrganizerAbstractRequestPrivate
 {
 public:
     QOrganizerCollectionSaveRequestPrivate()
-        : QOrganizerItemAbstractRequestPrivate()
+        : QOrganizerAbstractRequestPrivate()
     {
     }
 
@@ -340,13 +340,13 @@ public:
     {
     }
 
-    QOrganizerItemAbstractRequest::RequestType type() const
+    QOrganizerAbstractRequest::RequestType type() const
     {
-        return QOrganizerItemAbstractRequest::CollectionSaveRequest;
+        return QOrganizerAbstractRequest::CollectionSaveRequest;
     }
 
     QList<QOrganizerCollection> m_collections;
-    QMap<int, QOrganizerItemManager::Error> m_errors;
+    QMap<int, QOrganizerManager::Error> m_errors;
 };
 
 
diff --git a/src/organizer/requests/qorganizeritemsaverequest.cpp b/src/organizer/requests/qorganizeritemsaverequest.cpp
index a5503ed921..0595531b9e 100644
--- a/src/organizer/requests/qorganizeritemsaverequest.cpp
+++ b/src/organizer/requests/qorganizeritemsaverequest.cpp
@@ -60,7 +60,7 @@ QTM_BEGIN_NAMESPACE
 
 /*! Constructs a new organizer item save request whose parent is the specified \a parent */
 QOrganizerItemSaveRequest::QOrganizerItemSaveRequest(QObject* parent)
-    : QOrganizerItemAbstractRequest(new QOrganizerItemSaveRequestPrivate, parent)
+    : QOrganizerAbstractRequest(new QOrganizerItemSaveRequestPrivate, parent)
 {
 }
 
@@ -94,7 +94,7 @@ QList<QOrganizerItem> QOrganizerItemSaveRequest::items() const
 }
 
 /*! Returns the map of input definition list indices to errors which occurred */
-QMap<int, QOrganizerItemManager::Error> QOrganizerItemSaveRequest::errorMap() const
+QMap<int, QOrganizerManager::Error> QOrganizerItemSaveRequest::errorMap() const
 {
     Q_D(const QOrganizerItemSaveRequest);
     return d->m_errors;
diff --git a/src/organizer/requests/qorganizeritemsaverequest.h b/src/organizer/requests/qorganizeritemsaverequest.h
index e56bf1cd55..735851e911 100644
--- a/src/organizer/requests/qorganizeritemsaverequest.h
+++ b/src/organizer/requests/qorganizeritemsaverequest.h
@@ -43,7 +43,7 @@
 #define QORGANIZERITEMSAVEREQUEST_H
 
 #include "qtorganizerglobal.h"
-#include "qorganizeritemabstractrequest.h"
+#include "qorganizerabstractrequest.h"
 #include "qorganizeritem.h"
 
 #include <QList>
@@ -51,7 +51,7 @@
 QTM_BEGIN_NAMESPACE
 
 class QOrganizerItemSaveRequestPrivate;
-class Q_ORGANIZER_EXPORT QOrganizerItemSaveRequest : public QOrganizerItemAbstractRequest
+class Q_ORGANIZER_EXPORT QOrganizerItemSaveRequest : public QOrganizerAbstractRequest
 {
     Q_OBJECT
 
@@ -64,11 +64,11 @@ public:
 
     /* Results */
     QList<QOrganizerItem> items() const;
-    QMap<int, QOrganizerItemManager::Error> errorMap() const;
+    QMap<int, QOrganizerManager::Error> errorMap() const;
 
 private:
     Q_DISABLE_COPY(QOrganizerItemSaveRequest)
-    friend class QOrganizerItemManagerEngine;
+    friend class QOrganizerManagerEngine;
     Q_DECLARE_PRIVATE_D(d_ptr, QOrganizerItemSaveRequest)
 };
 
diff --git a/src/versitorganizer/qversitorganizerexporter.cpp b/src/versitorganizer/qversitorganizerexporter.cpp
index 1cdad46e25..7afc2f29c4 100644
--- a/src/versitorganizer/qversitorganizerexporter.cpp
+++ b/src/versitorganizer/qversitorganizerexporter.cpp
@@ -57,7 +57,7 @@ QTM_USE_NAMESPACE
   \inmodule QtVersit
 
   This class is used to convert a list of \l {QOrganizerItem}{QOrganizerItems} (which may be stored
-  in a QOrganizerItemManager) into a QVersitDocument (which may be written to an I/O device using
+  in a QOrganizerManager) into a QVersitDocument (which may be written to an I/O device using
   QVersitReader.  While multiple items are provided as input, a single QVersitDocument is produced
   as output.  Unless there is an error, there is a one-to-one mapping between organizer items
   and sub-documents of the result.
diff --git a/src/versitorganizer/qversitorganizerexporter_p.cpp b/src/versitorganizer/qversitorganizerexporter_p.cpp
index a719978c7d..1a7573d235 100644
--- a/src/versitorganizer/qversitorganizerexporter_p.cpp
+++ b/src/versitorganizer/qversitorganizerexporter_p.cpp
@@ -122,11 +122,11 @@ void QVersitOrganizerExporterPrivate::exportDetail(
     QList<QVersitProperty> generatedProperties;
     QSet<QString> processedFields;
 
-    if (detail.definitionName() == QOrganizerEventTimeRange::DefinitionName) {
+    if (detail.definitionName() == QOrganizerEventTime::DefinitionName) {
         encodeEventTimeRange(detail, *document, &removedProperties, &generatedProperties, &processedFields);
-    } else if (detail.definitionName() == QOrganizerTodoTimeRange::DefinitionName) {
+    } else if (detail.definitionName() == QOrganizerTodoTime::DefinitionName) {
         encodeTodoTimeRange(detail, *document, &removedProperties, &generatedProperties, &processedFields);
-    } else if (detail.definitionName() == QOrganizerJournalTimeRange::DefinitionName) {
+    } else if (detail.definitionName() == QOrganizerJournalTime::DefinitionName) {
         encodeJournalTimeRange(detail, *document, &removedProperties, &generatedProperties, &processedFields);
     } else if (detail.definitionName() == QOrganizerItemTimestamp::DefinitionName) {
         encodeTimestamp(detail, *document, &removedProperties, &generatedProperties, &processedFields);
@@ -170,7 +170,7 @@ void QVersitOrganizerExporterPrivate::encodeEventTimeRange(
         QList<QVersitProperty>* generatedProperties,
         QSet<QString>* processedFields)
 {
-    QOrganizerEventTimeRange etr = static_cast<QOrganizerEventTimeRange>(detail);
+    QOrganizerEventTime etr = static_cast<QOrganizerEventTime>(detail);
     QVersitProperty property =
         takeProperty(document, QLatin1String("DTSTART"), removedProperties);
     property.setName(QLatin1String("DTSTART"));
@@ -182,8 +182,8 @@ void QVersitOrganizerExporterPrivate::encodeEventTimeRange(
     property.setName(QLatin1String("DTEND"));
     property.setValue(encodeDateTime(etr.endDateTime()));
     *generatedProperties << property;
-    *processedFields << QOrganizerEventTimeRange::FieldStartDateTime
-                     << QOrganizerEventTimeRange::FieldEndDateTime;
+    *processedFields << QOrganizerEventTime::FieldStartDateTime
+                     << QOrganizerEventTime::FieldEndDateTime;
 }
 
 void QVersitOrganizerExporterPrivate::encodeTodoTimeRange(
@@ -193,7 +193,7 @@ void QVersitOrganizerExporterPrivate::encodeTodoTimeRange(
         QList<QVersitProperty>* generatedProperties,
         QSet<QString>* processedFields)
 {
-    QOrganizerTodoTimeRange ttr = static_cast<QOrganizerTodoTimeRange>(detail);
+    QOrganizerTodoTime ttr = static_cast<QOrganizerTodoTime>(detail);
     QVersitProperty property =
         takeProperty(document, QLatin1String("DTSTART"), removedProperties);
     property.setName(QLatin1String("DTSTART"));
@@ -205,8 +205,8 @@ void QVersitOrganizerExporterPrivate::encodeTodoTimeRange(
     property.setName(QLatin1String("DUE"));
     property.setValue(encodeDateTime(ttr.dueDateTime()));
     *generatedProperties << property;
-    *processedFields << QOrganizerTodoTimeRange::FieldStartDateTime
-                     << QOrganizerTodoTimeRange::FieldDueDateTime;
+    *processedFields << QOrganizerTodoTime::FieldStartDateTime
+                     << QOrganizerTodoTime::FieldDueDateTime;
 }
 
 void QVersitOrganizerExporterPrivate::encodeJournalTimeRange(
@@ -216,13 +216,13 @@ void QVersitOrganizerExporterPrivate::encodeJournalTimeRange(
         QList<QVersitProperty>* generatedProperties,
         QSet<QString>* processedFields)
 {
-    QOrganizerJournalTimeRange jtr = static_cast<QOrganizerJournalTimeRange>(detail);
+    QOrganizerJournalTime jtr = static_cast<QOrganizerJournalTime>(detail);
     QVersitProperty property =
         takeProperty(document, QLatin1String("DTSTART"), removedProperties);
     property.setName(QLatin1String("DTSTART"));
     property.setValue(encodeDateTime(jtr.entryDateTime()));
     *generatedProperties << property;
-    *processedFields << QOrganizerJournalTimeRange::FieldEntryDateTime;
+    *processedFields << QOrganizerJournalTime::FieldEntryDateTime;
 }
 
 void QVersitOrganizerExporterPrivate::encodeTimestamp(
@@ -257,18 +257,18 @@ void QVersitOrganizerExporterPrivate::encodeRecurrence(
         QSet<QString>* processedFields)
 {
     QOrganizerItemRecurrence recurrence = static_cast<QOrganizerItemRecurrence>(detail);
-    QSet<QOrganizerItemRecurrenceRule> rrules = recurrence.recurrenceRules();
-    QSet<QOrganizerItemRecurrenceRule> exrules = recurrence.exceptionRules();
+    QSet<QOrganizerRecurrenceRule> rrules = recurrence.recurrenceRules();
+    QSet<QOrganizerRecurrenceRule> exrules = recurrence.exceptionRules();
     QSet<QDate> rdates = recurrence.recurrenceDates();
     QSet<QDate> exdates = recurrence.exceptionDates();
     if (!rrules.isEmpty()) {
-        foreach (const QOrganizerItemRecurrenceRule& rrule, rrules) {
+        foreach (const QOrganizerRecurrenceRule& rrule, rrules) {
             encodeRecurRule(QLatin1String("RRULE"), rrule, generatedProperties);
         }
         *processedFields << QOrganizerItemRecurrence::FieldRecurrenceRules;
     }
     if (!exrules.isEmpty()) {
-        foreach (const QOrganizerItemRecurrenceRule& exrule, exrules) {
+        foreach (const QOrganizerRecurrenceRule& exrule, exrules) {
             encodeRecurRule(QLatin1String("EXRULE"), exrule, generatedProperties);
         }
         *processedFields << QOrganizerItemRecurrence::FieldExceptionRules;
@@ -286,34 +286,34 @@ void QVersitOrganizerExporterPrivate::encodeRecurrence(
 /*! Encodes an iCalendar recurrence specification from \a rule. */
 void QVersitOrganizerExporterPrivate::encodeRecurRule(
         const QString& propertyName,
-        const QOrganizerItemRecurrenceRule& rule,
+        const QOrganizerRecurrenceRule& rule,
         QList<QVersitProperty>* generatedProperties)
 {
     QVersitProperty property;
     property.setName(propertyName);
     QString value = QLatin1String("FREQ=");
     switch (rule.frequency()) {
-        case QOrganizerItemRecurrenceRule::Daily:
+        case QOrganizerRecurrenceRule::Daily:
             value.append(QLatin1String("DAILY"));
             break;
-        case QOrganizerItemRecurrenceRule::Weekly:
+        case QOrganizerRecurrenceRule::Weekly:
             value.append(QLatin1String("WEEKLY"));
             break;
-        case QOrganizerItemRecurrenceRule::Monthly:
+        case QOrganizerRecurrenceRule::Monthly:
             value.append(QLatin1String("MONTHLY"));
             break;
-        case QOrganizerItemRecurrenceRule::Yearly:
+        case QOrganizerRecurrenceRule::Yearly:
             value.append(QLatin1String("YEARLY"));
             break;
-        case QOrganizerItemRecurrenceRule::Invalid:
+        case QOrganizerRecurrenceRule::Invalid:
         default:
             return;
     }
-    if (rule.limitType() == QOrganizerItemRecurrenceRule::CountLimit) {
+    if (rule.limitType() == QOrganizerRecurrenceRule::CountLimit) {
         value.append(QLatin1String(";COUNT="));
         value.append(QString::number(rule.limitCount()));
     }
-    if (rule.limitType() == QOrganizerItemRecurrenceRule::DateLimit) {
+    if (rule.limitType() == QOrganizerRecurrenceRule::DateLimit) {
         value.append(QLatin1String(";UNTIL="));
         value.append(rule.limitDate().toString(QLatin1String("yyyyMMdd")));
     }
@@ -348,10 +348,10 @@ void QVersitOrganizerExporterPrivate::encodeRecurRule(
     if (!rule.monthsOfYear().isEmpty()) {
         value.append(QLatin1String(";BYMONTH="));
         bool first = true;
-        QList<QOrganizerItemRecurrenceRule::Month> months(
-                QList<QOrganizerItemRecurrenceRule::Month>::fromSet(rule.monthsOfYear()));
+        QList<QOrganizerRecurrenceRule::Month> months(
+                QList<QOrganizerRecurrenceRule::Month>::fromSet(rule.monthsOfYear()));
         qSort(months);
-        foreach (QOrganizerItemRecurrenceRule::Month month, months) {
+        foreach (QOrganizerRecurrenceRule::Month month, months) {
             if (!first)
                 value.append(QLatin1String(","));
             first = false;
diff --git a/src/versitorganizer/qversitorganizerexporter_p.h b/src/versitorganizer/qversitorganizerexporter_p.h
index 9a888a6b60..a4b22df16e 100644
--- a/src/versitorganizer/qversitorganizerexporter_p.h
+++ b/src/versitorganizer/qversitorganizerexporter_p.h
@@ -43,7 +43,7 @@
 #define QVERSITORGANIZEREXPORTER_P_H
 
 #include "qversitorganizerexporter.h"
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule.h"
 #include "qversitorganizerhandler.h"
 #include "qversittimezonehandler.h"
 
@@ -103,7 +103,7 @@ private:
             QSet<QString>* processedFields);
     void encodeRecurRule(
             const QString& propertyName,
-            const QOrganizerItemRecurrenceRule& rule,
+            const QOrganizerRecurrenceRule& rule,
             QList<QVersitProperty>* generatedProperties);
     void appendInts(QString* str, const QSet<int>& ints);
     QString weekString(Qt::DayOfWeek day);
diff --git a/src/versitorganizer/qversitorganizerimporter.cpp b/src/versitorganizer/qversitorganizerimporter.cpp
index 64e763763b..58d701fc79 100644
--- a/src/versitorganizer/qversitorganizerimporter.cpp
+++ b/src/versitorganizer/qversitorganizerimporter.cpp
@@ -57,7 +57,7 @@ QTM_USE_NAMESPACE
 
   This class is used to convert a \l QVersitDocument (which may be produced by a
   QVersitReader) to lists of \l{QOrganizerItem}{QOrganizerItems} (which may be saved into a
-  QOrganizerItemManager.  Unless there is an error, there is a one-to-one mapping between
+  QOrganizerManager.  Unless there is an error, there is a one-to-one mapping between
   sub-documents of the input Versit document and QOrganizerItems.
  */
 
diff --git a/src/versitorganizer/qversitorganizerimporter_p.cpp b/src/versitorganizer/qversitorganizerimporter_p.cpp
index ce9ce2c181..a3fab0970f 100644
--- a/src/versitorganizer/qversitorganizerimporter_p.cpp
+++ b/src/versitorganizer/qversitorganizerimporter_p.cpp
@@ -292,7 +292,7 @@ bool QVersitOrganizerImporterPrivate::createStartDateTime(
     QDateTime newStart = parseDateTime(property);
     if (!newStart.isValid())
         return false;
-    QOrganizerEventTimeRange etr(item->detail<QOrganizerEventTimeRange>());
+    QOrganizerEventTime etr(item->detail<QOrganizerEventTime>());
     if (mDurationSpecified) {
         // Need to fix up the end date to match the duration of the event
         QDateTime start = etr.startDateTime();
@@ -324,7 +324,7 @@ bool QVersitOrganizerImporterPrivate::createEndDateTime(
     QDateTime newEnd = parseDateTime(property);
     if (!newEnd.isValid())
         return false;
-    QOrganizerEventTimeRange etr(item->detail<QOrganizerEventTimeRange>());
+    QOrganizerEventTime etr(item->detail<QOrganizerEventTime>());
     etr.setEndDateTime(newEnd);
     updatedDetails->append(etr);
     mDurationSpecified = false;
@@ -343,7 +343,7 @@ bool QVersitOrganizerImporterPrivate::createDuration(
     Duration duration = Duration::parseDuration(property.value());
     if (!duration.isValid())
         return false;
-    QOrganizerEventTimeRange etr(item->detail<QOrganizerEventTimeRange>());
+    QOrganizerEventTime etr(item->detail<QOrganizerEventTime>());
     QDateTime startTime = etr.startDateTime();
     if (!startTime.isValid()) {
         // not having a start date set is treated as a start date of epoch
@@ -368,7 +368,7 @@ bool QVersitOrganizerImporterPrivate::createTodoStartDateTime(
     QDateTime newStart = parseDateTime(property);
     if (!newStart.isValid())
         return false;
-    QOrganizerTodoTimeRange ttr(item->detail<QOrganizerTodoTimeRange>());
+    QOrganizerTodoTime ttr(item->detail<QOrganizerTodoTime>());
     ttr.setStartDateTime(newStart);
     updatedDetails->append(ttr);
     return true;
@@ -385,7 +385,7 @@ bool QVersitOrganizerImporterPrivate::createDueDateTime(
     QDateTime newEnd = parseDateTime(property);
     if (!newEnd.isValid())
         return false;
-    QOrganizerTodoTimeRange ttr(item->detail<QOrganizerTodoTimeRange>());
+    QOrganizerTodoTime ttr(item->detail<QOrganizerTodoTime>());
     ttr.setDueDateTime(newEnd);
     updatedDetails->append(ttr);
     mDurationSpecified = false;
@@ -403,7 +403,7 @@ bool QVersitOrganizerImporterPrivate::createJournalEntryDateTime(
     QDateTime dateTime = parseDateTime(property);
     if (!dateTime.isValid())
         return false;
-    QOrganizerJournalTimeRange jtr(item->detail<QOrganizerJournalTimeRange>());
+    QOrganizerJournalTime jtr(item->detail<QOrganizerJournalTime>());
     jtr.setEntryDateTime(dateTime);
     updatedDetails->append(jtr);
     return true;
@@ -453,7 +453,7 @@ bool QVersitOrganizerImporterPrivate::createRecurrenceRule(
         QList<QOrganizerItemDetail>* updatedDetails) {
     if (property.value().isEmpty())
         return false;
-    QOrganizerItemRecurrenceRule rule;
+    QOrganizerRecurrenceRule rule;
     if (!parseRecurRule(property.value(), &rule))
         return false;
     QOrganizerItemRecurrence detail(item->detail<QOrganizerItemRecurrence>());
@@ -470,7 +470,7 @@ bool QVersitOrganizerImporterPrivate::createRecurrenceRule(
  * Parses an iCalendar recurrence rule string \a str and puts the result in \a rule.
  * Return true on success, false on failure.
  */
-bool QVersitOrganizerImporterPrivate::parseRecurRule(const QString& str, QOrganizerItemRecurrenceRule* rule) const
+bool QVersitOrganizerImporterPrivate::parseRecurRule(const QString& str, QOrganizerRecurrenceRule* rule) const
 {
     QStringList parts = str.split(QLatin1Char(';'));
     if (parts.size() == 0)
@@ -484,13 +484,13 @@ bool QVersitOrganizerImporterPrivate::parseRecurRule(const QString& str, QOrgani
         return false;
     QString freqValue = freqParts.at(1);
     if (freqValue == QLatin1String("DAILY")) {
-        rule->setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        rule->setFrequency(QOrganizerRecurrenceRule::Daily);
     } else if (freqValue == QLatin1String("WEEKLY")) {
-        rule->setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+        rule->setFrequency(QOrganizerRecurrenceRule::Weekly);
     } else if (freqValue == QLatin1String("MONTHLY")) {
-        rule->setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        rule->setFrequency(QOrganizerRecurrenceRule::Monthly);
     } else if (freqValue == QLatin1String("YEARLY")) {
-        rule->setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+        rule->setFrequency(QOrganizerRecurrenceRule::Yearly);
     } else {
         return false;
     }
@@ -509,7 +509,7 @@ bool QVersitOrganizerImporterPrivate::parseRecurRule(const QString& str, QOrgani
  * \a key is the part of the fragment before the equals sign and \a value is the part after.
  */
 void QVersitOrganizerImporterPrivate::parseRecurFragment(const QString& key, const QString& value,
-                                                         QOrganizerItemRecurrenceRule* rule) const
+                                                         QOrganizerRecurrenceRule* rule) const
 {
     if (key == QLatin1String("INTERVAL")) {
         bool ok;
@@ -569,13 +569,13 @@ void QVersitOrganizerImporterPrivate::parseRecurFragment(const QString& key, con
             rule->setWeeksOfYear(weeks);
         }
     } else if (key == QLatin1String("BYMONTH")) {
-        QSet<QOrganizerItemRecurrenceRule::Month> months;
+        QSet<QOrganizerRecurrenceRule::Month> months;
         QStringList monthParts = value.split(QLatin1Char(','));
         foreach (const QString& monthParts, monthParts) {
             bool ok;
             int month = monthParts.toInt(&ok);
             if (ok && month >= 1 && month <= 12) {
-                months << (QOrganizerItemRecurrenceRule::Month)month;
+                months << (QOrganizerRecurrenceRule::Month)month;
             }
         }
         if (!months.isEmpty()) {
@@ -938,7 +938,7 @@ TimeZonePhase QVersitOrganizerImporterPrivate::importTimeZonePhase(const QVersit
                 phase.setStartDateTime(dt);
             }
         } else if (property.name() == QLatin1String("RRULE")) {
-            QOrganizerItemRecurrenceRule rrule;
+            QOrganizerRecurrenceRule rrule;
             if (parseRecurRule(property.value(), &rrule)) {
                 phase.setRecurrenceRule(rrule);
             }
diff --git a/src/versitorganizer/qversitorganizerimporter_p.h b/src/versitorganizer/qversitorganizerimporter_p.h
index 361c5dd010..2e914d5515 100644
--- a/src/versitorganizer/qversitorganizerimporter_p.h
+++ b/src/versitorganizer/qversitorganizerimporter_p.h
@@ -178,9 +178,9 @@ private:
             const QVersitProperty& property,
             QOrganizerItem* item,
             QList<QOrganizerItemDetail>* updatedDetails);
-    bool parseRecurRule(const QString& str, QOrganizerItemRecurrenceRule* rule) const;
+    bool parseRecurRule(const QString& str, QOrganizerRecurrenceRule* rule) const;
     void parseRecurFragment(const QString& key, const QString& value,
-                            QOrganizerItemRecurrenceRule* rule) const;
+                            QOrganizerRecurrenceRule* rule) const;
     QSet<int> parseInts(const QString& str, int min, int max) const;
     int parseDayOfWeek(const QString& str) const;
 
diff --git a/src/versitorganizer/timezones_p.cpp b/src/versitorganizer/timezones_p.cpp
index 8e3b777843..240c532547 100644
--- a/src/versitorganizer/timezones_p.cpp
+++ b/src/versitorganizer/timezones_p.cpp
@@ -43,22 +43,22 @@
 #include "qtorganizer.h"
 #include <QDateTime>
 
-QOrganizerItemManager* TimeZone::getManager()
+QOrganizerManager* TimeZone::getManager()
 {
-    static QOrganizerItemManager* manager(new QOrganizerItemManager());
+    static QOrganizerManager* manager(new QOrganizerManager());
     return manager;
 }
 
 QDateTime TimeZone::convert(const QDateTime& dateTime) const
 {
     Q_ASSERT(isValid());
-    QOrganizerItemManager* manager = getManager();
+    QOrganizerManager* manager = getManager();
     int offset = 100000; // impossible value
     QDateTime latestPhase;
     foreach(const TimeZonePhase& phase, mPhases) {
         QOrganizerEvent event;
         event.setStartDateTime(phase.startDateTime());
-        event.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << phase.recurrenceRule());
+        event.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << phase.recurrenceRule());
         event.setRecurrenceDates(phase.recurrenceDates());
         QList<QOrganizerItem> occurrences =
             manager->itemInstances(event, phase.startDateTime(), dateTime, 500);
diff --git a/src/versitorganizer/timezones_p.h b/src/versitorganizer/timezones_p.h
index 766c4b8e23..85019f540e 100644
--- a/src/versitorganizer/timezones_p.h
+++ b/src/versitorganizer/timezones_p.h
@@ -44,10 +44,10 @@
 
 #include <QDateTime>
 #include <QHash>
-#include "qorganizeritemrecurrencerule.h"
+#include "qorganizerrecurrencerule.h"
 
 QTM_BEGIN_NAMESPACE
-class QOrganizerItemManager;
+class QOrganizerManager;
 QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
@@ -71,8 +71,8 @@ class TimeZonePhase {
         int utcOffset() const { return mUtcOffset; }
         void setStartDateTime(const QDateTime& dateTime) { mStartDateTime = dateTime; }
         QDateTime startDateTime() const { return mStartDateTime; }
-        void setRecurrenceRule(const QOrganizerItemRecurrenceRule& rrule) { mRecurrenceRule = rrule; }
-        QOrganizerItemRecurrenceRule recurrenceRule() const { return mRecurrenceRule; }
+        void setRecurrenceRule(const QOrganizerRecurrenceRule& rrule) { mRecurrenceRule = rrule; }
+        QOrganizerRecurrenceRule recurrenceRule() const { return mRecurrenceRule; }
         void setRecurrenceDates(const QSet<QDate>& rdates) { mRecurrenceDates = rdates; }
         QSet<QDate> recurrenceDates() const { return mRecurrenceDates; }
         bool isValid() const {
@@ -83,7 +83,7 @@ class TimeZonePhase {
         bool mStandard; // true for STANDARD, false for DAYLIGHT
         int mUtcOffset; // in seconds, the offset to apply after mStartDateTime
         QDateTime mStartDateTime; // local time, when the phase comes into effect
-        QOrganizerItemRecurrenceRule mRecurrenceRule;
+        QOrganizerRecurrenceRule mRecurrenceRule;
         QSet<QDate> mRecurrenceDates;
 };
 
@@ -101,7 +101,7 @@ class TimeZone {
         }
 
     private:
-        static QOrganizerItemManager* getManager();
+        static QOrganizerManager* getManager();
         QString mTzid;
         QList<TimeZonePhase> mPhases;
 };
diff --git a/tests/auto/organizer.pro b/tests/auto/organizer.pro
index 5d245ce4e3..eea1a4e5c2 100644
--- a/tests/auto/organizer.pro
+++ b/tests/auto/organizer.pro
@@ -10,7 +10,7 @@ SUBDIRS += \
     qorganizeritemdetail \
     qorganizeritemdetaildefinition \
     qorganizeritemfilter \
-    qorganizeritemmanager
+    qorganizermanager
 
 contains(QT_CONFIG, declarative) {
     SUBDIRS += qdeclarativeorganizer
diff --git a/tests/auto/qorganizercollection/tst_qorganizercollection.cpp b/tests/auto/qorganizercollection/tst_qorganizercollection.cpp
index 9fae971154..07ec5a33db 100644
--- a/tests/auto/qorganizercollection/tst_qorganizercollection.cpp
+++ b/tests/auto/qorganizercollection/tst_qorganizercollection.cpp
@@ -219,7 +219,7 @@ void tst_QOrganizerCollection::datastream()
     // first, stream an item with a complete id
     {
         QDataStream stream1(&buffer, QIODevice::WriteOnly);
-        QOrganizerItemManager om("memory");
+        QOrganizerManager om("memory");
         QVERIFY(om.saveCollection(&collectionIn)); // fill in its ID
         originalId = collectionIn.id();
         stream1 << collectionIn;
diff --git a/tests/auto/qorganizeritem/tst_qorganizeritem.cpp b/tests/auto/qorganizeritem/tst_qorganizeritem.cpp
index f7b55c20cc..5787bf3b10 100644
--- a/tests/auto/qorganizeritem/tst_qorganizeritem.cpp
+++ b/tests/auto/qorganizeritem/tst_qorganizeritem.cpp
@@ -602,7 +602,7 @@ void tst_QOrganizerItem::datastream()
     // first, stream an item with a complete id
     {
         QDataStream stream1(&buffer, QIODevice::WriteOnly);
-        QOrganizerItemManager om("memory");
+        QOrganizerManager om("memory");
         QVERIFY(om.saveItem(&itemIn)); // fill in its ID
         originalId = itemIn.id();
         originalCollectionId = itemIn.collectionId();
@@ -830,59 +830,59 @@ void tst_QOrganizerItem::event()
     testEvent.setExceptionDates(exdates);
     QCOMPARE(testEvent.exceptionDates(), exdates);
 
-    QSet<QOrganizerItemRecurrenceRule> rrules;
-    QOrganizerItemRecurrenceRule rrule;
+    QSet<QOrganizerRecurrenceRule> rrules;
+    QOrganizerRecurrenceRule rrule;
 
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::NoLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::NoLimit);
     QVERIFY(rrule.limitCount() == -1);
     QVERIFY(rrule.limitDate().isNull());
 
     rrule.setLimit(1);
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::CountLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::CountLimit);
     QVERIFY(rrule.limitCount() == 1);
     QVERIFY(rrule.limitDate().isNull());
 
     rrule.setLimit(-1);
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::NoLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::NoLimit);
     QVERIFY(rrule.limitCount() == -1);
     QVERIFY(rrule.limitDate().isNull());
 
     rrule.setLimit(0);
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::CountLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::CountLimit);
     QVERIFY(rrule.limitCount() == 0);
     QVERIFY(rrule.limitDate().isNull());
 
     rrule.setLimit(-100);
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::NoLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::NoLimit);
     QVERIFY(rrule.limitCount() == -1);
     QVERIFY(rrule.limitDate().isNull());
 
     rrule.setLimit(QDate());
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::NoLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::NoLimit);
     QVERIFY(rrule.limitCount() == -1);
     QVERIFY(rrule.limitDate().isNull());
 
     rrule.setLimit(QDate(2010, 10, 6));
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::DateLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::DateLimit);
     QVERIFY(rrule.limitCount() == -1);
     QVERIFY(rrule.limitDate() == QDate(2010, 10, 6));
 
     rrule.setLimit(QDate(2010, 13, 34));
-    QVERIFY(rrule.limitType() == QOrganizerItemRecurrenceRule::NoLimit);
+    QVERIFY(rrule.limitType() == QOrganizerRecurrenceRule::NoLimit);
     QVERIFY(rrule.limitCount() == -1);
     QVERIFY(rrule.limitDate() == QDate());
 
 
     rrule.setLimit(2);
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrules << rrule;
     testEvent.setRecurrenceRule(rrule);
     QVERIFY(testEvent.recurrenceRules() == rrules);
 
-    QSet<QOrganizerItemRecurrenceRule> exrules;
-    QOrganizerItemRecurrenceRule exrule;
+    QSet<QOrganizerRecurrenceRule> exrules;
+    QOrganizerRecurrenceRule exrule;
     exrule.setLimit(1);
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
     testEvent.setExceptionRules(exrules);
     QVERIFY(testEvent.exceptionRules() == exrules);
 }
@@ -922,18 +922,18 @@ void tst_QOrganizerItem::todo()
     testTodo.setExceptionDates(exdates);
     QCOMPARE(testTodo.exceptionDates(), exdates);
 
-    QSet<QOrganizerItemRecurrenceRule> rrules;
-    QOrganizerItemRecurrenceRule rrule;
+    QSet<QOrganizerRecurrenceRule> rrules;
+    QOrganizerRecurrenceRule rrule;
     rrule.setLimit(2);
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrules << rrule;
     testTodo.setRecurrenceRules(rrules);
     QVERIFY(testTodo.recurrenceRules() == rrules);
 
-    QSet<QOrganizerItemRecurrenceRule> exrules;
-    QOrganizerItemRecurrenceRule exrule;
+    QSet<QOrganizerRecurrenceRule> exrules;
+    QOrganizerRecurrenceRule exrule;
     exrule.setLimit(1);
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
     testTodo.setExceptionRules(exrules);
     QVERIFY(testTodo.exceptionRules() == exrules);
 }
diff --git a/tests/auto/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp b/tests/auto/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp
index 6000655895..372b598843 100644
--- a/tests/auto/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp
+++ b/tests/auto/qorganizeritemasync/unittest/tst_qorganizeritemasync.cpp
@@ -45,7 +45,7 @@
 #include <QScopedPointer>
 
 #include "qtorganizer.h"
-#include "qorganizeritemmanagerdataholder.h" //QOrganizerItemManagerDataHolder
+#include "qorganizermanagerdataholder.h" //QOrganizerManagerDataHolder
 
 QTM_USE_NAMESPACE
 /* Define an innocuous request (fetch ie doesn't mutate) to "fill up" any queues */
@@ -229,11 +229,11 @@ private:
     bool containsIgnoringTimestamps(const QList<QOrganizerItem>& list, const QOrganizerItem& c);
     bool compareIgnoringTimestamps(const QOrganizerItem& ca, const QOrganizerItem& cb);
     bool containsAllCollectionIds(const QList<QOrganizerCollectionLocalId>& target, const QList<QOrganizerCollectionLocalId>& ids);
-    QOrganizerItemManager* prepareModel(const QString& uri);
+    QOrganizerManager* prepareModel(const QString& uri);
 
     Qt::HANDLE m_mainThreadId;
     Qt::HANDLE m_resultsAvailableSlotThreadId;
-    QScopedPointer<QOrganizerItemManagerDataHolder> managerDataHolder;
+    QScopedPointer<QOrganizerManagerDataHolder> managerDataHolder;
 };
 
 tst_QOrganizerItemAsync::tst_QOrganizerItemAsync()
@@ -242,7 +242,7 @@ tst_QOrganizerItemAsync::tst_QOrganizerItemAsync()
     QString path = QApplication::applicationDirPath() + "/dummyplugin/plugins";
     QApplication::addLibraryPath(path);
 
-    qRegisterMetaType<QOrganizerItemAbstractRequest::State>("QOrganizerItemAbstractRequest::State");
+    qRegisterMetaType<QOrganizerAbstractRequest::State>("QOrganizerAbstractRequest::State");
 }
 
 tst_QOrganizerItemAsync::~tst_QOrganizerItemAsync()
@@ -251,7 +251,7 @@ tst_QOrganizerItemAsync::~tst_QOrganizerItemAsync()
 
 void tst_QOrganizerItemAsync::initTestCase()
 {
-    managerDataHolder.reset(new QOrganizerItemManagerDataHolder());
+    managerDataHolder.reset(new QOrganizerManagerDataHolder());
 }
 
 void tst_QOrganizerItemAsync::cleanupTestCase()
@@ -374,11 +374,11 @@ bool tst_QOrganizerItemAsync::containsAllCollectionIds(const QList<QOrganizerCol
 void tst_QOrganizerItemAsync::testDestructor()
 {
     QFETCH(QString, uri);
-    QOrganizerItemManager* cm = prepareModel(uri);
+    QOrganizerManager* cm = prepareModel(uri);
     QOrganizerItemFetchRequest* req = new QOrganizerItemFetchRequest;
     req->setManager(cm);
 
-    QOrganizerItemManager* cm2 = prepareModel(uri);
+    QOrganizerManager* cm2 = prepareModel(uri);
     QOrganizerItemFetchRequest* req2 = new QOrganizerItemFetchRequest;
     req2->setManager(cm2);
 
@@ -400,10 +400,10 @@ void tst_QOrganizerItemAsync::deleteRequest()
 void tst_QOrganizerItemAsync::itemFetch()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
 
     QOrganizerItemFetchRequest ifr;
-    QVERIFY(ifr.type() == QOrganizerItemAbstractRequest::ItemFetchRequest);
+    QVERIFY(ifr.type() == QOrganizerAbstractRequest::ItemFetchRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!ifr.isActive());
@@ -421,14 +421,14 @@ void tst_QOrganizerItemAsync::itemFetch()
     QVERIFY(!ifr.cancel());
     QVERIFY(!ifr.waitForFinished());
     qRegisterMetaType<QOrganizerItemFetchRequest*>("QOrganizerItemFetchRequest*");
-    QThreadSignalSpy spy(&ifr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&ifr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     ifr.setFilter(fil);
     QCOMPARE(ifr.filter(), fil);
     QVERIFY(!ifr.cancel()); // not started
 
     QVERIFY(ifr.start());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
-    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
 
@@ -451,7 +451,7 @@ void tst_QOrganizerItemAsync::itemFetch()
     QVERIFY(!ifr.cancel()); // not started
 
     QVERIFY(ifr.start());
-    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
@@ -476,7 +476,7 @@ void tst_QOrganizerItemAsync::itemFetch()
     QCOMPARE(ifr.sorting(), sorting);
     QVERIFY(!ifr.cancel()); // not started
     QVERIFY(ifr.start());
-    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
@@ -502,7 +502,7 @@ void tst_QOrganizerItemAsync::itemFetch()
     QCOMPARE(ifr.fetchHint().detailDefinitionsHint(), QStringList(QOrganizerItemDescription::DefinitionName));
     QVERIFY(!ifr.cancel()); // not started
     QVERIFY(ifr.start());
-    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
@@ -618,7 +618,7 @@ void tst_QOrganizerItemAsync::itemFetch()
         QVERIFY(spy.count() >= 1); // active + cancelled progress signals
         spy.clear();
         QVERIFY(!ifr.isActive());
-        QVERIFY(ifr.state() == QOrganizerItemAbstractRequest::CanceledState);
+        QVERIFY(ifr.state() == QOrganizerAbstractRequest::CanceledState);
         break;
     }
 
@@ -626,7 +626,7 @@ void tst_QOrganizerItemAsync::itemFetch()
     QOrganizerItemFetchRequest *ifr2 = new QOrganizerItemFetchRequest();
     QPointer<QObject> obj(ifr2);
     ifr2->setManager(oim.data());
-    connect(ifr2, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), this, SLOT(deleteRequest()));
+    connect(ifr2, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), this, SLOT(deleteRequest()));
     QVERIFY(ifr2->start());
     int i = 100;
     // at this point we can't even call wait for finished..
@@ -640,12 +640,12 @@ void tst_QOrganizerItemAsync::itemFetch()
 void tst_QOrganizerItemAsync::itemFetchById()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
 
 /* XXX TODO: fetchbyid request for items as well as items!!!
 
     QOrganizerItemFetchByIdRequest ifr;
-    QVERIFY(ifr.type() == QOrganizerItemAbstractRequest::ItemFetchByIdRequest);
+    QVERIFY(ifr.type() == QOrganizerAbstractRequest::ItemFetchByIdRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!ifr.isActive());
@@ -666,12 +666,12 @@ void tst_QOrganizerItemAsync::itemFetchById()
     QVERIFY(!ifr.cancel());
     QVERIFY(!ifr.waitForFinished());
     qRegisterMetaType<QOrganizerItemFetchByIdRequest*>("QOrganizerItemFetchByIdRequest*");
-    QThreadSignalSpy spy(&ifr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&ifr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QVERIFY(!ifr.cancel()); // not started
 
     QVERIFY(ifr.start());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
-    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
 
@@ -691,9 +691,9 @@ XXX TODO: fetchbyid request for items as well as items!!! */
 void tst_QOrganizerItemAsync::itemIdFetch()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
     QOrganizerItemLocalIdFetchRequest ifr;
-    QVERIFY(ifr.type() == QOrganizerItemAbstractRequest::ItemLocalIdFetchRequest);
+    QVERIFY(ifr.type() == QOrganizerAbstractRequest::ItemLocalIdFetchRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!ifr.isActive());
@@ -712,13 +712,13 @@ void tst_QOrganizerItemAsync::itemIdFetch()
     QVERIFY(!ifr.waitForFinished());
     qRegisterMetaType<QOrganizerItemLocalIdFetchRequest*>("QOrganizerItemLocalIdFetchRequest*");
 
-    QThreadSignalSpy spy(&ifr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&ifr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     ifr.setFilter(fil);
     QCOMPARE(ifr.filter(), fil);
     QVERIFY(!ifr.cancel()); // not started
     QVERIFY(ifr.start());
 
-    QVERIFY((ifr.isActive() &&ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() &&ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
@@ -738,7 +738,7 @@ void tst_QOrganizerItemAsync::itemIdFetch()
     QVERIFY(!ifr.cancel()); // not started
 
     QVERIFY(ifr.start());
-    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
@@ -760,7 +760,7 @@ void tst_QOrganizerItemAsync::itemIdFetch()
     QCOMPARE(ifr.sorting(), sorting);
     QVERIFY(!ifr.cancel()); // not started
     QVERIFY(ifr.start());
-    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerItemAbstractRequest::ActiveState) || ifr.isFinished());
+    QVERIFY((ifr.isActive() && ifr.state() == QOrganizerAbstractRequest::ActiveState) || ifr.isFinished());
     //QVERIFY(ifr.isFinished() || !ifr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(ifr.waitForFinished());
     QVERIFY(ifr.isFinished());
@@ -842,12 +842,12 @@ void tst_QOrganizerItemAsync::itemIdFetch()
 void tst_QOrganizerItemAsync::itemRemove()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
 
     qRegisterMetaType<QList<QOrganizerItemLocalId> >("QList<QOrganizerItemLocalId>");
 
     QOrganizerItemRemoveRequest irr;
-    QVERIFY(irr.type() == QOrganizerItemAbstractRequest::ItemRemoveRequest);
+    QVERIFY(irr.type() == QOrganizerAbstractRequest::ItemRemoveRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!irr.isActive());
@@ -891,14 +891,14 @@ void tst_QOrganizerItemAsync::itemRemove()
     QVERIFY(!irr.cancel());
     QVERIFY(!irr.waitForFinished());
     qRegisterMetaType<QOrganizerItemRemoveRequest*>("QOrganizerItemRemoveRequest*");
-    QThreadSignalSpy spy(&irr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&irr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QVERIFY(!irr.cancel()); // not started
 
     QVERIFY(!oim->itemIds(dfil).isEmpty());
 
     QVERIFY(irr.start());
 
-    QVERIFY((irr.isActive() &&irr.state() == QOrganizerItemAbstractRequest::ActiveState) || irr.isFinished());
+    QVERIFY((irr.isActive() &&irr.state() == QOrganizerAbstractRequest::ActiveState) || irr.isFinished());
     //QVERIFY(irr.isFinished() || !irr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(irr.waitForFinished());
     QVERIFY(irr.isFinished());
@@ -916,7 +916,7 @@ void tst_QOrganizerItemAsync::itemRemove()
     QVERIFY(!irr.cancel()); // not started
     QVERIFY(irr.start());
 
-    QVERIFY((irr.isActive() && irr.state() == QOrganizerItemAbstractRequest::ActiveState) || irr.isFinished());
+    QVERIFY((irr.isActive() && irr.state() == QOrganizerAbstractRequest::ActiveState) || irr.isFinished());
     //QVERIFY(irr.isFinished() || !irr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(irr.waitForFinished());
     QVERIFY(irr.isFinished());
@@ -1003,9 +1003,9 @@ void tst_QOrganizerItemAsync::itemRemove()
 void tst_QOrganizerItemAsync::itemSave()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
     QOrganizerItemSaveRequest isr;
-    QVERIFY(isr.type() == QOrganizerItemAbstractRequest::ItemSaveRequest);
+    QVERIFY(isr.type() == QOrganizerAbstractRequest::ItemSaveRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!isr.isActive());
@@ -1029,13 +1029,13 @@ void tst_QOrganizerItemAsync::itemSave()
     QVERIFY(!isr.cancel());
     QVERIFY(!isr.waitForFinished());
     qRegisterMetaType<QOrganizerItemSaveRequest*>("QOrganizerItemSaveRequest*");
-    QThreadSignalSpy spy(&isr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&isr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     isr.setItem(testTodo);
     QCOMPARE(isr.items(), saveList);
     QVERIFY(!isr.cancel()); // not started
     QVERIFY(isr.start());
 
-    QVERIFY((isr.isActive() && isr.state() == QOrganizerItemAbstractRequest::ActiveState) || isr.isFinished());
+    QVERIFY((isr.isActive() && isr.state() == QOrganizerAbstractRequest::ActiveState) || isr.isFinished());
     //QVERIFY(isr.isFinished() || !isr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(isr.waitForFinished());
     QVERIFY(isr.isFinished());
@@ -1048,7 +1048,7 @@ void tst_QOrganizerItemAsync::itemSave()
     result << oim->item(expected.first().id().localId());
     //some backends add extra fields, so this doesn't work:
     //QCOMPARE(result, expected);
-    // XXX: really, we should use isSuperset() from tst_QOrganizerItemManager, but this will do for now:
+    // XXX: really, we should use isSuperset() from tst_QOrganizerManager, but this will do for now:
     QVERIFY(result.first().detail<QOrganizerItemDescription>() == description);
     QCOMPARE(oim->itemIds().size(), originalCount + 1);
 
@@ -1064,10 +1064,10 @@ void tst_QOrganizerItemAsync::itemSave()
     QVERIFY(!isr.cancel()); // not started
     QVERIFY(isr.start());
 
-    QVERIFY((isr.isActive() && isr.state() == QOrganizerItemAbstractRequest::ActiveState) || isr.isFinished());
+    QVERIFY((isr.isActive() && isr.state() == QOrganizerAbstractRequest::ActiveState) || isr.isFinished());
     //QVERIFY(isr.isFinished() || !isr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(isr.waitForFinished());
-    QVERIFY(isr.error() == QOrganizerItemManager::NoError); // if this fails, it means that the backend doesn't support Priority...
+    QVERIFY(isr.error() == QOrganizerManager::NoError); // if this fails, it means that the backend doesn't support Priority...
     QVERIFY(isr.isFinished());
     QVERIFY(spy.count() >= 1); // active + finished progress signals
     spy.clear();
@@ -1079,7 +1079,7 @@ void tst_QOrganizerItemAsync::itemSave()
 
     //here we can't compare the whole item details, testTodo would be updated by async call because we just use QThreadSignalSpy to receive signals.
     //QVERIFY(containsIgnoringTimestamps(result, testTodo));
-    // XXX: really, we should use isSuperset() from tst_QOrganizerItemManager, but this will do for now:
+    // XXX: really, we should use isSuperset() from tst_QOrganizerManager, but this will do for now:
     QVERIFY(result.first().detail<QOrganizerItemPriority>().priority() == priority.priority());
     QCOMPARE(oim->itemIds().size(), originalCount + 1);
 
@@ -1178,7 +1178,7 @@ void tst_QOrganizerItemAsync::itemSave()
 void tst_QOrganizerItemAsync::itemPartialSave()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
 
 /* XXX TODO: partial save for organizer items as well as items!!!
 
@@ -1200,15 +1200,15 @@ void tst_QOrganizerItemAsync::itemPartialSave()
     isr.setItems(items);
     isr.setDefinitionMask(QStringList(QOrganizerItemEmailAddress::DefinitionName));
     qRegisterMetaType<QOrganizerItemSaveRequest*>("QOrganizerItemSaveRequest*");
-    QThreadSignalSpy spy(&isr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&isr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QVERIFY(isr.start());
-    QVERIFY((isr.isActive() && isr.state() == QOrganizerItemAbstractRequest::ActiveState) || isr.isFinished());
+    QVERIFY((isr.isActive() && isr.state() == QOrganizerAbstractRequest::ActiveState) || isr.isFinished());
     QVERIFY(isr.waitForFinished());
     QVERIFY(isr.isFinished());
     QVERIFY(spy.count() >= 1); // active + finished progress signals
     spy.clear();
 
-    QCOMPARE(isr.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(isr.error(), QOrganizerManager::NoError);
     QVERIFY(isr.errorMap().isEmpty());
     items[0] = oim->item(aId);
     QCOMPARE(items[0].detail<QOrganizerItemPriority>().priority(),
@@ -1222,7 +1222,7 @@ void tst_QOrganizerItemAsync::itemPartialSave()
     isr.setDefinitionMask(QStringList(QOrganizerItemEmailAddress::DefinitionName));
     QVERIFY(isr.start());
     QVERIFY(isr.waitForFinished());
-    QCOMPARE(isr.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(isr.error(), QOrganizerManager::NoError);
     QVERIFY(isr.errorMap().isEmpty());
     items[1] = oim->item(bId);
     QCOMPARE(items[1].detail<QOrganizerItemEmailAddress>().emailAddress(), QString("me@example.com"));
@@ -1239,7 +1239,7 @@ void tst_QOrganizerItemAsync::itemPartialSave()
     isr.setDefinitionMask(QStringList(QOrganizerItemEmailAddress::DefinitionName));
     QVERIFY(isr.start());
     QVERIFY(isr.waitForFinished());
-    QCOMPARE(isr.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(isr.error(), QOrganizerManager::NoError);
     QVERIFY(isr.errorMap().isEmpty());
     items[1] = oim->item(bId);
     QCOMPARE(items[1].details<QOrganizerItemEmailAddress>().count(), 0);
@@ -1254,7 +1254,7 @@ void tst_QOrganizerItemAsync::itemPartialSave()
     isr.setDefinitionMask(QStringList(QOrganizerItemOnlineAccount::DefinitionName));
     QVERIFY(isr.start());
     QVERIFY(isr.waitForFinished());
-    QCOMPARE(isr.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(isr.error(), QOrganizerManager::NoError);
     QVERIFY(isr.errorMap().isEmpty());
     items = isr.items();
     QCOMPARE(items.size()-1, 3);  // Just check that we are dealing with the item at index 3
@@ -1272,7 +1272,7 @@ void tst_QOrganizerItemAsync::itemPartialSave()
     isr.setDefinitionMask(QStringList(QOrganizerItemPriority::DefinitionName));
     QVERIFY(isr.start());
     QVERIFY(isr.waitForFinished());
-    QCOMPARE(isr.error(), QOrganizerItemManager::NoError);
+    QCOMPARE(isr.error(), QOrganizerManager::NoError);
     QVERIFY(isr.errorMap().isEmpty());
     items = isr.items();
     QCOMPARE(items.size()-1, 4);  // Just check that we are dealing with the item at index 4
@@ -1293,11 +1293,11 @@ void tst_QOrganizerItemAsync::itemPartialSave()
     isr.setDefinitionMask(QStringList("BadDetail"));
     QVERIFY(isr.start());
     QVERIFY(isr.waitForFinished());
-    QVERIFY(isr.error() != QOrganizerItemManager::NoError);
-    QMap<int, QOrganizerItemManager::Error> errorMap(isr.errorMap());
+    QVERIFY(isr.error() != QOrganizerManager::NoError);
+    QMap<int, QOrganizerManager::Error> errorMap(isr.errorMap());
     QCOMPARE(errorMap.count(), 2);
-    QCOMPARE(errorMap[3], QOrganizerItemManager::DoesNotExistError);
-    QCOMPARE(errorMap[4], QOrganizerItemManager::InvalidDetailError);
+    QCOMPARE(errorMap[3], QOrganizerManager::DoesNotExistError);
+    QCOMPARE(errorMap[4], QOrganizerManager::InvalidDetailError);
 
     // 7) Have a non existing item in the middle followed by a save error
     badId = id3;
@@ -1307,11 +1307,11 @@ void tst_QOrganizerItemAsync::itemPartialSave()
     isr.setDefinitionMask(QStringList("BadDetail"));
     QVERIFY(isr.start());
     QVERIFY(isr.waitForFinished());
-    QVERIFY(isr.error() != QOrganizerItemManager::NoError);
+    QVERIFY(isr.error() != QOrganizerManager::NoError);
     errorMap = isr.errorMap();
     QCOMPARE(errorMap.count(), 2);
-    QCOMPARE(errorMap[3], QOrganizerItemManager::DoesNotExistError);
-    QCOMPARE(errorMap[4], QOrganizerItemManager::InvalidDetailError);
+    QCOMPARE(errorMap[3], QOrganizerManager::DoesNotExistError);
+    QCOMPARE(errorMap[4], QOrganizerManager::InvalidDetailError);
 
 XXX TODO: partial save for organizer items as well as items!!! */
 }
@@ -1319,9 +1319,9 @@ XXX TODO: partial save for organizer items as well as items!!! */
 void tst_QOrganizerItemAsync::definitionFetch()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
     QOrganizerItemDetailDefinitionFetchRequest dfr;
-    QVERIFY(dfr.type() == QOrganizerItemAbstractRequest::DetailDefinitionFetchRequest);
+    QVERIFY(dfr.type() == QOrganizerAbstractRequest::DetailDefinitionFetchRequest);
     QVERIFY(dfr.itemType() == QString(QLatin1String(QOrganizerItemType::TypeNote))); // ensure ctor sets item type correctly.
     dfr.setItemType(QOrganizerItemType::TypeEvent);
     QVERIFY(dfr.itemType() == QString(QLatin1String(QOrganizerItemType::TypeEvent)));
@@ -1341,12 +1341,12 @@ void tst_QOrganizerItemAsync::definitionFetch()
     QVERIFY(!dfr.cancel());
     QVERIFY(!dfr.waitForFinished());
     qRegisterMetaType<QOrganizerItemDetailDefinitionFetchRequest*>("QOrganizerItemDetailDefinitionFetchRequest*");
-    QThreadSignalSpy spy(&dfr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&dfr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     dfr.setDefinitionNames(QStringList());
     QVERIFY(!dfr.cancel()); // not started
     QVERIFY(dfr.start());
 
-    QVERIFY((dfr.isActive() && dfr.state() == QOrganizerItemAbstractRequest::ActiveState) || dfr.isFinished());
+    QVERIFY((dfr.isActive() && dfr.state() == QOrganizerAbstractRequest::ActiveState) || dfr.isFinished());
     //QVERIFY(dfr.isFinished() || !dfr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(dfr.waitForFinished());
     QVERIFY(dfr.isFinished());
@@ -1367,7 +1367,7 @@ void tst_QOrganizerItemAsync::definitionFetch()
     QVERIFY(!dfr.cancel()); // not started
     QVERIFY(dfr.start());
 
-    QVERIFY((dfr.isActive() && dfr.state() == QOrganizerItemAbstractRequest::ActiveState) || dfr.isFinished());
+    QVERIFY((dfr.isActive() && dfr.state() == QOrganizerAbstractRequest::ActiveState) || dfr.isFinished());
     //QVERIFY(dfr.isFinished() || !dfr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(dfr.waitForFinished());
     QVERIFY(dfr.isFinished());
@@ -1443,12 +1443,12 @@ void tst_QOrganizerItemAsync::definitionRemove()
 {
     QFETCH(QString, uri);
 
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
-    if (!oim->hasFeature(QOrganizerItemManager::MutableDefinitions)) {
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
+    if (!oim->hasFeature(QOrganizerManager::MutableDefinitions)) {
        QSKIP("This item manager does not support mutable definitions, can't remove a definition!", SkipSingle);
     }
     QOrganizerItemDetailDefinitionRemoveRequest drr;
-    QVERIFY(drr.type() == QOrganizerItemAbstractRequest::DetailDefinitionRemoveRequest);
+    QVERIFY(drr.type() == QOrganizerAbstractRequest::DetailDefinitionRemoveRequest);
     QVERIFY(drr.itemType() == QString(QLatin1String(QOrganizerItemType::TypeNote))); // ensure ctor sets item type correctly.
     drr.setItemType(QOrganizerItemType::TypeEvent);
     drr.setDefinitionNames(QStringList());
@@ -1473,12 +1473,12 @@ void tst_QOrganizerItemAsync::definitionRemove()
     QVERIFY(!drr.cancel());
     QVERIFY(!drr.waitForFinished());
     qRegisterMetaType<QOrganizerItemDetailDefinitionRemoveRequest*>("QOrganizerItemDetailDefinitionRemoveRequest*");
-    QThreadSignalSpy spy(&drr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&drr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QVERIFY(drr.definitionNames() == removeIds);
     QVERIFY(!drr.cancel()); // not started
     QVERIFY(drr.start());
 
-    QVERIFY((drr.isActive() && drr.state() == QOrganizerItemAbstractRequest::ActiveState) || drr.isFinished());
+    QVERIFY((drr.isActive() && drr.state() == QOrganizerAbstractRequest::ActiveState) || drr.isFinished());
     //QVERIFY(drr.isFinished() || !drr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(drr.waitForFinished());
     QVERIFY(drr.isFinished());
@@ -1487,14 +1487,14 @@ void tst_QOrganizerItemAsync::definitionRemove()
 
     QCOMPARE(oim->detailDefinitions(QOrganizerItemType::TypeEvent).keys().size(), originalCount - 1);
     oim->detailDefinition(removeIds.first(), QOrganizerItemType::TypeEvent); // check that it has already been removed.
-    QCOMPARE(oim->error(), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(oim->error(), QOrganizerManager::DoesNotExistError);
 
     // remove (asynchronously) a nonexistent group - should fail.
     drr.setDefinitionNames(removeIds);
     QVERIFY(!drr.cancel()); // not started
     QVERIFY(drr.start());
 
-    QVERIFY((drr.isActive() && drr.state() == QOrganizerItemAbstractRequest::ActiveState) || drr.isFinished());
+    QVERIFY((drr.isActive() && drr.state() == QOrganizerAbstractRequest::ActiveState) || drr.isFinished());
     //QVERIFY(drr.isFinished() || !drr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(drr.waitForFinished());
     QVERIFY(drr.isFinished());
@@ -1502,7 +1502,7 @@ void tst_QOrganizerItemAsync::definitionRemove()
     spy.clear();
 
     QCOMPARE(oim->detailDefinitions(QOrganizerItemType::TypeEvent).keys().size(), originalCount - 1); // hasn't changed
-    QCOMPARE(drr.error(), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(drr.error(), QOrganizerManager::DoesNotExistError);
 
     // remove with list containing one valid and one invalid id.
     removeIds << oim->detailDefinitions(QOrganizerItemType::TypeEvent).keys().first();
@@ -1510,7 +1510,7 @@ void tst_QOrganizerItemAsync::definitionRemove()
     QVERIFY(!drr.cancel()); // not started
     QVERIFY(drr.start());
 
-    QVERIFY((drr.isActive() && drr.state() == QOrganizerItemAbstractRequest::ActiveState) || drr.isFinished());
+    QVERIFY((drr.isActive() && drr.state() == QOrganizerAbstractRequest::ActiveState) || drr.isFinished());
     //QVERIFY(drr.isFinished() || !drr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(drr.waitForFinished());
     QVERIFY(drr.isFinished());
@@ -1520,7 +1520,7 @@ void tst_QOrganizerItemAsync::definitionRemove()
     QCOMPARE(oim->detailDefinitions(QOrganizerItemType::TypeEvent).keys().size(), originalCount - 2); // only one more has been removed
     QVERIFY(drr.errorMap().count() == 1);
     QVERIFY(drr.errorMap().keys().contains(0));
-    QCOMPARE(drr.errorMap().value(0), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(drr.errorMap().value(0), QOrganizerManager::DoesNotExistError);
 
     // remove with empty list - nothing should happen.
     removeIds.clear();
@@ -1537,7 +1537,7 @@ void tst_QOrganizerItemAsync::definitionRemove()
     spy.clear();
 
     QCOMPARE(oim->detailDefinitions(QOrganizerItemType::TypeEvent).keys().size(), originalCount - 2); // hasn't changed
-    QCOMPARE(drr.error(), QOrganizerItemManager::NoError);  // no error but no effect.
+    QCOMPARE(drr.error(), QOrganizerManager::NoError);  // no error but no effect.
 
     // cancelling
     removeIds.clear();
@@ -1611,15 +1611,15 @@ void tst_QOrganizerItemAsync::definitionSave()
 {
     QFETCH(QString, uri);
 
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
 
-    if (!oim->hasFeature(QOrganizerItemManager::MutableDefinitions)) {
+    if (!oim->hasFeature(QOrganizerManager::MutableDefinitions)) {
 
        QSKIP("This item manager does not support mutable definitions, can't save a definition!", SkipSingle);
     }
     
     QOrganizerItemDetailDefinitionSaveRequest dsr;
-    QVERIFY(dsr.type() == QOrganizerItemAbstractRequest::DetailDefinitionSaveRequest);
+    QVERIFY(dsr.type() == QOrganizerAbstractRequest::DetailDefinitionSaveRequest);
     QVERIFY(dsr.itemType() == QString(QLatin1String(QOrganizerItemType::TypeNote))); // ensure ctor sets item type correctly
     dsr.setItemType(QOrganizerItemType::TypeEvent);
     QVERIFY(dsr.itemType() == QString(QLatin1String(QOrganizerItemType::TypeEvent)));
@@ -1649,13 +1649,13 @@ void tst_QOrganizerItemAsync::definitionSave()
     QVERIFY(!dsr.cancel());
     QVERIFY(!dsr.waitForFinished());
     qRegisterMetaType<QOrganizerItemDetailDefinitionSaveRequest*>("QOrganizerItemDetailDefinitionSaveRequest*");
-    QThreadSignalSpy spy(&dsr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&dsr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     dsr.setDefinition(testDef);
     QCOMPARE(dsr.definitions(), saveList);
     QVERIFY(!dsr.cancel()); // not started
     QVERIFY(dsr.start());
 
-    QVERIFY((dsr.isActive() && dsr.state() == QOrganizerItemAbstractRequest::ActiveState) || dsr.isFinished());
+    QVERIFY((dsr.isActive() && dsr.state() == QOrganizerAbstractRequest::ActiveState) || dsr.isFinished());
     //QVERIFY(dsr.isFinished() || !dsr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(dsr.waitForFinished());
     QVERIFY(dsr.isFinished());
@@ -1679,7 +1679,7 @@ void tst_QOrganizerItemAsync::definitionSave()
     QVERIFY(!dsr.cancel()); // not started
     QVERIFY(dsr.start());
 
-    QVERIFY((dsr.isActive() && dsr.state() == QOrganizerItemAbstractRequest::ActiveState) || dsr.isFinished());
+    QVERIFY((dsr.isActive() && dsr.state() == QOrganizerAbstractRequest::ActiveState) || dsr.isFinished());
     //QVERIFY(dsr.isFinished() || !dsr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(dsr.waitForFinished());
     QVERIFY(dsr.isFinished());
@@ -1777,10 +1777,10 @@ void tst_QOrganizerItemAsync::definitionSave()
 void tst_QOrganizerItemAsync::collectionFetch()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
 
     QOrganizerCollectionFetchRequest cfr;
-    QVERIFY(cfr.type() == QOrganizerItemAbstractRequest::CollectionFetchRequest);
+    QVERIFY(cfr.type() == QOrganizerAbstractRequest::CollectionFetchRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!cfr.isActive());
@@ -1797,12 +1797,12 @@ void tst_QOrganizerItemAsync::collectionFetch()
     QVERIFY(!cfr.cancel());
     QVERIFY(!cfr.waitForFinished());
     qRegisterMetaType<QOrganizerCollectionFetchRequest*>("QOrganizerCollectionFetchRequest*");
-    QThreadSignalSpy spy(&cfr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&cfr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QVERIFY(!cfr.cancel()); // not started
 
     QVERIFY(cfr.start());
     //QVERIFY(cfr.isFinished() || !cfr.start());  // already started. // thread scheduling means this is untestable
-    QVERIFY((cfr.isActive() && cfr.state() == QOrganizerItemAbstractRequest::ActiveState) || cfr.isFinished());
+    QVERIFY((cfr.isActive() && cfr.state() == QOrganizerAbstractRequest::ActiveState) || cfr.isFinished());
     QVERIFY(cfr.waitForFinished());
     QVERIFY(cfr.isFinished());
 
@@ -1868,7 +1868,7 @@ void tst_QOrganizerItemAsync::collectionFetch()
         QVERIFY(spy.count() >= 1); // active + cancelled progress signals
         spy.clear();
         QVERIFY(!cfr.isActive());
-        QVERIFY(cfr.state() == QOrganizerItemAbstractRequest::CanceledState);
+        QVERIFY(cfr.state() == QOrganizerAbstractRequest::CanceledState);
         break;
     }
 
@@ -1876,7 +1876,7 @@ void tst_QOrganizerItemAsync::collectionFetch()
     QOrganizerCollectionFetchRequest *cfr2 = new QOrganizerCollectionFetchRequest();
     QPointer<QObject> obj(cfr2);
     cfr2->setManager(oim.data());
-    connect(cfr2, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)), this, SLOT(deleteRequest()));
+    connect(cfr2, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)), this, SLOT(deleteRequest()));
     QVERIFY(cfr2->start());
     int i = 100;
     // at this point we can't even call wait for finished..
@@ -1890,9 +1890,9 @@ void tst_QOrganizerItemAsync::collectionFetch()
 void tst_QOrganizerItemAsync::collectionRemove()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
     QOrganizerCollectionRemoveRequest crr;
-    QVERIFY(crr.type() == QOrganizerItemAbstractRequest::CollectionRemoveRequest);
+    QVERIFY(crr.type() == QOrganizerAbstractRequest::CollectionRemoveRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!crr.isActive());
@@ -1913,10 +1913,10 @@ void tst_QOrganizerItemAsync::collectionRemove()
     QVERIFY(!crr.cancel());
     QVERIFY(!crr.waitForFinished());
     qRegisterMetaType<QOrganizerCollectionRemoveRequest*>("QOrganizerCollectionRemoveRequest*");
-    QThreadSignalSpy spy(&crr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&crr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     QVERIFY(!crr.cancel()); // not started
     QVERIFY(crr.start());
-    QVERIFY((crr.isActive() &&crr.state() == QOrganizerItemAbstractRequest::ActiveState) || crr.isFinished());
+    QVERIFY((crr.isActive() &&crr.state() == QOrganizerAbstractRequest::ActiveState) || crr.isFinished());
     //QVERIFY(crr.isFinished() || !crr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(crr.waitForFinished());
     QVERIFY(crr.isFinished());
@@ -1936,7 +1936,7 @@ void tst_QOrganizerItemAsync::collectionRemove()
     QVERIFY(!crr.cancel()); // not started
     QVERIFY(crr.start());
 
-    QVERIFY((crr.isActive() && crr.state() == QOrganizerItemAbstractRequest::ActiveState) || crr.isFinished());
+    QVERIFY((crr.isActive() && crr.state() == QOrganizerAbstractRequest::ActiveState) || crr.isFinished());
     //QVERIFY(crr.isFinished() || !crr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(crr.waitForFinished());
     QVERIFY(crr.isFinished());
@@ -2034,9 +2034,9 @@ void tst_QOrganizerItemAsync::collectionRemove()
 void tst_QOrganizerItemAsync::collectionSave()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
     QOrganizerCollectionSaveRequest csr;
-    QVERIFY(csr.type() == QOrganizerItemAbstractRequest::CollectionSaveRequest);
+    QVERIFY(csr.type() == QOrganizerAbstractRequest::CollectionSaveRequest);
 
     // initial state - not started, no manager.
     QVERIFY(!csr.isActive());
@@ -2059,13 +2059,13 @@ void tst_QOrganizerItemAsync::collectionSave()
     QVERIFY(!csr.cancel());
     QVERIFY(!csr.waitForFinished());
     qRegisterMetaType<QOrganizerCollectionSaveRequest*>("QOrganizerCollectionSaveRequest*");
-    QThreadSignalSpy spy(&csr, SIGNAL(stateChanged(QOrganizerItemAbstractRequest::State)));
+    QThreadSignalSpy spy(&csr, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
     csr.setCollection(testCollection);
     QCOMPARE(csr.collections(), saveList);
     QVERIFY(!csr.cancel()); // not started
     QVERIFY(csr.start());
 
-    QVERIFY((csr.isActive() && csr.state() == QOrganizerItemAbstractRequest::ActiveState) || csr.isFinished());
+    QVERIFY((csr.isActive() && csr.state() == QOrganizerAbstractRequest::ActiveState) || csr.isFinished());
     //QVERIFY(csr.isFinished() || !csr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(csr.waitForFinished());
     QVERIFY(csr.isFinished());
@@ -2094,7 +2094,7 @@ void tst_QOrganizerItemAsync::collectionSave()
     QVERIFY(!csr.cancel()); // not started
     QVERIFY(csr.start());
 
-    QVERIFY((csr.isActive() && csr.state() == QOrganizerItemAbstractRequest::ActiveState) || csr.isFinished());
+    QVERIFY((csr.isActive() && csr.state() == QOrganizerAbstractRequest::ActiveState) || csr.isFinished());
     //QVERIFY(csr.isFinished() || !csr.start());  // already started. // thread scheduling means this is untestable
     QVERIFY(csr.waitForFinished());
 
@@ -2208,7 +2208,7 @@ void tst_QOrganizerItemAsync::testQuickDestruction()
     // this is to test for segfaults etc.
     for (int i = 0; i < 10; i++) {
         QOrganizerItemFetchRequest ifr;
-        QOrganizerItemManager *cm = prepareModel(uri);
+        QOrganizerManager *cm = prepareModel(uri);
         ifr.setManager(cm);
         ifr.start();
         delete cm;
@@ -2217,7 +2217,7 @@ void tst_QOrganizerItemAsync::testQuickDestruction()
     // this is to test for segfaults, etc.
     for (int i = 0; i < 10; i++) {
         QOrganizerItemFetchRequest *ifr = new QOrganizerItemFetchRequest;
-        QOrganizerItemManager *cm = prepareModel(uri);
+        QOrganizerManager *cm = prepareModel(uri);
         ifr->setManager(cm);
         ifr->start();
         delete ifr;
@@ -2227,7 +2227,7 @@ void tst_QOrganizerItemAsync::testQuickDestruction()
     // this is to test for segfaults, etc.
     for (int i = 0; i < 10; i++) {
         QOrganizerItemFetchRequest *ifr = new QOrganizerItemFetchRequest;
-        QOrganizerItemManager *cm = prepareModel(uri);
+        QOrganizerManager *cm = prepareModel(uri);
         ifr->setManager(cm);
         ifr->start();
         delete cm;
@@ -2235,7 +2235,7 @@ void tst_QOrganizerItemAsync::testQuickDestruction()
     }
     // in this test, we create a manager, fire off a request, and delete the request, all in quick succession
     // this is to test for segfaults, etc.
-    QOrganizerItemManager *cm = prepareModel(uri);
+    QOrganizerManager *cm = prepareModel(uri);
     for (int i = 0; i < 10; i++) {
         QOrganizerItemFetchRequest *ifr = new QOrganizerItemFetchRequest;
         ifr->setManager(cm);
@@ -2248,7 +2248,7 @@ void tst_QOrganizerItemAsync::testQuickDestruction()
 void tst_QOrganizerItemAsync::threadDelivery()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(prepareModel(uri));
+    QScopedPointer<QOrganizerManager> oim(prepareModel(uri));
     m_mainThreadId = oim->thread()->currentThreadId();
     m_resultsAvailableSlotThreadId = m_mainThreadId;
 
@@ -2260,7 +2260,7 @@ void tst_QOrganizerItemAsync::threadDelivery()
 
     int totalWaitTime = 0;
     QTest::qWait(1); // force it to process events at least once.
-    while (req->state() != QOrganizerItemAbstractRequest::FinishedState) {
+    while (req->state() != QOrganizerAbstractRequest::FinishedState) {
         // ensure that the progress signal was delivered to the main thread.
         QCOMPARE(m_mainThreadId, m_resultsAvailableSlotThreadId);
 
@@ -2293,7 +2293,7 @@ void tst_QOrganizerItemAsync::addManagers(QStringList stringlist)
     QTest::addColumn<QString>("uri");
 
     // retrieve the list of available managers
-    QStringList managers = QOrganizerItemManager::availableManagers();
+    QStringList managers = QOrganizerManager::availableManagers();
 
     // remove ones that we know will not pass
     if (!stringlist.contains("invalid"))
@@ -2307,17 +2307,17 @@ void tst_QOrganizerItemAsync::addManagers(QStringList stringlist)
 
     foreach(QString mgr, managers) {
         QMap<QString, QString> params;
-        QTest::newRow(QString("mgr='%1'").arg(mgr).toLatin1().constData()) << QOrganizerItemManager::buildUri(mgr, params);
+        QTest::newRow(QString("mgr='%1'").arg(mgr).toLatin1().constData()) << QOrganizerManager::buildUri(mgr, params);
         if (mgr == "memory") {
-            params.insert("id", "tst_QOrganizerItemManager");
-            QTest::newRow(QString("mgr='%1', params").arg(mgr).toLatin1().constData()) << QOrganizerItemManager::buildUri(mgr, params);
+            params.insert("id", "tst_QOrganizerManager");
+            QTest::newRow(QString("mgr='%1', params").arg(mgr).toLatin1().constData()) << QOrganizerManager::buildUri(mgr, params);
         }
     }
 }
 
-QOrganizerItemManager* tst_QOrganizerItemAsync::prepareModel(const QString& managerUri)
+QOrganizerManager* tst_QOrganizerItemAsync::prepareModel(const QString& managerUri)
 {
-    QOrganizerItemManager* oim = QOrganizerItemManager::fromUri(managerUri);
+    QOrganizerManager* oim = QOrganizerManager::fromUri(managerUri);
 
     // XXX TODO: ensure that this is the case:
     // there should be no items in the database.
diff --git a/tests/auto/qorganizeritemasync/unittest/unittest.pro b/tests/auto/qorganizeritemasync/unittest/unittest.pro
index d8ed3a3955..6a4d37865a 100644
--- a/tests/auto/qorganizeritemasync/unittest/unittest.pro
+++ b/tests/auto/qorganizeritemasync/unittest/unittest.pro
@@ -17,7 +17,7 @@ CONFIG += mobility
 MOBILITY = organizer
 
 SOURCES  += tst_qorganizeritemasync.cpp
-HEADERS += ../../qorganizeritemmanagerdataholder.h
+HEADERS += ../../qorganizermanagerdataholder.h
 
 symbian: {
     TARGET.CAPABILITY = ReadUserData \
diff --git a/tests/auto/qorganizeritemdetail/tst_qorganizeritemdetail.cpp b/tests/auto/qorganizeritemdetail/tst_qorganizeritemdetail.cpp
index da963a8a81..602f4a57c1 100644
--- a/tests/auto/qorganizeritemdetail/tst_qorganizeritemdetail.cpp
+++ b/tests/auto/qorganizeritemdetail/tst_qorganizeritemdetail.cpp
@@ -301,7 +301,7 @@ void tst_QOrganizerItemDetail::assignment()
     QVERIFY(c1.comment() == QString()); // should reset the detail
     QCOMPARE(c1, QOrganizerItemComment());
 
-    QOrganizerItemManagerEngine::setDetailAccessConstraints(&p2, QOrganizerItemDetail::Irremovable);
+    QOrganizerManagerEngine::setDetailAccessConstraints(&p2, QOrganizerItemDetail::Irremovable);
     QVERIFY(p1 != p2);
 }
 
diff --git a/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp b/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
index 571dcdf3a4..92afa8a704 100644
--- a/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
+++ b/tests/auto/qorganizeritemfilter/tst_qorganizeritemfilter.cpp
@@ -898,7 +898,7 @@ void tst_QOrganizerItemFilter::canonicalizedFilter()
     QFETCH(QOrganizerItemFilter, in);
     QFETCH(QOrganizerItemFilter, expected);
 
-    QOrganizerItemFilter out = QOrganizerItemManagerEngine::canonicalizedFilter(in);
+    QOrganizerItemFilter out = QOrganizerManagerEngine::canonicalizedFilter(in);
     QCOMPARE(out, expected);
 }
 
@@ -1117,7 +1117,7 @@ void tst_QOrganizerItemFilter::testFilter()
     QFETCH(QOrganizerItemFilter, filter);
     QFETCH(bool, expected);
 
-    QCOMPARE(QOrganizerItemManagerEngine::testFilter(filter, item), expected);
+    QCOMPARE(QOrganizerManagerEngine::testFilter(filter, item), expected);
 }
 
 void tst_QOrganizerItemFilter::testFilter_data()
diff --git a/tests/auto/qorganizeritemmanager/qorganizeritemmanager.pro b/tests/auto/qorganizeritemmanager/qorganizeritemmanager.pro
index fe5821755a..67e9622975 100644
--- a/tests/auto/qorganizeritemmanager/qorganizeritemmanager.pro
+++ b/tests/auto/qorganizeritemmanager/qorganizeritemmanager.pro
@@ -1,6 +1,6 @@
 QT += testlib
 TEMPLATE=app
-TARGET=tst_qorganizeritemmanager
+TARGET=tst_qorganizermanager
 CONFIG+=testcase
 
 include(../../../common.pri)
@@ -15,8 +15,8 @@ INCLUDEPATH += ../
 
 CONFIG += mobility
 MOBILITY = organizer
-SOURCES  += tst_qorganizeritemmanager.cpp
-HEADERS += ../qorganizeritemmanagerdataholder.h
+SOURCES  += tst_qorganizermanager.cpp
+HEADERS += ../qorganizermanagerdataholder.h
 
 symbian: {
     TARGET.CAPABILITY = ReadUserData \
diff --git a/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp b/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp
index c6b30cc377..3e1f25cb45 100644
--- a/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp
+++ b/tests/auto/qorganizeritemmanager/tst_qorganizeritemmanager.cpp
@@ -46,7 +46,7 @@
 
 #include "qtorganizer.h"
 #include "qorganizeritemchangeset.h"
-#include "qorganizeritemmanagerdataholder.h"
+#include "qorganizermanagerdataholder.h"
 
 #include "qorganizernote.h"
 #include "qorganizerevent.h"
@@ -108,8 +108,8 @@ QTM_USE_NAMESPACE
 //TESTED_FILES=
 
 // to get QFETCH to work with the template expression...
-typedef QMap<QString,QString> tst_QOrganizerItemManager_QStringMap;
-Q_DECLARE_METATYPE(tst_QOrganizerItemManager_QStringMap)
+typedef QMap<QString,QString> tst_QOrganizerManager_QStringMap;
+Q_DECLARE_METATYPE(tst_QOrganizerManager_QStringMap)
 Q_DECLARE_METATYPE(QList<QOrganizerItemLocalId>)
 
 /* A class that no backend can support */
@@ -118,26 +118,26 @@ class UnsupportedMetatype {
 };
 Q_DECLARE_METATYPE(UnsupportedMetatype)
 Q_DECLARE_METATYPE(QOrganizerItem)
-Q_DECLARE_METATYPE(QOrganizerItemManager::Error)
+Q_DECLARE_METATYPE(QOrganizerManager::Error)
 Q_DECLARE_METATYPE(QList<QDate>)
 
-class tst_QOrganizerItemManager : public QObject
+class tst_QOrganizerManager : public QObject
 {
 Q_OBJECT
 
 public:
-    tst_QOrganizerItemManager();
-    virtual ~tst_QOrganizerItemManager();
+    tst_QOrganizerManager();
+    virtual ~tst_QOrganizerManager();
 
 private:
     void dumpOrganizerItemDifferences(const QOrganizerItem& a, const QOrganizerItem& b);
     void dumpOrganizerItem(const QOrganizerItem &c);
-    void dumpOrganizerItems(QOrganizerItemManager *cm);
+    void dumpOrganizerItems(QOrganizerManager *cm);
     bool isSuperset(const QOrganizerItem& ca, const QOrganizerItem& cb);
     QList<QOrganizerItemDetail> removeAllDefaultDetails(const QList<QOrganizerItemDetail>& details);
     void addManagers(); // add standard managers to the data
 
-    QScopedPointer<QOrganizerItemManagerDataHolder> managerDataHolder;
+    QScopedPointer<QOrganizerManagerDataHolder> managerDataHolder;
 
 public slots:
     void initTestCase();
@@ -207,31 +207,31 @@ private slots:
     void recurrence_data() {addManagers();}
 };
 
-tst_QOrganizerItemManager::tst_QOrganizerItemManager()
+tst_QOrganizerManager::tst_QOrganizerManager()
 {
 }
 
-tst_QOrganizerItemManager::~tst_QOrganizerItemManager()
+tst_QOrganizerManager::~tst_QOrganizerManager()
 {
 }
 
-void tst_QOrganizerItemManager::initTestCase()
+void tst_QOrganizerManager::initTestCase()
 {
-    managerDataHolder.reset(new QOrganizerItemManagerDataHolder());
+    managerDataHolder.reset(new QOrganizerManagerDataHolder());
 
     /* Make sure these other test plugins are NOT loaded by default */
     // These are now removed from the list of managers in addManagers()
-    //QVERIFY(!QOrganizerItemManager::availableManagers().contains("testdummy"));
-    //QVERIFY(!QOrganizerItemManager::availableManagers().contains("teststaticdummy"));
-    //QVERIFY(!QOrganizerItemManager::availableManagers().contains("maliciousplugin"));
+    //QVERIFY(!QOrganizerManager::availableManagers().contains("testdummy"));
+    //QVERIFY(!QOrganizerManager::availableManagers().contains("teststaticdummy"));
+    //QVERIFY(!QOrganizerManager::availableManagers().contains("maliciousplugin"));
 }
 
-void tst_QOrganizerItemManager::cleanupTestCase()
+void tst_QOrganizerManager::cleanupTestCase()
 {
     managerDataHolder.reset(0);
 }
 
-void tst_QOrganizerItemManager::dumpOrganizerItemDifferences(const QOrganizerItem& ca, const QOrganizerItem& cb)
+void tst_QOrganizerManager::dumpOrganizerItemDifferences(const QOrganizerItem& ca, const QOrganizerItem& cb)
 {
     // Try to narrow down the differences
     QOrganizerItem a(ca);
@@ -280,7 +280,7 @@ void tst_QOrganizerItemManager::dumpOrganizerItemDifferences(const QOrganizerIte
     }
 }
 
-bool tst_QOrganizerItemManager::isSuperset(const QOrganizerItem& ca, const QOrganizerItem& cb)
+bool tst_QOrganizerManager::isSuperset(const QOrganizerItem& ca, const QOrganizerItem& cb)
 {
     // returns true if item ca is a superset of item cb
     // we use this test instead of equality because dynamic information
@@ -347,9 +347,9 @@ bool tst_QOrganizerItemManager::isSuperset(const QOrganizerItem& ca, const QOrga
     return true;
 }
 
-void tst_QOrganizerItemManager::dumpOrganizerItem(const QOrganizerItem& item)
+void tst_QOrganizerManager::dumpOrganizerItem(const QOrganizerItem& item)
 {
-    QOrganizerItemManager m;
+    QOrganizerManager m;
     qDebug() << "OrganizerItem: " << item.id().localId() << "(" << item.displayLabel() << ")";
     QList<QOrganizerItemDetail> details = item.details();
     foreach(QOrganizerItemDetail d, details) {
@@ -358,7 +358,7 @@ void tst_QOrganizerItemManager::dumpOrganizerItem(const QOrganizerItem& item)
     }
 }
 
-void tst_QOrganizerItemManager::dumpOrganizerItems(QOrganizerItemManager *cm)
+void tst_QOrganizerManager::dumpOrganizerItems(QOrganizerManager *cm)
 {
     QList<QOrganizerItemLocalId> ids = cm->itemIds();
 
@@ -370,7 +370,7 @@ void tst_QOrganizerItemManager::dumpOrganizerItems(QOrganizerItemManager *cm)
     }
 }
 
-void tst_QOrganizerItemManager::uriParsing_data()
+void tst_QOrganizerManager::uriParsing_data()
 {
     QTest::addColumn<QString>("uri");
     QTest::addColumn<bool>("good"); // is this a good uri or not
@@ -387,14 +387,14 @@ void tst_QOrganizerItemManager::uriParsing_data()
     inparameters2.insert("and& an", " &amp;");
     inparameters2.insert("and an ", "=quals");
 
-    QTest::newRow("built") << QOrganizerItemManager::buildUri("manager", inparameters) << true << "manager" << inparameters;
-    QTest::newRow("built with escaped parameters") << QOrganizerItemManager::buildUri("manager", inparameters2) << true << "manager" << inparameters2;
-    QTest::newRow("no scheme") << "this should not split" << false << QString() << tst_QOrganizerItemManager_QStringMap();
-    QTest::newRow("wrong scheme") << "invalidscheme:foo bar" << false << QString() << tst_QOrganizerItemManager_QStringMap();
-    QTest::newRow("right scheme, no colon") << "qtorganizer" << false << QString() << tst_QOrganizerItemManager_QStringMap();
-    QTest::newRow("no manager, colon, no params") << "qtorganizer::" << false  << "manager" << tst_QOrganizerItemManager_QStringMap();
-    QTest::newRow("yes manager, no colon, no params") << "qtorganizer:manager" << true << "manager" << tst_QOrganizerItemManager_QStringMap();
-    QTest::newRow("yes manager, yes colon, no params") << "qtorganizer:manager:" << true << "manager"<< tst_QOrganizerItemManager_QStringMap();
+    QTest::newRow("built") << QOrganizerManager::buildUri("manager", inparameters) << true << "manager" << inparameters;
+    QTest::newRow("built with escaped parameters") << QOrganizerManager::buildUri("manager", inparameters2) << true << "manager" << inparameters2;
+    QTest::newRow("no scheme") << "this should not split" << false << QString() << tst_QOrganizerManager_QStringMap();
+    QTest::newRow("wrong scheme") << "invalidscheme:foo bar" << false << QString() << tst_QOrganizerManager_QStringMap();
+    QTest::newRow("right scheme, no colon") << "qtorganizer" << false << QString() << tst_QOrganizerManager_QStringMap();
+    QTest::newRow("no manager, colon, no params") << "qtorganizer::" << false  << "manager" << tst_QOrganizerManager_QStringMap();
+    QTest::newRow("yes manager, no colon, no params") << "qtorganizer:manager" << true << "manager" << tst_QOrganizerManager_QStringMap();
+    QTest::newRow("yes manager, yes colon, no params") << "qtorganizer:manager:" << true << "manager"<< tst_QOrganizerManager_QStringMap();
     QTest::newRow("yes params") << "qtorganizer:manager:foo=bar&bazflag=&bar=glob" << true << "manager" << inparameters;
     QTest::newRow("yes params but misformed") << "qtorganizer:manager:foo=bar&=gloo&bar=glob" << false << "manager" << inparameters;
     QTest::newRow("yes params but misformed 2") << "qtorganizer:manager:=&=gloo&bar=glob" << false << "manager" << inparameters;
@@ -411,11 +411,11 @@ void tst_QOrganizerItemManager::uriParsing_data()
     QTest::newRow("no manager or params or colon") << "qtorganizer:" << false << QString() << inparameters;
 }
 
-void tst_QOrganizerItemManager::addManagers()
+void tst_QOrganizerManager::addManagers()
 {
     QTest::addColumn<QString>("uri");
 
-    QStringList managers = QOrganizerItemManager::availableManagers();
+    QStringList managers = QOrganizerManager::availableManagers();
 
     /* Known one that will not pass */
     managers.removeAll("invalid");
@@ -426,35 +426,35 @@ void tst_QOrganizerItemManager::addManagers()
 
     foreach(QString mgr, managers) {
         QMap<QString, QString> params;
-        QTest::newRow(QString("mgr='%1'").arg(mgr).toLatin1().constData()) << QOrganizerItemManager::buildUri(mgr, params);
+        QTest::newRow(QString("mgr='%1'").arg(mgr).toLatin1().constData()) << QOrganizerManager::buildUri(mgr, params);
         if (mgr == "memory") {
-            params.insert("id", "tst_QOrganizerItemManager");
-            QTest::newRow(QString("mgr='%1', params").arg(mgr).toLatin1().constData()) << QOrganizerItemManager::buildUri(mgr, params);
+            params.insert("id", "tst_QOrganizerManager");
+            QTest::newRow(QString("mgr='%1', params").arg(mgr).toLatin1().constData()) << QOrganizerManager::buildUri(mgr, params);
         }
     }
 }
 
-void tst_QOrganizerItemManager::metadata()
+void tst_QOrganizerManager::metadata()
 {
     // ensure that the backend is publishing its metadata (name / parameters / uri) correctly
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(new QOrganizerItemManager("memory"));
-    QVERIFY(QOrganizerItemManager::buildUri(cm->managerName(), cm->managerParameters()) == cm->managerUri());
+    QScopedPointer<QOrganizerManager> cm(new QOrganizerManager("memory"));
+    QVERIFY(QOrganizerManager::buildUri(cm->managerName(), cm->managerParameters()) == cm->managerUri());
 }
 
 
-void tst_QOrganizerItemManager::nullIdOperations()
+void tst_QOrganizerManager::nullIdOperations()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(new QOrganizerItemManager("memory"));
+    QScopedPointer<QOrganizerManager> cm(new QOrganizerManager("memory"));
     QVERIFY(!cm->removeItem(QOrganizerItemLocalId()));
-    QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
 
 
     QOrganizerItem c = cm->item(QOrganizerItemLocalId());
     QVERIFY(c.id() == QOrganizerItemId());
     QVERIFY(c.isEmpty());
-    QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
 
 
     // test that streaming null ids doesn't crash.
@@ -513,12 +513,12 @@ void tst_QOrganizerItemManager::nullIdOperations()
     }
 }
 
-void tst_QOrganizerItemManager::uriParsing()
+void tst_QOrganizerManager::uriParsing()
 {
     QFETCH(QString, uri);
     QFETCH(bool, good);
     QFETCH(QString, manager);
-    QFETCH(tst_QOrganizerItemManager_QStringMap, parameters);
+    QFETCH(tst_QOrganizerManager_QStringMap, parameters);
 
     QString outmanager;
     QMap<QString, QString> outparameters;
@@ -526,12 +526,12 @@ void tst_QOrganizerItemManager::uriParsing()
     if (good) {
         /* Good split */
         /* Test splitting */
-        QVERIFY(QOrganizerItemManager::parseUri(uri, 0, 0)); // no out parms
+        QVERIFY(QOrganizerManager::parseUri(uri, 0, 0)); // no out parms
 
         // 1 out param
-        QVERIFY(QOrganizerItemManager::parseUri(uri, &outmanager, 0));
+        QVERIFY(QOrganizerManager::parseUri(uri, &outmanager, 0));
         QCOMPARE(manager, outmanager);
-        QVERIFY(QOrganizerItemManager::parseUri(uri, 0, &outparameters));
+        QVERIFY(QOrganizerManager::parseUri(uri, 0, &outparameters));
 
         QORGANIZERITEMMANAGER_REMOVE_VERSIONS_FROM_URI(outparameters);
 
@@ -539,7 +539,7 @@ void tst_QOrganizerItemManager::uriParsing()
 
         outmanager.clear();
         outparameters.clear();
-        QVERIFY(QOrganizerItemManager::parseUri(uri, &outmanager, &outparameters));
+        QVERIFY(QOrganizerManager::parseUri(uri, &outmanager, &outparameters));
 
         QORGANIZERITEMMANAGER_REMOVE_VERSIONS_FROM_URI(outparameters);
 
@@ -549,33 +549,33 @@ void tst_QOrganizerItemManager::uriParsing()
         /* bad splitting */
         outmanager.clear();
         outparameters.clear();
-        QVERIFY(QOrganizerItemManager::parseUri(uri, 0, 0) == false);
-        QVERIFY(QOrganizerItemManager::parseUri(uri, &outmanager, 0) == false);
+        QVERIFY(QOrganizerManager::parseUri(uri, 0, 0) == false);
+        QVERIFY(QOrganizerManager::parseUri(uri, &outmanager, 0) == false);
         QVERIFY(outmanager.isEmpty());
-        QVERIFY(QOrganizerItemManager::parseUri(uri, 0, &outparameters) == false);
+        QVERIFY(QOrganizerManager::parseUri(uri, 0, &outparameters) == false);
         QORGANIZERITEMMANAGER_REMOVE_VERSIONS_FROM_URI(outparameters);
         QVERIFY(outparameters.isEmpty());
 
         /* make sure the in parameters don't change with a bad split */
         outmanager = manager;
         outparameters = parameters;
-        QVERIFY(QOrganizerItemManager::parseUri(uri, &outmanager, 0) == false);
+        QVERIFY(QOrganizerManager::parseUri(uri, &outmanager, 0) == false);
         QCOMPARE(manager, outmanager);
-        QVERIFY(QOrganizerItemManager::parseUri(uri, 0, &outparameters) == false);
+        QVERIFY(QOrganizerManager::parseUri(uri, 0, &outparameters) == false);
         QORGANIZERITEMMANAGER_REMOVE_VERSIONS_FROM_URI(outparameters);
         QCOMPARE(parameters, outparameters);
     }
 }
 
-void tst_QOrganizerItemManager::ctors()
+void tst_QOrganizerManager::ctors()
 {
     /* test the different ctors to make sure we end up with the same uri */
-    QVERIFY(QOrganizerItemManager::availableManagers().count() > 1); // invalid + something else
-    QVERIFY(QOrganizerItemManager::availableManagers().contains("invalid"));
-    QString defaultStore = QOrganizerItemManager::availableManagers().value(0);
+    QVERIFY(QOrganizerManager::availableManagers().count() > 1); // invalid + something else
+    QVERIFY(QOrganizerManager::availableManagers().contains("invalid"));
+    QString defaultStore = QOrganizerManager::availableManagers().value(0);
     QVERIFY(defaultStore != "invalid");
 
-    qDebug() << "Available managers:" << QOrganizerItemManager::availableManagers();
+    qDebug() << "Available managers:" << QOrganizerManager::availableManagers();
 
     QMap<QString, QString> randomParameters;
     randomParameters.insert("something", "old");
@@ -585,14 +585,14 @@ void tst_QOrganizerItemManager::ctors()
 
     QObject parent;
 
-    QOrganizerItemManager cm; // default
-    QOrganizerItemManager cm2(defaultStore);
-    QOrganizerItemManager cm3(defaultStore, QMap<QString, QString>());
-    QOrganizerItemManager cm4(cm.managerUri()); // should fail
+    QOrganizerManager cm; // default
+    QOrganizerManager cm2(defaultStore);
+    QOrganizerManager cm3(defaultStore, QMap<QString, QString>());
+    QOrganizerManager cm4(cm.managerUri()); // should fail
 
-    QScopedPointer<QOrganizerItemManager> cm5(QOrganizerItemManager::fromUri(QOrganizerItemManager::buildUri(defaultStore, QMap<QString, QString>())));
-    QScopedPointer<QOrganizerItemManager> cm6(QOrganizerItemManager::fromUri(cm.managerUri())); // uri is not a name; should fail.
-    QScopedPointer<QOrganizerItemManager> cm9(QOrganizerItemManager::fromUri(QString(), &parent));
+    QScopedPointer<QOrganizerManager> cm5(QOrganizerManager::fromUri(QOrganizerManager::buildUri(defaultStore, QMap<QString, QString>())));
+    QScopedPointer<QOrganizerManager> cm6(QOrganizerManager::fromUri(cm.managerUri())); // uri is not a name; should fail.
+    QScopedPointer<QOrganizerManager> cm9(QOrganizerManager::fromUri(QString(), &parent));
 
     QVERIFY(cm9->parent() == &parent);
 
@@ -612,14 +612,14 @@ void tst_QOrganizerItemManager::ctors()
     QVERIFY(cm.managerUri() != cm4.managerUri()); // don't pass a uri to the ctor
 
     /* Test that we get invalid stores when we do silly things */
-    QOrganizerItemManager em("non existent");
-    QOrganizerItemManager em2("non existent", QMap<QString, QString>());
-    QOrganizerItemManager em3("memory", randomParameters);
+    QOrganizerManager em("non existent");
+    QOrganizerManager em2("non existent", QMap<QString, QString>());
+    QOrganizerManager em3("memory", randomParameters);
 
     /* Also invalid, since we don't have one of these anyway */
-    QScopedPointer<QOrganizerItemManager> em4(QOrganizerItemManager::fromUri("invalid uri"));
-    QScopedPointer<QOrganizerItemManager> em5(QOrganizerItemManager::fromUri(QOrganizerItemManager::buildUri("nonexistent", QMap<QString, QString>())));
-    QScopedPointer<QOrganizerItemManager> em6(QOrganizerItemManager::fromUri(em3.managerUri()));
+    QScopedPointer<QOrganizerManager> em4(QOrganizerManager::fromUri("invalid uri"));
+    QScopedPointer<QOrganizerManager> em5(QOrganizerManager::fromUri(QOrganizerManager::buildUri("nonexistent", QMap<QString, QString>())));
+    QScopedPointer<QOrganizerManager> em6(QOrganizerManager::fromUri(em3.managerUri()));
 
 
     /*
@@ -649,10 +649,10 @@ void tst_QOrganizerItemManager::ctors()
     QCOMPARE(em4->managerName(), QString("invalid"));
     QCOMPARE(em5->managerName(), QString("invalid"));
     QCOMPARE(em6->managerName(), QString("memory"));
-    QCOMPARE(em.managerParameters(), tst_QOrganizerItemManager_QStringMap());
-    QCOMPARE(em2.managerParameters(), tst_QOrganizerItemManager_QStringMap());
-    QCOMPARE(em4->managerParameters(), tst_QOrganizerItemManager_QStringMap());
-    QCOMPARE(em5->managerParameters(), tst_QOrganizerItemManager_QStringMap());
+    QCOMPARE(em.managerParameters(), tst_QOrganizerManager_QStringMap());
+    QCOMPARE(em2.managerParameters(), tst_QOrganizerManager_QStringMap());
+    QCOMPARE(em4->managerParameters(), tst_QOrganizerManager_QStringMap());
+    QCOMPARE(em5->managerParameters(), tst_QOrganizerManager_QStringMap());
     QCOMPARE(em3.managerParameters(), em6->managerParameters()); // memory engine discards the given params, replaces with id.
 
 
@@ -670,12 +670,12 @@ void tst_QOrganizerItemManager::ctors()
 #endif
 }
 
-void tst_QOrganizerItemManager::doDump()
+void tst_QOrganizerManager::doDump()
 {
     // Only do this if it has been explicitly selected
     if (QCoreApplication::arguments().contains("doDump")) {
         QFETCH(QString, uri);
-        QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+        QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
         dumpOrganizerItems(cm.data());
     }
@@ -683,12 +683,12 @@ void tst_QOrganizerItemManager::doDump()
 
 Q_DECLARE_METATYPE(QVariant)
 
-void tst_QOrganizerItemManager::doDumpSchema()
+void tst_QOrganizerManager::doDumpSchema()
 {
     // Only do this if it has been explicitly selected
     if (QCoreApplication::arguments().contains("doDumpSchema")) {
         QFETCH(QString, uri);
-        QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+        QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
         // Get the schema for each supported type
         foreach(QString type, cm->supportedItemTypes()) {
@@ -732,10 +732,10 @@ void tst_QOrganizerItemManager::doDumpSchema()
     }
 }
 
-void tst_QOrganizerItemManager::add()
+void tst_QOrganizerManager::add()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
     
     // Use note & todo item depending on backend support
     QString type;
@@ -752,7 +752,7 @@ void tst_QOrganizerItemManager::add()
     item.setDescription("This note is a particularly notey note");
     int currCount = cm->itemIds().count();
     QVERIFY(cm->saveItem(&item));
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
 
     QVERIFY(!item.id().managerUri().isEmpty());
     QVERIFY(!item.id().localId().isNull());
@@ -776,7 +776,7 @@ void tst_QOrganizerItemManager::add()
     QVERIFY(cm->saveItem(&nonexistentItem));       // should work
     QVERIFY(cm->removeItem(nonexistentItem.id().localId())); // now nonexistentItem has an id which does not exist
     QVERIFY(!cm->saveItem(&nonexistentItem));      // hence, should fail
-    QCOMPARE(cm->error(), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(cm->error(), QOrganizerManager::DoesNotExistError);
     nonexistentItem.setId(QOrganizerItemId());
     QVERIFY(cm->saveItem(&nonexistentItem));       // after setting id to zero, should save
     QVERIFY(cm->removeItem(nonexistentItem.id().localId()));
@@ -873,17 +873,17 @@ void tst_QOrganizerItemManager::add()
     // XXX TODO.
 }
 
-void tst_QOrganizerItemManager::addExceptions()
+void tst_QOrganizerManager::addExceptions()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
     QOrganizerEvent event;
     event.setDisplayLabel(QLatin1String("meeting"));
     event.setStartDateTime(QDateTime(QDate(2010, 1, 1), QTime(11, 0, 0)));
     event.setEndDateTime(QDateTime(QDate(2010, 1, 1), QTime(12, 0, 0)));
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
     rrule.setLimit(3);
     event.setRecurrenceRule(rrule);
     QVERIFY(cm->saveItem(&event));
@@ -962,7 +962,7 @@ void tst_QOrganizerItemManager::addExceptions()
     QVERIFY(!thirdEvent.localId().isNull());
 }
 
-void tst_QOrganizerItemManager::addExceptionsWithGuid()
+void tst_QOrganizerManager::addExceptionsWithGuid()
 {
     // It should be possible to save an exception that has at least an originalDate and either a
     // guid or a parentLocalId.  If guid and parentLocalId are both specified, the client should
@@ -970,7 +970,7 @@ void tst_QOrganizerItemManager::addExceptionsWithGuid()
     // guid or parentLocalId are specified, the manager should generate the other one.
     // This test case tests all of this.
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
     // Set up some recurring items
     QOrganizerEvent christmas;
@@ -978,8 +978,8 @@ void tst_QOrganizerItemManager::addExceptionsWithGuid()
     christmas.setStartDateTime(QDateTime(QDate(2009, 12, 25), QTime(0, 0, 0)));
     christmas.setEndDateTime(QDateTime(QDate(2009, 12, 26), QTime(0, 0, 0)));
     christmas.setDisplayLabel(QLatin1String("Christmas"));
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
     christmas.setRecurrenceRule(rrule);
     QVERIFY(cm->saveItem(&christmas));
     QVERIFY(!christmas.id().managerUri().isEmpty());
@@ -1009,13 +1009,13 @@ void tst_QOrganizerItemManager::addExceptionsWithGuid()
     if (cm->detailDefinitions(QOrganizerItemType::TypeEventOccurrence).contains(QOrganizerItemComment::DefinitionName))
         exception.addComment(QLatin1String("With the in-laws"));
     QVERIFY(!cm->saveItem(&exception));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // exception with invalid guid fails
     exception.setId(QOrganizerItemId());
     exception.setGuid(QLatin1String("halloween"));
     QVERIFY(!cm->saveItem(&exception));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidOccurrenceError);
     
     // with the guid set, it should work
     exception.setId(QOrganizerItemId());
@@ -1042,19 +1042,19 @@ void tst_QOrganizerItemManager::addExceptionsWithGuid()
         exception2.addComment(QLatin1String("With the in-laws"));
     exception2.setParentLocalId(report.localId()); // report is not an event
     QVERIFY(!cm->saveItem(&exception2));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // can't set guid to a non-event
     exception2.setGuid(QLatin1String("report"));
     exception2.setParentLocalId(QOrganizerItemLocalId());
     QVERIFY(!cm->saveItem(&exception2));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // can't make the guid inconsistent with the parentId
     exception2.setParentLocalId(christmas.localId());
     exception2.setGuid(QLatin1String("newyear"));
     QVERIFY(!cm->saveItem(&exception2));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // with just the parentId set to a valid parent, it should work
     exception2.setGuid(QLatin1String(""));
@@ -1074,7 +1074,7 @@ void tst_QOrganizerItemManager::addExceptionsWithGuid()
     exception3.setParentLocalId(christmas.localId());
     exception3.setGuid(QLatin1String("christmas"));
     QVERIFY(!cm->saveItem(&exception3));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidOccurrenceError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidOccurrenceError);
 
     // with original date, guid and parentId set and consistent, and localId=0, it should work
     exception3.setOriginalDate(QDate(2012, 12, 25));
@@ -1084,10 +1084,10 @@ void tst_QOrganizerItemManager::addExceptionsWithGuid()
     QCOMPARE(savedException.parentLocalId(), christmas.localId());
 }
 
-void tst_QOrganizerItemManager::update()
+void tst_QOrganizerManager::update()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
     
     // Use note & todo item depending on backend support
     QString type;
@@ -1104,27 +1104,27 @@ void tst_QOrganizerItemManager::update()
     item.setDisplayLabel("Yet another note");
     item.setDescription("Surprisingly, this note is not a particularly notey note");
     QVERIFY(cm->saveItem(&item));
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
 
     /* Update name */
     QOrganizerItemDescription descr = item.detail(QOrganizerItemDescription::DefinitionName);
     descr.setDescription("This note is now slightly noteworthy");
     item.saveDetail(&descr);
     QVERIFY(cm->saveItem(&item));
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
     descr.setDescription("This is a very noteworthy note");
     item.saveDetail(&descr);
     QVERIFY(cm->saveItem(&item));
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
     QOrganizerItem updated = cm->item(item.localId());
     QOrganizerItemDescription updatedDescr = updated.detail(QOrganizerItemDescription::DefinitionName);
     QCOMPARE(updatedDescr, descr);
 }
 
-void tst_QOrganizerItemManager::remove()
+void tst_QOrganizerManager::remove()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
     
     // Use note & todo item depending on backend support
     QString type;
@@ -1141,7 +1141,7 @@ void tst_QOrganizerItemManager::remove()
     item.setDisplayLabel("Not another note");
     item.setDescription("Yes, another note!");
     QVERIFY(cm->saveItem(&item));
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
     QVERIFY(item.id() != QOrganizerItemId());
 
     /* Remove the created item */
@@ -1149,20 +1149,20 @@ void tst_QOrganizerItemManager::remove()
     QVERIFY(cm->removeItem(item.localId()));
     QCOMPARE(cm->itemIds().count(), itemCount - 1);
     QVERIFY(cm->item(item.localId()).isEmpty());
-    QCOMPARE(cm->error(), QOrganizerItemManager::DoesNotExistError);
+    QCOMPARE(cm->error(), QOrganizerManager::DoesNotExistError);
 }
 
-void tst_QOrganizerItemManager::batch()
+void tst_QOrganizerManager::batch()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
     /* First test null pointer operations */
     QVERIFY(!cm->saveItems(NULL));
-    QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+    QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
 
     QVERIFY(!cm->removeItems(QList<QOrganizerItemLocalId>()));
-    QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+    QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
     
     // Use note & todo item depending on backend support
     QString type;
@@ -1196,11 +1196,11 @@ void tst_QOrganizerItemManager::batch()
     QList<QOrganizerItem> items;
     items << a << b << c;
 
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QMap<int, QOrganizerManager::Error> errorMap;
     // Add one dummy error to test if the errors are reset
-    errorMap.insert(0, QOrganizerItemManager::NoError);
+    errorMap.insert(0, QOrganizerManager::NoError);
     QVERIFY(cm->saveItems(&items));
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
     errorMap = cm->errorMap();
     QVERIFY(errorMap.count() == 0);
 
@@ -1233,7 +1233,7 @@ void tst_QOrganizerItemManager::batch()
     QVERIFY(items[2].saveDetail(&descr));
 
     QVERIFY(cm->saveItems(&items));
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
     errorMap = cm->errorMap();
     QVERIFY(errorMap.count() == 0);
 
@@ -1259,29 +1259,29 @@ void tst_QOrganizerItemManager::batch()
     QVERIFY(cm->removeItems(ids));
     errorMap = cm->errorMap();
     QVERIFY(errorMap.count() == 0);
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
 
     /* Make sure the items really don't exist any more */
     QVERIFY(cm->item(a.id().localId()).id() == QOrganizerItemId());
     QVERIFY(cm->item(a.id().localId()).isEmpty());
-    QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
     QVERIFY(cm->item(b.id().localId()).id() == QOrganizerItemId());
     QVERIFY(cm->item(b.id().localId()).isEmpty());
-    QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
     QVERIFY(cm->item(c.id().localId()).id() == QOrganizerItemId());
     QVERIFY(cm->item(c.id().localId()).isEmpty());
-    QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
 
     /* Now try removing with all invalid ids (e.g. the ones we just removed) */
     ids.clear();
     ids << a.id().localId() << b.id().localId() << c.id().localId();
     QVERIFY(!cm->removeItems(ids));
-    QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
     errorMap = cm->errorMap();
     QVERIFY(errorMap.count() == 3);
-    QVERIFY(errorMap.values().at(0) == QOrganizerItemManager::DoesNotExistError);
-    QVERIFY(errorMap.values().at(1) == QOrganizerItemManager::DoesNotExistError);
-    QVERIFY(errorMap.values().at(2) == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(errorMap.values().at(0) == QOrganizerManager::DoesNotExistError);
+    QVERIFY(errorMap.values().at(1) == QOrganizerManager::DoesNotExistError);
+    QVERIFY(errorMap.values().at(2) == QOrganizerManager::DoesNotExistError);
 
     /* Try adding some new ones again, this time one with an error */
     items.clear();
@@ -1297,7 +1297,7 @@ void tst_QOrganizerItemManager::batch()
     items << a << b << c;
     QVERIFY(!cm->saveItems(&items)); // since we don't setCollectionId() in any of the items, they go in default collection.
     /* We can't really say what the error will be.. maybe bad argument, maybe invalid detail */
-    QVERIFY(cm->error() != QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() != QOrganizerManager::NoError);
 
     /* It's permissible to fail all the adds, or to add the successful ones */
     errorMap = cm->errorMap();
@@ -1306,19 +1306,19 @@ void tst_QOrganizerItemManager::batch()
 
     // A might have gone through
     if (errorMap.keys().contains(0)) {
-        QVERIFY(errorMap.value(0) != QOrganizerItemManager::NoError);
+        QVERIFY(errorMap.value(0) != QOrganizerManager::NoError);
         QVERIFY(items.at(0).id() == QOrganizerItemId());
     } else {
         QVERIFY(items.at(0).id() != QOrganizerItemId());
     }
 
     // B should have failed
-    QVERIFY(errorMap.value(1) == QOrganizerItemManager::InvalidDetailError);
+    QVERIFY(errorMap.value(1) == QOrganizerManager::InvalidDetailError);
     QVERIFY(items.at(1).id() == QOrganizerItemId());
 
     // C might have gone through
     if (errorMap.keys().contains(2)) {
-        QVERIFY(errorMap.value(2) != QOrganizerItemManager::NoError);
+        QVERIFY(errorMap.value(2) != QOrganizerManager::NoError);
         QVERIFY(items.at(2).id() == QOrganizerItemId());
     } else {
         QVERIFY(items.at(2).id() != QOrganizerItemId());
@@ -1329,7 +1329,7 @@ void tst_QOrganizerItemManager::batch()
     QVERIFY(cm->saveItems(&items));
     errorMap = cm->errorMap();
     QVERIFY(errorMap.count() == 0);
-    QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() == QOrganizerManager::NoError);
     
     // Save and remove a fourth item. Store the id.
     QOrganizerItem d;
@@ -1346,7 +1346,7 @@ void tst_QOrganizerItemManager::batch()
     ids << items.at(2).id().localId();
 
     QVERIFY(!cm->removeItems(ids));
-    QVERIFY(cm->error() != QOrganizerItemManager::NoError);
+    QVERIFY(cm->error() != QOrganizerManager::NoError);
 
     /* Again, the backend has the choice of either removing the successful ones, or not */
     errorMap = cm->errorMap();
@@ -1355,40 +1355,40 @@ void tst_QOrganizerItemManager::batch()
 
     // A might have gone through
     if (errorMap.keys().contains(0)) {
-        QVERIFY(errorMap.value(0) != QOrganizerItemManager::NoError);
+        QVERIFY(errorMap.value(0) != QOrganizerManager::NoError);
         QVERIFY(items.at(0).id() == QOrganizerItemId());
     } else {
         QVERIFY(items.at(0).id() != QOrganizerItemId());
     }
 
     /* B should definitely have failed */
-    QVERIFY(errorMap.value(1) == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(errorMap.value(1) == QOrganizerManager::DoesNotExistError);
     QVERIFY(ids.at(1) == removedId);
 
     // A might have gone through
     if (errorMap.keys().contains(2)) {
-        QVERIFY(errorMap.value(2) != QOrganizerItemManager::NoError);
+        QVERIFY(errorMap.value(2) != QOrganizerManager::NoError);
         QVERIFY(items.at(2).id() == QOrganizerItemId());
     } else {
         QVERIFY(items.at(2).id() != QOrganizerItemId());
     }
 }
 
-void tst_QOrganizerItemManager::invalidManager()
+void tst_QOrganizerManager::invalidManager()
 {
     /* Create an invalid manager */
-    QOrganizerItemManager manager("this should never work");
+    QOrganizerManager manager("this should never work");
     QVERIFY(manager.managerName() == "invalid");
     QVERIFY(manager.managerVersion() == 0);
 
     /* also, test the other ctor behaviour is sane also */
-    QOrganizerItemManager anotherManager("this should never work", 15);
+    QOrganizerManager anotherManager("this should never work", 15);
     QVERIFY(anotherManager.managerName() == "invalid");
     QVERIFY(anotherManager.managerVersion() == 0);
 
     /* Now test that all the operations fail */
     QVERIFY(manager.itemIds().count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
 
     QOrganizerItem foo;
     QOrganizerItemDisplayLabel dl;
@@ -1396,36 +1396,36 @@ void tst_QOrganizerItemManager::invalidManager()
     foo.saveDetail(&dl);
 
     QVERIFY(manager.saveItem(&foo) == false);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
     QVERIFY(foo.id() == QOrganizerItemId());
     QVERIFY(manager.itemIds().count() == 0);
 
     QVERIFY(manager.item(foo.id().localId()).id() == QOrganizerItemId());
     QVERIFY(manager.item(foo.id().localId()).isEmpty());
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
 
     QVERIFY(manager.removeItem(foo.id().localId()) == false);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
 
-    QMap<int, QOrganizerItemManager::Error> errorMap;
-    errorMap.insert(0, QOrganizerItemManager::NoError);
+    QMap<int, QOrganizerManager::Error> errorMap;
+    errorMap.insert(0, QOrganizerManager::NoError);
     QVERIFY(!manager.saveItems(0));
     errorMap = manager.errorMap();
     QVERIFY(errorMap.count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::BadArgumentError);
+    QVERIFY(manager.error() == QOrganizerManager::BadArgumentError);
 
     /* filters */
     QOrganizerItemFilter f; // matches everything
     QOrganizerItemDetailFilter df;
     df.setDetailDefinitionName(QOrganizerItemDisplayLabel::DefinitionName, QOrganizerItemDisplayLabel::FieldLabel);
     QVERIFY(manager.itemIds(QOrganizerItemFilter()).count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
     QVERIFY(manager.itemIds(df).count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
     QVERIFY(manager.itemIds(f | f).count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
     QVERIFY(manager.itemIds(df | df).count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
 
     QVERIFY(manager.isFilterSupported(f) == false);
     QVERIFY(manager.isFilterSupported(df) == false);
@@ -1436,23 +1436,23 @@ void tst_QOrganizerItemManager::invalidManager()
     QVERIFY(!manager.saveItems(&list));
     errorMap = manager.errorMap();
     QVERIFY(errorMap.count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
 
     QVERIFY(!manager.removeItems(QList<QOrganizerItemLocalId>()));
     errorMap = manager.errorMap();
     QVERIFY(errorMap.count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::BadArgumentError);
+    QVERIFY(manager.error() == QOrganizerManager::BadArgumentError);
 
     QList<QOrganizerItemLocalId> idlist;
     idlist << foo.id().localId();
     QVERIFY(!manager.removeItems(idlist));
     errorMap = manager.errorMap();
     QVERIFY(errorMap.count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError);
 
     /* Detail definitions */
     QVERIFY(manager.detailDefinitions(QOrganizerItemType::TypeEvent).count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
 
     QOrganizerItemDetailDefinition def;
     def.setUnique(true);
@@ -1464,39 +1464,39 @@ void tst_QOrganizerItemManager::invalidManager()
     def.setFields(fields);
 
     QVERIFY(manager.saveDetailDefinition(def, QOrganizerItemType::TypeNote) == false);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
     QVERIFY(manager.saveDetailDefinition(def, QOrganizerItemType::TypeEvent) == false);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
     QVERIFY(manager.detailDefinitions(QOrganizerItemType::TypeEvent).count(QOrganizerItemType::TypeNote) == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
     QVERIFY(manager.detailDefinitions(QOrganizerItemType::TypeEvent).count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
     QVERIFY(manager.detailDefinition("new field", QOrganizerItemType::TypeEvent).name() == QString());
     QVERIFY(manager.removeDetailDefinition(def.name(), QOrganizerItemType::TypeNote) == false);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
     QVERIFY(manager.removeDetailDefinition(def.name(), QOrganizerItemType::TypeEvent) == false);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
     QVERIFY(manager.detailDefinitions(QOrganizerItemType::TypeEvent).count() == 0);
-    QVERIFY(manager.error() == QOrganizerItemManager::NotSupportedError || manager.error() == QOrganizerItemManager::InvalidItemTypeError);
+    QVERIFY(manager.error() == QOrganizerManager::NotSupportedError || manager.error() == QOrganizerManager::InvalidItemTypeError);
 
      /* Capabilities */
-    QVERIFY(!manager.hasFeature(QOrganizerItemManager::MutableDefinitions));
+    QVERIFY(!manager.hasFeature(QOrganizerManager::MutableDefinitions));
 }
 
-void tst_QOrganizerItemManager::memoryManager()
+void tst_QOrganizerManager::memoryManager()
 {
     QMap<QString, QString> params;
-    QOrganizerItemManager m1("memory");
+    QOrganizerManager m1("memory");
     params.insert("random", "shouldNotBeUsed");
-    QOrganizerItemManager m2("memory", params);
+    QOrganizerManager m2("memory", params);
     params.insert("id", "shouldBeUsed");
-    QOrganizerItemManager m3("memory", params);
-    QOrganizerItemManager m4("memory", params);
+    QOrganizerManager m3("memory", params);
+    QOrganizerManager m4("memory", params);
     params.insert("id", QString(""));
-    QOrganizerItemManager m5("memory", params); // should be another anonymous
+    QOrganizerManager m5("memory", params); // should be another anonymous
 
-    QVERIFY(m1.hasFeature(QOrganizerItemManager::MutableDefinitions));
-    QVERIFY(m1.hasFeature(QOrganizerItemManager::Anonymous));
+    QVERIFY(m1.hasFeature(QOrganizerManager::MutableDefinitions));
+    QVERIFY(m1.hasFeature(QOrganizerManager::Anonymous));
 
     // add a item to each of m1, m2, m3
     QOrganizerItem c;
@@ -1549,12 +1549,12 @@ void tst_QOrganizerItemManager::memoryManager()
 }
 
 
-void tst_QOrganizerItemManager::compatibleItem_data()
+void tst_QOrganizerManager::compatibleItem_data()
 {
     // XXX TODO: fix this test - need more item types tested etc.
     QTest::addColumn<QOrganizerItem>("input");
     QTest::addColumn<QOrganizerItem>("expected");
-    QTest::addColumn<QOrganizerItemManager::Error>("error");
+    QTest::addColumn<QOrganizerManager::Error>("error");
 
     QOrganizerNote baseNote;
     QOrganizerItemDisplayLabel dl;
@@ -1562,7 +1562,7 @@ void tst_QOrganizerItemManager::compatibleItem_data()
     baseNote.saveDetail(&dl);
 
     {
-        QTest::newRow("already compatible") << QOrganizerItem(baseNote) << QOrganizerItem(baseNote) << QOrganizerItemManager::NoError;
+        QTest::newRow("already compatible") << QOrganizerItem(baseNote) << QOrganizerItem(baseNote) << QOrganizerManager::NoError;
     }
 
     {
@@ -1570,7 +1570,7 @@ void tst_QOrganizerItemManager::compatibleItem_data()
         QOrganizerItemDetail detail("UnknownDetail");
         detail.setValue("Key", QLatin1String("Value"));
         item.saveDetail(&detail);
-        QTest::newRow("unknown detail") << item << QOrganizerItem(baseNote) << QOrganizerItemManager::NoError;
+        QTest::newRow("unknown detail") << item << QOrganizerItem(baseNote) << QOrganizerManager::NoError;
     }
 
     {
@@ -1583,7 +1583,7 @@ void tst_QOrganizerItemManager::compatibleItem_data()
         item.saveDetail(&description2);
         QOrganizerItem expected(baseNote);
         expected.saveDetail(&description2); // can't have two descriptions, only the second will be kept XXX TODO: surely it's backend specific which gets kept?
-        QTest::newRow("duplicate unique field") << item << expected << QOrganizerItemManager::NoError;
+        QTest::newRow("duplicate unique field") << item << expected << QOrganizerManager::NoError;
     }
 
     {
@@ -1591,7 +1591,7 @@ void tst_QOrganizerItemManager::compatibleItem_data()
         QOrganizerItemDescription descr;
         descr.setValue("UnknownKey", "Value");
         item.saveDetail(&descr);
-        QTest::newRow("unknown field") << item << QOrganizerItem(baseNote) << QOrganizerItemManager::NoError;
+        QTest::newRow("unknown field") << item << QOrganizerItem(baseNote) << QOrganizerManager::NoError;
     }
 
     {
@@ -1600,31 +1600,31 @@ void tst_QOrganizerItemManager::compatibleItem_data()
         //QOrganizerItemDisplayLabel displayLabel;
         //displayLabel.setValue(QOrganizerItemDisplayLabel::FieldLabel, QStringList("Value"));
         //item.saveDetail(&displayLabel);
-        //QTest::newRow("wrong type") << QOrganizerItem(item) << QOrganizerItem(baseNote) << QOrganizerItemManager::NoError;
+        //QTest::newRow("wrong type") << QOrganizerItem(item) << QOrganizerItem(baseNote) << QOrganizerManager::NoError;
     }
 }
 
-void tst_QOrganizerItemManager::compatibleItem()
+void tst_QOrganizerManager::compatibleItem()
 {
-    QOrganizerItemManager cm("memory");
+    QOrganizerManager cm("memory");
 
     QFETCH(QOrganizerItem, input);
     QFETCH(QOrganizerItem, expected);
-    QFETCH(QOrganizerItemManager::Error, error);
+    QFETCH(QOrganizerManager::Error, error);
     QCOMPARE(cm.compatibleItem(input), expected);
     QCOMPARE(cm.error(), error);
 }
 
-void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
+void tst_QOrganizerManager::recurrenceWithGenerator_data()
 {
     QTest::addColumn<QString>("uri");
     QTest::addColumn<QDate>("eventDate");
-    QTest::addColumn<QOrganizerItemRecurrenceRule>("recurrenceRule");
+    QTest::addColumn<QOrganizerRecurrenceRule>("recurrenceRule");
     QTest::addColumn<QDate>("startDate");
     QTest::addColumn<QDate>("endDate");
     QTest::addColumn<QList<QDate> >("occurrenceDates");
 
-    QStringList managers = QOrganizerItemManager::availableManagers();
+    QStringList managers = QOrganizerManager::availableManagers();
 
     /* Known one that will not pass */
     managers.removeAll("invalid");
@@ -1634,11 +1634,11 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
     managers.removeAll("skeleton");
 
     foreach(QString mgr, managers) {
-        QString managerUri = QOrganizerItemManager::buildUri(mgr, QMap<QString, QString>());
+        QString managerUri = QOrganizerManager::buildUri(mgr, QMap<QString, QString>());
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
             rrule.setLimit(QDate(2010, 1, 22));
             QTest::newRow(QString("mgr=%1, weekly recurrence").arg(mgr).toLatin1().constData())
                 << managerUri << QDate(2010, 1, 1) << rrule
@@ -1676,8 +1676,8 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
             rrule.setLimit(QDate(2010, 1, 5));
             QTest::newRow(QString("mgr=%1, daily").arg(mgr).toLatin1().constData())
                 << managerUri << QDate(2010, 1, 1) << rrule
@@ -1693,8 +1693,8 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
             rrule.setFirstDayOfWeek(Qt::Monday);
             rrule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Friday << Qt::Saturday << Qt::Sunday);
             rrule.setLimit(QDate(2010, 1, 27));
@@ -1715,8 +1715,8 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Monthly);
             rrule.setDaysOfMonth(QSet<int>() << 1 << 10);
             rrule.setLimit(QDate(2010, 4, 15));
             QTest::newRow(QString("mgr=%1, monthly recurrence").arg(mgr).toLatin1().constData())
@@ -1736,8 +1736,8 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
             rrule.setDaysOfYear(QSet<int>() << 1 << 32);
             rrule.setLimit(QDate(2012, 3, 15));
             QTest::newRow(QString("mgr=%1, yearly recurrence").arg(mgr).toLatin1().constData())
@@ -1757,11 +1757,11 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-            rrule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                    << QOrganizerItemRecurrenceRule::January
-                    << QOrganizerItemRecurrenceRule::March);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+            rrule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                    << QOrganizerRecurrenceRule::January
+                    << QOrganizerRecurrenceRule::March);
             rrule.setLimit(QDate(2011, 3, 15));
             QTest::newRow(QString("mgr=%1, yearly recurrence, by month").arg(mgr).toLatin1().constData())
                 << managerUri << QDate(2010, 1, 1) << rrule
@@ -1772,8 +1772,8 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
             rrule.setWeeksOfYear(QSet<int>() << 1 << 4);
             rrule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Thursday);
             rrule.setLimit(QDate(2011, 3, 15));
@@ -1785,10 +1785,10 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-            rrule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                    << QOrganizerItemRecurrenceRule::April);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+            rrule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                    << QOrganizerRecurrenceRule::April);
             rrule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Sunday);
             rrule.setPositions(QSet<int>() << 1);
             QTest::newRow(QString("mgr=%1, yearly recurrence, first Sunday of April").arg(mgr).toLatin1().constData())
@@ -1802,10 +1802,10 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
         }
 
         {
-            QOrganizerItemRecurrenceRule rrule;
-            rrule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-            rrule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                    << QOrganizerItemRecurrenceRule::October);
+            QOrganizerRecurrenceRule rrule;
+            rrule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+            rrule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                    << QOrganizerRecurrenceRule::October);
             rrule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Sunday);
             rrule.setPositions(QSet<int>() << -1);
             QTest::newRow(QString("mgr=%1, yearly recurrence, last Sunday of October").arg(mgr).toLatin1().constData())
@@ -1820,12 +1820,12 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator_data()
     }
 }
 
-void tst_QOrganizerItemManager::recurrenceWithGenerator()
+void tst_QOrganizerManager::recurrenceWithGenerator()
 {
     QFETCH(QString, uri);
     QFETCH(QDate, eventDate);
-    QFETCH(QOrganizerItemRecurrenceRule, recurrenceRule);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QFETCH(QOrganizerRecurrenceRule, recurrenceRule);
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
     QFETCH(QDate, startDate);
     QFETCH(QDate, endDate);
     QFETCH(QList<QDate>, occurrenceDates);
@@ -1847,9 +1847,9 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator()
             QCOMPARE(item.type(), QString(QLatin1String(QOrganizerItemType::TypeEventOccurrence)));
             QDate occurrenceDate;
             if (item.type() == QOrganizerItemType::TypeEventOccurrence) {
-                occurrenceDate = item.detail<QOrganizerEventTimeRange>().startDateTime().date();
+                occurrenceDate = item.detail<QOrganizerEventTime>().startDateTime().date();
             } else if (item.type() == QOrganizerItemType::TypeTodoOccurrence) {
-                occurrenceDate = item.detail<QOrganizerTodoTimeRange>().startDateTime().date();
+                occurrenceDate = item.detail<QOrganizerTodoTime>().startDateTime().date();
             }
             //QCOMPARE(occurrenceDate, occurrenceDates.at(i));
             actualDates << occurrenceDate;
@@ -1862,15 +1862,15 @@ void tst_QOrganizerItemManager::recurrenceWithGenerator()
         }
     } else {
         // Allow backend specific limitations
-        QCOMPARE(cm->error(), QOrganizerItemManager::NotSupportedError);
+        QCOMPARE(cm->error(), QOrganizerManager::NotSupportedError);
         qWarning() << "The event not supported by the backend";
     }
 }
 
-void tst_QOrganizerItemManager::itemValidation()
+void tst_QOrganizerManager::itemValidation()
 {
     /* Use the memory engine as a reference (validation is not engine specific) */
-    QScopedPointer<QOrganizerItemManager> cm(new QOrganizerItemManager("memory"));
+    QScopedPointer<QOrganizerManager> cm(new QOrganizerManager("memory"));
     QOrganizerNote c;
 
     /*
@@ -1904,7 +1904,7 @@ void tst_QOrganizerItemManager::itemValidation()
     d1.setValue("test", "test");
     c.saveDetail(&d1);
     QVERIFY(!cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidDetailError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidDetailError);
     c.removeDetail(&d1);
 
     // second, test an invalid uniqueness constraint
@@ -1914,14 +1914,14 @@ void tst_QOrganizerItemManager::itemValidation()
 
     // One unique should be ok
     QVERIFY(cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(cm->error(), QOrganizerManager::NoError);
 
     // Two uniques should not be ok
     QOrganizerItemDetail d3 = QOrganizerItemDetail("UniqueDetail");
     d3.setValue("value", "test2");
     c.saveDetail(&d3);
     QVERIFY(!cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::AlreadyExistsError);
+    QCOMPARE(cm->error(), QOrganizerManager::AlreadyExistsError);
     c.removeDetail(&d3);
     c.removeDetail(&d2);
 
@@ -1930,7 +1930,7 @@ void tst_QOrganizerItemManager::itemValidation()
     d4.setValue("test", "test");
     c.saveDetail(&d4);
     QVERIFY(!cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidDetailError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidDetailError);
     c.removeDetail(&d4);
 
     // fourth, test an invalid field data type
@@ -1938,7 +1938,7 @@ void tst_QOrganizerItemManager::itemValidation()
     d5.setValue(QOrganizerItemDescription::FieldDescription, QDateTime::currentDateTime());
     c.saveDetail(&d5);
     QVERIFY(!cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidDetailError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidDetailError);
     c.removeDetail(&d5);
 
     // fifth, test an invalid field value (not in the allowed list)
@@ -1946,14 +1946,14 @@ void tst_QOrganizerItemManager::itemValidation()
     d6.setValue("value", "Seven"); // not in One, Two or Three
     c.saveDetail(&d6);
     QVERIFY(!cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::InvalidDetailError);
+    QCOMPARE(cm->error(), QOrganizerManager::InvalidDetailError);
     c.removeDetail(&d6);
 
     /* Now a valid value */
     d6.setValue("value", "Two");
     c.saveDetail(&d6);
     QVERIFY(cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(cm->error(), QOrganizerManager::NoError);
     c.removeDetail(&d6);
 
     // Test a completely valid one.
@@ -1961,15 +1961,15 @@ void tst_QOrganizerItemManager::itemValidation()
     d7.setValue(QOrganizerItemDescription::FieldDescription, "A valid description");
     c.saveDetail(&d7);
     QVERIFY(cm->saveItem(&c));
-    QCOMPARE(cm->error(), QOrganizerItemManager::NoError);
+    QCOMPARE(cm->error(), QOrganizerManager::NoError);
     c.removeDetail(&d7);
 }
 
-void tst_QOrganizerItemManager::signalEmission()
+void tst_QOrganizerManager::signalEmission()
 {
     QTest::qWait(500); // clear the signal queue
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> m1(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> m1(QOrganizerManager::fromUri(uri));
 
     qRegisterMetaType<QOrganizerItemLocalId>("QOrganizerItemLocalId");
     qRegisterMetaType<QList<QOrganizerItemLocalId> >("QList<QOrganizerItemLocalId>");
@@ -2071,7 +2071,7 @@ void tst_QOrganizerItemManager::signalEmission()
     todo2.setId(QOrganizerItemId());
     todo3.setId(QOrganizerItemId());
     batchAdd << todo << todo2 << todo3;
-    QMap<int, QOrganizerItemManager::Error> errorMap;
+    QMap<int, QOrganizerManager::Error> errorMap;
     QVERIFY(m1->saveItems(&batchAdd));
     errorMap = m1->errorMap();
 
@@ -2114,12 +2114,12 @@ void tst_QOrganizerItemManager::signalEmission()
     QTRY_COMPARE(spyCA.count(), 0);
     QTRY_COMPARE(spyCM.count(), 0);
 
-    QScopedPointer<QOrganizerItemManager> m2(QOrganizerItemManager::fromUri(uri));
-    QVERIFY(m1->hasFeature(QOrganizerItemManager::Anonymous) ==
-        m2->hasFeature(QOrganizerItemManager::Anonymous));
+    QScopedPointer<QOrganizerManager> m2(QOrganizerManager::fromUri(uri));
+    QVERIFY(m1->hasFeature(QOrganizerManager::Anonymous) ==
+        m2->hasFeature(QOrganizerManager::Anonymous));
 
     /* Now some cross manager testing */
-    if (!m1->hasFeature(QOrganizerItemManager::Anonymous)) {
+    if (!m1->hasFeature(QOrganizerManager::Anonymous)) {
         // verify that signals are emitted for modifications made to other managers (same id).
         QOrganizerItemDisplayLabel ncs = todo.detail(QOrganizerItemDisplayLabel::DefinitionName);
         ncs.setLabel("Test");
@@ -2136,29 +2136,29 @@ void tst_QOrganizerItemManager::signalEmission()
     }
 }
 
-void tst_QOrganizerItemManager::errorStayingPut()
+void tst_QOrganizerManager::errorStayingPut()
 {
     /* Make sure that when we clone a manager, we don't clone the error */
     QMap<QString, QString> params;
     params.insert("id", "error isolation test");
-    QOrganizerItemManager m1("memory",params);
+    QOrganizerManager m1("memory",params);
 
-    QVERIFY(m1.error() == QOrganizerItemManager::NoError);
+    QVERIFY(m1.error() == QOrganizerManager::NoError);
 
     /* Remove an invalid item to get an error */
     QVERIFY(m1.removeItem(QOrganizerItemLocalId()) == false);
-    QVERIFY(m1.error() == QOrganizerItemManager::DoesNotExistError);
+    QVERIFY(m1.error() == QOrganizerManager::DoesNotExistError);
 
     /* Create a new manager with hopefully the same backend */
-    QOrganizerItemManager m2("memory", params);
+    QOrganizerManager m2("memory", params);
 
-    QVERIFY(m1.error() == QOrganizerItemManager::DoesNotExistError);
-    QVERIFY(m2.error() == QOrganizerItemManager::NoError);
+    QVERIFY(m1.error() == QOrganizerManager::DoesNotExistError);
+    QVERIFY(m2.error() == QOrganizerManager::NoError);
 
     /* Cause an error on the other ones and check the first is not affected */
     m2.saveItems(0);
-    QVERIFY(m1.error() == QOrganizerItemManager::DoesNotExistError);
-    QVERIFY(m2.error() == QOrganizerItemManager::BadArgumentError);
+    QVERIFY(m1.error() == QOrganizerManager::DoesNotExistError);
+    QVERIFY(m2.error() == QOrganizerManager::BadArgumentError);
 
     QOrganizerItem c;
     QOrganizerItemDetail d("This does not exist and if it does this will break");
@@ -2166,14 +2166,14 @@ void tst_QOrganizerItemManager::errorStayingPut()
     c.saveDetail(&d);
 
     QVERIFY(m1.saveItem(&c) == false);
-    QVERIFY(m1.error() == QOrganizerItemManager::InvalidDetailError);
-    QVERIFY(m2.error() == QOrganizerItemManager::BadArgumentError);
+    QVERIFY(m1.error() == QOrganizerManager::InvalidDetailError);
+    QVERIFY(m2.error() == QOrganizerManager::BadArgumentError);
 }
 
-void tst_QOrganizerItemManager::detailDefinitions()
+void tst_QOrganizerManager::detailDefinitions()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
     QMap<QString, QOrganizerItemDetailDefinition> defs = cm->detailDefinitions(QOrganizerItemType::TypeEvent);
     QVERIFY(defs.size() > 0);
 
@@ -2297,43 +2297,43 @@ void tst_QOrganizerItemManager::detailDefinitions()
 
     /* XXX Multiply defined fields.. depends on semantichangeSet. */
 
-    if (cm->hasFeature(QOrganizerItemManager::MutableDefinitions)) {
+    if (cm->hasFeature(QOrganizerManager::MutableDefinitions)) {
         /* First do some negative testing */
 
         /* Bad add class */
         QVERIFY(cm->saveDetailDefinition(QOrganizerItemDetailDefinition(), QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+        QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
 
         /* Bad remove string */
         QVERIFY(cm->removeDetailDefinition(QString(), QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+        QVERIFY(cQOrganizerManagerzerItemManager::BadArgumentError);
 
         QVERIFY(cm->saveDetailDefinition(noIdDef, QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+        QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
 
         QVERIFY(cm->saveDetailDefinition(noFieldsDef, QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+        QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
 
         QVERIFY(cm->saveDetailDefinition(invalidFieldKeyDef, QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+        QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
 
         // the manager can no longer report supportedDataTypes(), so the default validateDefinition() function passes.
         //QVERIFY(cm->saveDetailDefinition(invalidFieldTypeDef, QOrganizerItemType::TypeEvent) == false);
-        //QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+        //QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
 
         QVERIFY(cm->saveDetailDefinition(invalidAllowedValuesDef, QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::BadArgumentError);
+        QVERIFY(cm->error() == QOrganizerManager::BadArgumentError);
 
         /* Check that our new definition doesn't already exist */
         QVERIFY(cm->detailDefinition(newDef.name(),QOrganizerItemType::TypeEvent).isEmpty());
-        QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+        QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
 
         QVERIFY(cm->removeDetailDefinition(newDef.name(), QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+        QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
 
         /* Add a new definition */
         QVERIFY(cm->saveDetailDefinition(newDef, QOrganizerItemType::TypeEvent) == true);
-        QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+        QVERIFY(cm->error() == QOrganizerManager::NoError);
 
         /* Now retrieve it */
         QOrganizerItemDetailDefinition def = cm->detailDefinition(newDef.name(), QOrganizerItemType::TypeEvent);
@@ -2345,49 +2345,49 @@ void tst_QOrganizerItemManager::detailDefinitions()
         newDef.setFields(newFields);
 
         QVERIFY(cm->saveDetailDefinition(newDef, QOrganizerItemType::TypeEvent) == true);
-        QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+        QVERIFY(cm->error() == QOrganizerManager::NoError);
 
         QVERIFY(cm->detailDefinition(newDef.name(), QOrganizerItemType::TypeEvent) == newDef);
 
         /* Remove it */
         QVERIFY(cm->removeDetailDefinition(newDef.name(), QOrganizerItemType::TypeEvent) == true);
-        QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+        QVERIFY(cm->error() == QOrganizerManager::NoError);
 
         /* and make sure it does not exist any more */
         QVERIFY(cm->detailDefinition(newDef.name(), QOrganizerItemType::TypeEvent) == QOrganizerItemDetailDefinition());
-        QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+        QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
 
         /* Add the other good one */
         QVERIFY(cm->saveDetailDefinition(allowedDef, QOrganizerItemType::TypeEvent) == true);
-        QVERIFY(cm->error() == QOrganizerItemManager::NoError);
+        QVERIFY(cm->error() == QOrganizerManager::NoError);
 
         QVERIFY(allowedDef == cm->detailDefinition(allowedDef.name(), QOrganizerItemType::TypeEvent));
 
         /* and remove it */
         QVERIFY(cm->removeDetailDefinition(allowedDef.name(), QOrganizerItemType::TypeEvent) == true);
         QVERIFY(cm->detailDefinition(allowedDef.name(), QOrganizerItemType::TypeEvent) == QOrganizerItemDetailDefinition());
-        QVERIFY(cm->error() == QOrganizerItemManager::DoesNotExistError);
+        QVERIFY(cm->error() == QOrganizerManager::DoesNotExistError);
 
     } else {
         /* Bad add class */
         QVERIFY(cm->saveDetailDefinition(QOrganizerItemDetailDefinition(), QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::NotSupportedError);
+        QVERIFY(cm->error() == QOrganizerManager::NotSupportedError);
 
         /* Make sure we can't add/remove/modify detail definitions */
         QVERIFY(cm->removeDetailDefinition(QString(), QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::NotSupportedError);
+        QVERIFY(cm->error() == QOrganizerManager::NotSupportedError);
 
         /* Try updating an existing definition */
         QVERIFY(cm->saveDetailDefinition(updatedDef, QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::NotSupportedError);
+        QVERIFY(cm->error() == QOrganizerManager::NotSupportedError);
 
         /* Try removing an existing definition */
         QVERIFY(cm->removeDetailDefinition(updatedDef.name(), QOrganizerItemType::TypeEvent) == false);
-        QVERIFY(cm->error() == QOrganizerItemManager::NotSupportedError);
+        QVERIFY(cm->error() == QOrganizerManager::NotSupportedError);
     }
 }
 
-void tst_QOrganizerItemManager::changeSet()
+void tst_QOrganizerManager::changeSet()
 {
     QOrganizerItemLocalId id;
 
@@ -2442,17 +2442,17 @@ void tst_QOrganizerItemManager::changeSet()
     changeSet.emitSignals(0);
 }
 
-void tst_QOrganizerItemManager::fetchHint()
+void tst_QOrganizerManager::fetchHint()
 {
     QOrganizerItemFetchHint hint;
     hint.setOptimizationHints(QOrganizerItemFetchHint::NoBinaryBlobs);
     QCOMPARE(hint.optimizationHints(), QOrganizerItemFetchHint::NoBinaryBlobs);
 }
 
-void tst_QOrganizerItemManager::dataSerialization()
+void tst_QOrganizerManager::dataSerialization()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
     QOrganizerEvent event;
     event.setDisplayLabel("event");
@@ -2472,10 +2472,10 @@ void tst_QOrganizerItemManager::dataSerialization()
     }
 }
 
-void tst_QOrganizerItemManager::itemFetch()
+void tst_QOrganizerManager::itemFetch()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
     QOrganizerEvent event;
     event.setDisplayLabel("event");
@@ -2486,8 +2486,8 @@ void tst_QOrganizerItemManager::itemFetch()
     QOrganizerEvent recEvent;
     recEvent.setDisplayLabel("daily event");
     recEvent.setStartDateTime(QDateTime(QDate(2010, 9, 1), QTime(16, 0, 0)));
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrule.setLimit(QDate(2010, 9, 10));
     recEvent.setRecurrenceRule(rrule);
     QVERIFY(cm->saveItem(&recEvent));
@@ -2503,10 +2503,10 @@ void tst_QOrganizerItemManager::itemFetch()
     QCOMPARE(items.count(), 2);
 }
 
-void tst_QOrganizerItemManager::spanOverDays()
+void tst_QOrganizerManager::spanOverDays()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
     QOrganizerEvent event;
     event.setDisplayLabel("event");
@@ -2540,17 +2540,17 @@ void tst_QOrganizerItemManager::spanOverDays()
     QCOMPARE(items.count(), 1);
 }
 
-void tst_QOrganizerItemManager::recurrence()
+void tst_QOrganizerManager::recurrence()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
 
     QOrganizerEvent event;
     event.setDisplayLabel("event");
     event.setStartDateTime(QDateTime(QDate(2012, 8, 9), QTime(11, 0, 0)));
     event.setEndDateTime(QDateTime(QDate(2012, 8, 9), QTime(11, 30, 0)));
-    QOrganizerItemRecurrenceRule rrule;
-    rrule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+    QOrganizerRecurrenceRule rrule;
+    rrule.setFrequency(QOrganizerRecurrenceRule::Daily);
     rrule.setLimit(3);
     event.setRecurrenceRule(rrule);
     QVERIFY(cm->saveItem(&event));
@@ -2571,7 +2571,7 @@ void tst_QOrganizerItemManager::recurrence()
 
 
 
-QList<QOrganizerItemDetail> tst_QOrganizerItemManager::removeAllDefaultDetails(const QList<QOrganizerItemDetail>& details)
+QList<QOrganizerItemDetail> tst_QOrganizerManager::removeAllDefaultDetails(const QList<QOrganizerItemDetail>& details)
 {
     QList<QOrganizerItemDetail> newlist;
     foreach (const QOrganizerItemDetail d, details) {
@@ -2584,10 +2584,10 @@ QList<QOrganizerItemDetail> tst_QOrganizerItemManager::removeAllDefaultDetails(c
     return newlist;
 }
 
-void tst_QOrganizerItemManager::detailOrders()
+void tst_QOrganizerManager::detailOrders()
 {
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> cm(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> cm(QOrganizerManager::fromUri(uri));
     
     if (cm->managerName() == "symbian")
         QSKIP("symbian manager does not support detail ordering", SkipSingle);
@@ -2656,20 +2656,20 @@ void tst_QOrganizerItemManager::detailOrders()
 }
 
 
-void tst_QOrganizerItemManager::itemType()
+void tst_QOrganizerManager::itemType()
 {
     // XXX TODO!
 }
 
 
-void tst_QOrganizerItemManager::collections()
+void tst_QOrganizerManager::collections()
 {
     // XXX TODO: break test into smaller sub-tests (per operation).
 
     QFETCH(QString, uri);
-    QScopedPointer<QOrganizerItemManager> oim(QOrganizerItemManager::fromUri(uri));
+    QScopedPointer<QOrganizerManager> oim(QOrganizerManager::fromUri(uri));
 
-    //if (!oim->hasFeature(QOrganizerItemManager::MutableCollections)) {
+    //if (!oim->hasFeature(QOrganizerManager::MutableCollections)) {
     //    QSKIP("This manager does not support mutable collections!", SkipSingle);
     //}
 
@@ -2781,5 +2781,5 @@ void tst_QOrganizerItemManager::collections()
     }
 }
 
-QTEST_MAIN(tst_QOrganizerItemManager)
-#include "tst_qorganizeritemmanager.moc"
+QTEST_MAIN(tst_QOrganizerManager)
+#include "tst_qorganizermanager.moc"
diff --git a/tests/auto/qorganizeritemmanagerdataholder.h b/tests/auto/qorganizeritemmanagerdataholder.h
index 099c71f2b4..645f6b109d 100644
--- a/tests/auto/qorganizeritemmanagerdataholder.h
+++ b/tests/auto/qorganizeritemmanagerdataholder.h
@@ -49,7 +49,7 @@
 #include <QString>
 #include <QDebug>
 
-#include "qorganizeritemmanager.h"
+#include "qorganizermanager.h"
 
 //
 //  W A R N I N G
@@ -64,20 +64,20 @@
 
 QTM_BEGIN_NAMESPACE
 class QOrganizerItem;
-class QOrganizerItemManagerDataHolder
+class QOrganizerManagerDataHolder
 {
 public:
-    QOrganizerItemManagerDataHolder()
+    QOrganizerManagerDataHolder()
     {
-        QStringList managerNames = QOrganizerItemManager::availableManagers();
+        QStringList managerNames = QOrganizerManager::availableManagers();
 
         foreach(const QString& mgr, managerNames) {
             // Don't bother with these
             if (mgr == "memory" || mgr == "invalid" || mgr == "testdummy" || mgr == "maliciousplugin")
                 continue;
             QMap<QString, QString> params;
-            QString mgrUri = QOrganizerItemManager::buildUri(mgr, params);
-            QOrganizerItemManager* cm = QOrganizerItemManager::fromUri(mgrUri);
+            QString mgrUri = QOrganizerManager::buildUri(mgr, params);
+            QOrganizerManager* cm = QOrganizerManager::fromUri(mgrUri);
             if (cm) {
                 qDebug() << "Saving items for" << mgrUri;
                 QList<QOrganizerItem> items = cm->items();
@@ -91,10 +91,10 @@ public:
         }
     }
 
-    ~QOrganizerItemManagerDataHolder()
+    ~QOrganizerManagerDataHolder()
     {
         foreach(const QString& mgrUri, savedItems.keys()) {
-            QOrganizerItemManager* cm = QOrganizerItemManager::fromUri(mgrUri);
+            QOrganizerManager* cm = QOrganizerManager::fromUri(mgrUri);
             if (cm) {
                 qDebug() << "Restoring items for" << mgrUri;
                 QList<QOrganizerItem> items = savedItems.value(mgrUri);
diff --git a/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp b/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp
index f5005fc2a1..99a3e5e69e 100644
--- a/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp
+++ b/tests/auto/qversitorganizerexporter/tst_qversitorganizerexporter.cpp
@@ -288,7 +288,7 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         dtend.setName(QLatin1String("DTEND"));
         dtend.setValue(QLatin1String("20100102T030406"));
         properties << dtend;
-        QOrganizerEventTimeRange etr;
+        QOrganizerEventTime etr;
         etr.setStartDateTime(QDateTime(QDate(2010, 1, 2), QTime(3, 4, 5)));
         etr.setEndDateTime(QDateTime(QDate(2010, 1, 2), QTime(3, 4, 6)));
         QTest::newRow("dtstart and dtend") << (QList<QOrganizerItemDetail>() << etr)
@@ -321,39 +321,39 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=DAILY"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule daily")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
 
         rrule.setValue(QLatin1String("FREQ=WEEKLY"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Weekly);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule weekly")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
 
         rrule.setValue(QLatin1String("FREQ=MONTHLY"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule monthly")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
 
         rrule.setValue(QLatin1String("FREQ=YEARLY"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule yearly")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
 
         rrule.setValue(QLatin1String("FREQ=MONTHLY;INTERVAL=2;BYDAY=TU"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         recurrenceRule.setInterval(2);
         recurrenceRule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Tuesday);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule monthly")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -365,10 +365,10 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=MONTHLY;BYMONTHDAY=-3,1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         recurrenceRule.setDaysOfMonth(QSet<int>() << 1 << -3);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule bymonthday")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -380,10 +380,10 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=YEARLY;BYWEEKNO=-3,1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
         recurrenceRule.setWeeksOfYear(QSet<int>() << 1 << -3);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule byweekno")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -395,12 +395,12 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=YEARLY;BYMONTH=1,10"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-        recurrenceRule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                << QOrganizerItemRecurrenceRule::January
-                << QOrganizerItemRecurrenceRule::October);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+        recurrenceRule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                << QOrganizerRecurrenceRule::January
+                << QOrganizerRecurrenceRule::October);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule bymonth")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -412,10 +412,10 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=YEARLY;BYYEARDAY=-1,1,366"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
         recurrenceRule.setDaysOfYear(QSet<int>() << 1 << 366 << -1);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule byyearday")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -427,13 +427,13 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,SU;WKST=SU"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Weekly);
         recurrenceRule.setInterval(2);
         recurrenceRule.setLimit(4);
         recurrenceRule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Tuesday << Qt::Sunday);
         recurrenceRule.setFirstDayOfWeek(Qt::Sunday);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule wkst")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -445,12 +445,12 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         recurrenceRule.setDaysOfWeek(QSet<Qt::DayOfWeek>()
                 << Qt::Monday << Qt::Tuesday << Qt::Wednesday << Qt::Thursday << Qt::Friday);
         recurrenceRule.setPositions(QSet<int>() << -1);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule bysetpos")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -462,12 +462,12 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=DAILY;UNTIL=20000131;BYMONTH=1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
         recurrenceRule.setLimit(QDate(2000, 1, 31));
-        recurrenceRule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                << QOrganizerItemRecurrenceRule::January);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                << QOrganizerRecurrenceRule::January);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule until")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -479,12 +479,12 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=DAILY;COUNT=5;BYMONTH=1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
         recurrenceRule.setLimit(5);
-        recurrenceRule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                << QOrganizerItemRecurrenceRule::January);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                << QOrganizerRecurrenceRule::January);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule count")
             << (QList<QOrganizerItemDetail>() << recurrence)
             << (QList<QVersitProperty>() << rrule);
@@ -495,7 +495,7 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rdate.insertParameter(QLatin1String("VALUE"), QLatin1String("DATE"));
         rdate.setName(QLatin1String("RDATE"));
         rdate.setValue(QLatin1String("19970304"));
-        QOrganizerEventTimeRange etr;
+        QOrganizerEventTime etr;
         etr.setStartDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         etr.setEndDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         QOrganizerItemRecurrence recurrence;
@@ -522,7 +522,7 @@ void tst_QVersitOrganizerExporter::testExportEventDetails_data()
         rdate.insertParameter(QLatin1String("VALUE"), QLatin1String("DATE"));
         rdate.setName(QLatin1String("EXDATE"));
         rdate.setValue(QLatin1String("19970304"));
-        QOrganizerEventTimeRange etr;
+        QOrganizerEventTime etr;
         etr.setStartDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         etr.setEndDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         QOrganizerItemRecurrence recurrence;
diff --git a/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp b/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
index a93bed20af..52124e7398 100644
--- a/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
+++ b/tests/auto/qversitorganizerimporter/tst_qversitorganizerimporter.cpp
@@ -174,9 +174,9 @@ void tst_QVersitOrganizerImporter::testImport_data()
         document.addSubDocument(nested);
 
         QOrganizerTodo todo;
-        QOrganizerItemRecurrenceRule rrule;
-        rrule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
-        todo.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << rrule);
+        QOrganizerRecurrenceRule rrule;
+        rrule.setFrequency(QOrganizerRecurrenceRule::Weekly);
+        todo.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << rrule);
 
         QList<QOrganizerItem> items;
         items << static_cast<QOrganizerItem>(todo);
@@ -277,7 +277,7 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         dtend.setName(QLatin1String("DTEND"));
         dtend.setValue(QLatin1String("20100102T030406"));
         properties << dtend;
-        QOrganizerEventTimeRange etr;
+        QOrganizerEventTime etr;
         etr.setStartDateTime(QDateTime(QDate(2010, 1, 2), QTime(3, 4, 5)));
         etr.setEndDateTime(QDateTime(QDate(2010, 1, 2), QTime(3, 4, 6)));
         QTest::newRow("dtstart and dtend") << properties
@@ -297,7 +297,7 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         QVersitProperty duration;
         duration.setName(QLatin1String("DURATION"));
         duration.setValue(QLatin1String("P15DT5H7M20S"));
-        QOrganizerEventTimeRange etr;
+        QOrganizerEventTime etr;
         etr.setStartDateTime(QDateTime(QDate(2009, 12, 31), QTime(0, 0, 0)));
         etr.setEndDateTime(QDateTime(QDate(2010, 1, 15), QTime(5, 7, 20)));
         QTest::newRow("dtstart and duration: days hours minutes seconds")
@@ -380,39 +380,39 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=DAILY"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule daily")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
 
         rrule.setValue(QLatin1String("FREQ=WEEKLY"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Weekly);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule weekly")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
 
         rrule.setValue(QLatin1String("FREQ=MONTHLY"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule monthly")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
 
         rrule.setValue(QLatin1String("FREQ=YEARLY"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule yearly")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
 
         rrule.setValue(QLatin1String("FREQ=MONTHLY;INTERVAL=2;BYDAY=TU"));
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         recurrenceRule.setInterval(2);
         recurrenceRule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Tuesday);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule monthly")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -423,10 +423,10 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=MONTHLY;BYMONTHDAY=1,-3"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         recurrenceRule.setDaysOfMonth(QSet<int>() << 1 << -3);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule bymonthday")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -437,10 +437,10 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=YEARLY;BYWEEKNO=1,-3"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
         recurrenceRule.setWeeksOfYear(QSet<int>() << 1 << -3);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule byweekno")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -451,12 +451,12 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=YEARLY;BYMONTH=1,10"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-        recurrenceRule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                << QOrganizerItemRecurrenceRule::January
-                << QOrganizerItemRecurrenceRule::October);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+        recurrenceRule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                << QOrganizerRecurrenceRule::January
+                << QOrganizerRecurrenceRule::October);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule bymonth")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -467,10 +467,10 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=YEARLY;BYYEARDAY=1,366,-1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
         recurrenceRule.setDaysOfYear(QSet<int>() << 1 << 366 << -1);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule byyearday")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -481,13 +481,13 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,SU;WKST=SU"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Weekly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Weekly);
         recurrenceRule.setInterval(2);
         recurrenceRule.setLimit(4);
         recurrenceRule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Tuesday << Qt::Sunday);
         recurrenceRule.setFirstDayOfWeek(Qt::Sunday);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule wkst")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -498,12 +498,12 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=MONTHLY;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Monthly);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Monthly);
         recurrenceRule.setDaysOfWeek(QSet<Qt::DayOfWeek>()
                 << Qt::Monday << Qt::Tuesday << Qt::Wednesday << Qt::Thursday << Qt::Friday);
         recurrenceRule.setPositions(QSet<int>() << -1);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule bysetpos")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -514,13 +514,13 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=YEARLY;BYMONTH=4;BYDAY=1SU"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Yearly);
-        recurrenceRule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                << QOrganizerItemRecurrenceRule::April);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Yearly);
+        recurrenceRule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                << QOrganizerRecurrenceRule::April);
         recurrenceRule.setDaysOfWeek(QSet<Qt::DayOfWeek>() << Qt::Sunday);
         recurrenceRule.setPositions(QSet<int>() << 1);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule byday with position")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -531,12 +531,12 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=DAILY;UNTIL=20000131;BYMONTH=1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
         recurrenceRule.setLimit(QDate(2000, 1, 31));
-        recurrenceRule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                << QOrganizerItemRecurrenceRule::January);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                << QOrganizerRecurrenceRule::January);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule until")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -547,12 +547,12 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         rrule.setName(QLatin1String("RRULE"));
         rrule.setValue(QLatin1String("FREQ=DAILY;COUNT=5;BYMONTH=1"));
         QOrganizerItemRecurrence recurrence;
-        QOrganizerItemRecurrenceRule recurrenceRule;
-        recurrenceRule.setFrequency(QOrganizerItemRecurrenceRule::Daily);
+        QOrganizerRecurrenceRule recurrenceRule;
+        recurrenceRule.setFrequency(QOrganizerRecurrenceRule::Daily);
         recurrenceRule.setLimit(5);
-        recurrenceRule.setMonthsOfYear(QSet<QOrganizerItemRecurrenceRule::Month>()
-                << QOrganizerItemRecurrenceRule::January);
-        recurrence.setRecurrenceRules(QSet<QOrganizerItemRecurrenceRule>() << recurrenceRule);
+        recurrenceRule.setMonthsOfYear(QSet<QOrganizerRecurrenceRule::Month>()
+                << QOrganizerRecurrenceRule::January);
+        recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>() << recurrenceRule);
         QTest::newRow("rrule count")
             << (QList<QVersitProperty>() << rrule)
             << (QList<QOrganizerItemDetail>() << recurrence);
@@ -568,7 +568,7 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         QVersitProperty rdate;
         rdate.setName(QLatin1String("RDATE"));
         rdate.setValue(QLatin1String("19970304"));
-        QOrganizerEventTimeRange etr;
+        QOrganizerEventTime etr;
         etr.setStartDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         etr.setEndDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         QOrganizerItemRecurrence recurrence;
@@ -609,7 +609,7 @@ void tst_QVersitOrganizerImporter::testImportEventProperties_data()
         QVersitProperty rdate;
         rdate.setName(QLatin1String("EXDATE"));
         rdate.setValue(QLatin1String("19970304"));
-        QOrganizerEventTimeRange etr;
+        QOrganizerEventTime etr;
         etr.setStartDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         etr.setEndDateTime(QDateTime(QDate(1997, 3, 4), QTime(11, 0, 0)));
         QOrganizerItemRecurrence recurrence;