23 files changed, 150 insertions, 150 deletions

diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 57919ff..ce113c2 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -253,7 +253,7 @@ namespace DummyResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.dummy");
+        resource.setProperty("type", "sink.dummy");
         resource.setProperty("account", account);
         resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << "-folder.rename"));
         // resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
@@ -265,7 +265,7 @@ namespace MaildirResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.maildir");
+        resource.setProperty("type", "sink.maildir");
         resource.setProperty("account", account);
         resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << "-folder.rename" << ResourceCapabilities::Mail::trash));
         return resource;
@@ -276,7 +276,7 @@ namespace MailtransportResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.mailtransport");
+        resource.setProperty("type", "sink.mailtransport");
         resource.setProperty("account", account);
         resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::transport));
         return resource;
@@ -287,7 +287,7 @@ namespace ImapResource {
     SinkResource create(const QByteArray &account)
     {
         auto &&resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.imap");
+        resource.setProperty("type", "sink.imap");
         resource.setProperty("account", account);
         resource.setProperty("capabilities", QVariant::fromValue(QByteArrayList() << ResourceCapabilities::Mail::storage << ResourceCapabilities::Mail::drafts << ResourceCapabilities::Mail::folderhierarchy << ResourceCapabilities::Mail::trash));
         return resource;
diff --git a/common/resource.h b/common/resource.h
index d6c3c5f..1c35838 100644
--- a/common/resource.h
+++ b/common/resource.h
@@ -91,4 +91,4 @@ private:
 
 } // namespace Sink
 
-Q_DECLARE_INTERFACE(Sink::ResourceFactory, "org.kde.sink.resourcefactory")
+Q_DECLARE_INTERFACE(Sink::ResourceFactory, "sink.sink.resourcefactory")
diff --git a/docs/sinksh.md b/docs/sinksh.md
index 9884169..b04eb0c 100644
--- a/docs/sinksh.md
+++ b/docs/sinksh.md
@@ -33,22 +33,22 @@ Provides the same contents as "list" but in a graphical tree view. This was real
 # Setting up a new resource instance
 sink_cmd is already the primary way how you create resource instances:
 
-  `sinksh create resource org.kde.maildir path /home/developer/maildir1`
+  `sinksh create resource sink.maildir path /home/developer/maildir1`
 
-This creates a resource of type "org.kde.maildir" and a configuration of "path" with the value "home/developer/maildir1". Resources are stored in configuration files, so all this does is write to some config files.
+This creates a resource of type "sink.maildir" and a configuration of "path" with the value "home/developer/maildir1". Resources are stored in configuration files, so all this does is write to some config files.
 
   `sinksh list resource`
 
 By listing all available resources we can find the identifier of the resource that was automatically assigned.
 
-  `sinksh synchronize org.kde.maildir.instance1`
+  `sinksh synchronize sink.maildir.instance1`
 
 This triggers the actual synchronization in the resource, and from there on the data is available.
 
-  `sinksh list folder org.kde.maildir.instance1`
+  `sinksh list folder sink.maildir.instance1`
 
 This will get you all folders that are in the resource.
 
-  `sinksh remove resource org.kde.maildir.instance1`
+  `sinksh remove resource sink.maildir.instance1`
 
 And this will finally remove all traces of the resource instance.
diff --git a/examples/client/main.cpp b/examples/client/main.cpp
index 07e780e..f4b472f 100644
--- a/examples/client/main.cpp
+++ b/examples/client/main.cpp
@@ -120,7 +120,7 @@ public:
         syncButton->setText("Synchronize!");
         QObject::connect(syncButton, &QPushButton::pressed, []() {
             Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
             Sink::Store::synchronize(query).exec();
         });
 
diff --git a/examples/dummyresource/resourcefactory.h b/examples/dummyresource/resourcefactory.h
index a7d0281..9192c68 100644
--- a/examples/dummyresource/resourcefactory.h
+++ b/examples/dummyresource/resourcefactory.h
@@ -27,7 +27,7 @@
 #include <flatbuffers/flatbuffers.h>
 
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.dummy"
+#define PLUGIN_NAME "sink.dummy"
 
 class DummyResource : public Sink::GenericResource
 {
@@ -42,7 +42,7 @@ public:
 class DummyResourceFactory : public Sink::ResourceFactory
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.dummy")
+    Q_PLUGIN_METADATA(IID "sink.dummy")
     Q_INTERFACES(Sink::ResourceFactory)
 
 public:
diff --git a/examples/imapresource/imapresource.h b/examples/imapresource/imapresource.h
index 0c3b541..534a04e 100644
--- a/examples/imapresource/imapresource.h
+++ b/examples/imapresource/imapresource.h
@@ -26,7 +26,7 @@
 #include <flatbuffers/flatbuffers.h>
 
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.imap"
+#define PLUGIN_NAME "sink.imap"
 
 class ImapMailAdaptorFactory;
 class ImapFolderAdaptorFactory;
@@ -56,7 +56,7 @@ private:
 class ImapResourceFactory : public Sink::ResourceFactory
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.imap")
+    Q_PLUGIN_METADATA(IID "sink.imap")
     Q_INTERFACES(Sink::ResourceFactory)
 
 public:
diff --git a/examples/maildirresource/maildirresource.h b/examples/maildirresource/maildirresource.h
index d481b22..76aef77 100644
--- a/examples/maildirresource/maildirresource.h
+++ b/examples/maildirresource/maildirresource.h
@@ -26,7 +26,7 @@
 #include <flatbuffers/flatbuffers.h>
 
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.maildir"
+#define PLUGIN_NAME "sink.maildir"
 
 class MaildirMailAdaptorFactory;
 class MaildirFolderAdaptorFactory;
@@ -58,7 +58,7 @@ private:
 class MaildirResourceFactory : public Sink::ResourceFactory
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.maildir")
+    Q_PLUGIN_METADATA(IID "sink.maildir")
     Q_INTERFACES(Sink::ResourceFactory)
 
 public:
diff --git a/examples/mailtransportresource/mailtransportresource.h b/examples/mailtransportresource/mailtransportresource.h
index 6622ea6..cf6abf2 100644
--- a/examples/mailtransportresource/mailtransportresource.h
+++ b/examples/mailtransportresource/mailtransportresource.h
@@ -23,7 +23,7 @@
 #include "common/genericresource.h"
 
 //TODO: a little ugly to have this in two places, once here and once in Q_PLUGIN_METADATA
-#define PLUGIN_NAME "org.kde.mailtransport"
+#define PLUGIN_NAME "sink.mailtransport"
 
 class MailtransportResource : public Sink::GenericResource
 {
@@ -46,7 +46,7 @@ private:
 class MailtransportResourceFactory : public Sink::ResourceFactory
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.kde.mailtransport")
+    Q_PLUGIN_METADATA(IID "sink.mailtransport")
     Q_INTERFACES(Sink::ResourceFactory)
 
 public:
diff --git a/tests/accountstest.cpp b/tests/accountstest.cpp
index d12e7f4..8d0f2e6 100644
--- a/tests/accountstest.cpp
+++ b/tests/accountstest.cpp
@@ -51,7 +51,7 @@ private slots:
         QString smtpUsername("smtpUsername");
         QString smtpPassword("smtpPassword");
         auto resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setProperty("type", "org.kde.mailtransport");
+        resource.setProperty("type", "sink.mailtransport");
         resource.setProperty("account", account.identifier());
         resource.setProperty("server", smtpServer);
         resource.setProperty("username", smtpUsername);
@@ -62,7 +62,7 @@ private slots:
         Store::fetchAll<SinkResource>(Query()).then<void, QList<SinkResource::Ptr>>([&](const QList<SinkResource::Ptr> &resources) {
             QCOMPARE(resources.size(), 1);
             auto resource = resources.first();
-            QCOMPARE(resource->getProperty("type").toString(), QString("org.kde.mailtransport"));
+            QCOMPARE(resource->getProperty("type").toString(), QString("sink.mailtransport"));
             QCOMPARE(resource->getProperty("server").toString(), smtpServer);
         })
         .exec().waitForFinished();
@@ -110,7 +110,7 @@ private slots:
 
         //Ensure the notifier only affects one type
         auto resource = ApplicationDomainType::createEntity<SinkResource>();
-        resource.setResourceType("org.kde.mailtransport");
+        resource.setResourceType("sink.mailtransport");
         Store::create(resource).exec().waitForFinished();
         QTRY_COMPARE(model->rowCount(QModelIndex()), 2);
     }
diff --git a/tests/dummyresourcebenchmark.cpp b/tests/dummyresourcebenchmark.cpp
index 7e334a6..72562c3 100644
--- a/tests/dummyresourcebenchmark.cpp
+++ b/tests/dummyresourcebenchmark.cpp
@@ -34,9 +34,9 @@ private slots:
     void initTestCase()
     {
         Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
         QVERIFY(factory);
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
         num = 5000;
     }
 
@@ -76,17 +76,17 @@ private slots:
     void testCommandResponsiveness()
     {
         // Test responsiveness including starting the process.
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
 
         QTime time;
         time.start();
 
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
 
-        auto notifier = QSharedPointer<Sink::Notifier>::create("org.kde.dummy.instance1", "org.kde.dummy");
+        auto notifier = QSharedPointer<Sink::Notifier>::create("sink.dummy.instance1", "sink.dummy");
         bool gotNotification = false;
         int duration = 0;
         notifier->registerHandler([&gotNotification, &duration, &time](const Sink::Notification &notification) {
@@ -102,19 +102,19 @@ private slots:
         QTRY_VERIFY(gotNotification);
 
         QVERIFY2(duration < 100, QString::fromLatin1("Processing a create command took more than 100ms: %1").arg(duration).toLatin1());
-        Sink::ResourceControl::shutdown("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::ResourceControl::shutdown("sink.dummy.instance1").exec().waitForFinished();
         qDebug() << "Single command took [ms]: " << duration;
     }
 
     void testWriteToFacade()
     {
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
 
         QTime time;
         time.start();
         QList<KAsync::Future<void>> waitCondition;
         for (int i = 0; i < num; i++) {
-            Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Event event("sink.dummy.instance1");
             event.setProperty("uid", "testuid");
             QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
             event.setProperty("summary", "summaryValue");
@@ -126,7 +126,7 @@ private slots:
         // Ensure everything is processed
         {
             Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
             Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
         }
         auto allProcessedTime = time.elapsed();
@@ -140,7 +140,7 @@ private slots:
         dataset.insertRow(row);
         HAWD::Formatter::print(dataset);
 
-        auto diskUsage = DummyResource::diskUsage("org.kde.dummy.instance1");
+        auto diskUsage = DummyResource::diskUsage("sink.dummy.instance1");
         qDebug() << "Database size [kb]: " << diskUsage / 1024;
 
         // Print memory layout, RSS is what is in memory
@@ -155,7 +155,7 @@ private slots:
         {
             time.start();
             Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
 
             query.propertyFilter.insert("uid", Sink::Query::Comparator("testuid"));
             auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
@@ -173,12 +173,12 @@ private slots:
 
     void testWriteInProcess()
     {
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
         QTime time;
         time.start();
 
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.dummy.instance1");
-        DummyResource resource("org.kde.dummy.instance1", pipeline);
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.dummy.instance1");
+        DummyResource resource("sink.dummy.instance1", pipeline);
 
         flatbuffers::FlatBufferBuilder eventFbb;
         eventFbb.Clear();
@@ -261,7 +261,7 @@ private slots:
     // This allows to run individual parts without doing a cleanup, but still cleaning up normally
     void testCleanupForCompleteTest()
     {
-        Sink::Store::removeDataFromDisk("org.kde.dummy.instance1").exec().waitForFinished();
+        Sink::Store::removeDataFromDisk("sink.dummy.instance1").exec().waitForFinished();
     }
 
 private:
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index 0907b1d..687a33b 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -30,10 +30,10 @@ private slots:
     void initTestCase()
     {
         Sink::Test::initTest();
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
         QVERIFY(factory);
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
+        DummyResource::removeFromDisk("sink.dummy.instance1");
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
     }
 
     void init()
@@ -47,7 +47,7 @@ private slots:
     void cleanup()
     {
         qDebug() << "Test took " << time.elapsed();
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
     }
 
     void testProperty()
@@ -59,13 +59,13 @@ private slots:
 
     void testWriteToFacadeAndQueryByUid()
     {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") ;
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -78,7 +78,7 @@ private slots:
 
     void testWriteToFacadeAndQueryByUid2()
     {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
         event.setProperty("summary", "summaryValue");
 
         event.setProperty("uid", "testuid");
@@ -87,7 +87,7 @@ private slots:
         event.setProperty("uid", "testuid2");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") ;
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -102,7 +102,7 @@ private slots:
 
     void testWriteToFacadeAndQueryBySummary()
     {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
 
         event.setProperty("uid", "testuid");
         event.setProperty("summary", "summaryValue1");
@@ -112,7 +112,7 @@ private slots:
         event.setProperty("summary", "summaryValue2");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") ;
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") ;
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -127,8 +127,8 @@ private slots:
 
     void testResourceSync()
     {
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.dummy.instance1");
-        DummyResource resource("org.kde.dummy.instance1", pipeline);
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.dummy.instance1");
+        DummyResource resource("sink.dummy.instance1", pipeline);
         auto job = resource.synchronizeWithSource();
         // TODO pass in optional timeout?
         auto future = job.exec();
@@ -142,7 +142,7 @@ private slots:
 
     void testSyncAndFacade()
     {
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1");
+        const auto query = Query::ResourceFilter("sink.dummy.instance1");
 
         // Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
@@ -158,7 +158,7 @@ private slots:
 
     void testSyncAndFacadeMail()
     {
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1");
+        const auto query = Query::ResourceFilter("sink.dummy.instance1");
 
         // Ensure all local data is processed
         Sink::Store::synchronize(query).exec().waitForFinished();
@@ -174,13 +174,13 @@ private slots:
 
     void testWriteModifyDelete()
     {
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
         Sink::Store::create<Sink::ApplicationDomain::Event>(event).exec().waitForFinished();
 
-        const auto query = Query::ResourceFilter("org.kde.dummy.instance1") + Query::PropertyFilter("uid", "testuid");
+        const auto query = Query::ResourceFilter("sink.dummy.instance1") + Query::PropertyFilter("uid", "testuid");
 
         // Ensure all local data is processed
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -229,14 +229,14 @@ private slots:
 
     void testWriteModifyDeleteLive()
     {
-        auto query = Query::ResourceFilter("org.kde.dummy.instance1");
+        auto query = Query::ResourceFilter("sink.dummy.instance1");
         query.liveQuery = true;
         query += Query::PropertyFilter("uid", "testuid");
 
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Event>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
 
-        Sink::ApplicationDomain::Event event("org.kde.dummy.instance1");
+        Sink::ApplicationDomain::Event event("sink.dummy.instance1");
         event.setProperty("uid", "testuid");
         QCOMPARE(event.getProperty("uid").toByteArray(), QByteArray("testuid"));
         event.setProperty("summary", "summaryValue");
diff --git a/tests/dummyresourcewritebenchmark.cpp b/tests/dummyresourcewritebenchmark.cpp
index b4ab438..5cd7007 100644
--- a/tests/dummyresourcewritebenchmark.cpp
+++ b/tests/dummyresourcewritebenchmark.cpp
@@ -103,14 +103,14 @@ class DummyResourceWriteBenchmark : public QObject
 
     void writeInProcess(int num)
     {
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+        DummyResource::removeFromDisk("sink.dummy.instance1");
 
 
         QTime time;
         time.start();
 
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.dummy.instance1");
-        DummyResource resource("org.kde.dummy.instance1", pipeline);
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.dummy.instance1");
+        DummyResource resource("sink.dummy.instance1", pipeline);
 
         int bufferSize = 0;
         auto command = createEntityBuffer(bufferSize);
@@ -131,7 +131,7 @@ class DummyResourceWriteBenchmark : public QObject
         const auto finalRss = getCurrentRSS();
         const auto rssGrowth = finalRss - startingRss;
         // Since the database is memory mapped it is attributted to the resident set size.
-        const auto rssWithoutDb = finalRss - DummyResource::diskUsage("org.kde.dummy.instance1");
+        const auto rssWithoutDb = finalRss - DummyResource::diskUsage("sink.dummy.instance1");
         const auto peakRss = getPeakRSS();
         // How much peak deviates from final rss in percent
         const auto percentageRssError = static_cast<double>(peakRss - finalRss) * 100.0 / static_cast<double>(finalRss);
@@ -143,7 +143,7 @@ class DummyResourceWriteBenchmark : public QObject
         std::cout << "Rss without db [kb]: " << rssWithoutDb / 1024 << std::endl;
         std::cout << "Percentage peak rss error: " << percentageRssError << std::endl;
 
-        auto onDisk = DummyResource::diskUsage("org.kde.dummy.instance1");
+        auto onDisk = DummyResource::diskUsage("sink.dummy.instance1");
         auto writeAmplification = static_cast<double>(onDisk) / static_cast<double>(bufferSizeTotal);
         std::cout << "On disk [kb]: " << onDisk / 1024 << std::endl;
         std::cout << "Buffer size total [kb]: " << bufferSizeTotal / 1024 << std::endl;
@@ -216,13 +216,13 @@ private slots:
 
     void getFreePages()
     {
-        std::system(QString("mdb_stat %1/%2 -ff").arg(Sink::storageLocation()).arg("org.kde.dummy.instance1").toLatin1().constData());
+        std::system(QString("mdb_stat %1/%2 -ff").arg(Sink::storageLocation()).arg("sink.dummy.instance1").toLatin1().constData());
     }
 
     // This allows to run individual parts without doing a cleanup, but still cleaning up normally
     void testCleanupForCompleteTest()
     {
-        DummyResource::removeFromDisk("org.kde.dummy.instance1");
+        DummyResource::removeFromDisk("sink.dummy.instance1");
     }
 
 private:
diff --git a/tests/genericresourcebenchmark.cpp b/tests/genericresourcebenchmark.cpp
index a0a368c..2315d0b 100644
--- a/tests/genericresourcebenchmark.cpp
+++ b/tests/genericresourcebenchmark.cpp
@@ -96,9 +96,9 @@ private slots:
 
     void initTestCase()
     {
-        removeFromDisk("org.kde.test.instance1");
-        removeFromDisk("org.kde.test.instance1.userqueue");
-        removeFromDisk("org.kde.test.instance1.synchronizerqueue");
+        removeFromDisk("sink.test.instance1");
+        removeFromDisk("sink.test.instance1.userqueue");
+        removeFromDisk("sink.test.instance1.synchronizerqueue");
     }
 
 
@@ -106,8 +106,8 @@ private slots:
     {
         int num = 10000;
 
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.test.instance1");
-        TestResource resource("org.kde.test.instance1", pipeline);
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
+        TestResource resource("sink.test.instance1", pipeline);
 
         auto command = createEntityBuffer();
 
@@ -141,16 +141,16 @@ private slots:
     {
         int num = 50000;
 
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.test.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
 
         auto eventFactory = QSharedPointer<TestEventAdaptorFactory>::create();
-        const QByteArray resourceIdentifier = "org.kde.test.instance1";
+        const QByteArray resourceIdentifier = "sink.test.instance1";
         auto indexer = QSharedPointer<IndexUpdater>::create();
 
         pipeline->setPreprocessors("event", QVector<Sink::Preprocessor *>() << indexer.data());
         pipeline->setAdaptorFactory("event", eventFactory);
 
-        TestResource resource("org.kde.test.instance1", pipeline);
+        TestResource resource("sink.test.instance1", pipeline);
 
         auto command = createEntityBuffer();
 
diff --git a/tests/genericresourcetest.cpp b/tests/genericresourcetest.cpp
index fe2c146..77a901d 100644
--- a/tests/genericresourcetest.cpp
+++ b/tests/genericresourcetest.cpp
@@ -26,7 +26,7 @@ private slots:
 
     void init()
     {
-        Sink::GenericResource::removeFromDisk("org.kde.test.instance1");
+        Sink::GenericResource::removeFromDisk("sink.test.instance1");
     }
 
     /// Ensure the resource can process messages
@@ -70,10 +70,10 @@ private slots:
         }
 
         // Actual test
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.test.instance1");
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.test.instance1");
         QSignalSpy revisionSpy(pipeline.data(), SIGNAL(revisionUpdated(qint64)));
         QVERIFY(revisionSpy.isValid());
-        TestResource resource("org.kde.test.instance1", pipeline);
+        TestResource resource("sink.test.instance1", pipeline);
         resource.processCommand(Sink::Commands::CreateEntityCommand, command);
         resource.processCommand(Sink::Commands::CreateEntityCommand, command);
         resource.processAllMessages().exec().waitForFinished();
diff --git a/tests/indextest.cpp b/tests/indextest.cpp
index fa3ace4..8566803 100644
--- a/tests/indextest.cpp
+++ b/tests/indextest.cpp
@@ -16,19 +16,19 @@ class IndexTest : public QObject
 private slots:
     void initTestCase()
     {
-        Sink::Storage store("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite);
+        Sink::Storage store("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite);
         store.removeFromDisk();
     }
 
     void cleanup()
     {
-        Sink::Storage store("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite);
+        Sink::Storage store("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite);
         store.removeFromDisk();
     }
 
     void testIndex()
     {
-        Index index("./testindex", "org.kde.dummy.testindex", Sink::Storage::ReadWrite);
+        Index index("./testindex", "sink.dummy.testindex", Sink::Storage::ReadWrite);
         // The first key is specifically a substring of the second key
         index.add("key", "value1");
         index.add("keyFoo", "value2");
diff --git a/tests/inspectiontest.cpp b/tests/inspectiontest.cpp
index 8f2c50f..3e8a103 100644
--- a/tests/inspectiontest.cpp
+++ b/tests/inspectiontest.cpp
@@ -19,10 +19,10 @@ class InspectionTest : public QObject
 private slots:
     void initTestCase()
     {
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
         QVERIFY(factory);
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
     }
 
     void testInspection_data()
@@ -38,7 +38,7 @@ private slots:
         using namespace Sink;
         using namespace Sink::ApplicationDomain;
 
-        Mail mail(QByteArray("org.kde.dummy.instance1"), QByteArray("identifier"), 0, QSharedPointer<MemoryBufferAdaptor::MemoryBufferAdaptor>::create());
+        Mail mail(QByteArray("sink.dummy.instance1"), QByteArray("identifier"), 0, QSharedPointer<MemoryBufferAdaptor::MemoryBufferAdaptor>::create());
 
         // testInspection is a magic property that the dummyresource supports
         auto inspectionCommand = ResourceControl::Inspection::PropertyInspection(mail, "testInspection", success);
diff --git a/tests/maildirsyncbenchmark.cpp b/tests/maildirsyncbenchmark.cpp
index 8b1a9d7..d84c758 100644
--- a/tests/maildirsyncbenchmark.cpp
+++ b/tests/maildirsyncbenchmark.cpp
@@ -61,17 +61,17 @@ private slots:
     {
         targetPath = tempDir.path() + "/maildir1";
 
-        MaildirResource::removeFromDisk("org.kde.maildir.test1");
+        MaildirResource::removeFromDisk("sink.maildir.test1");
         Sink::ApplicationDomain::SinkResource resource;
-        resource.setProperty("identifier", "org.kde.maildir.test1");
-        resource.setProperty("type", "org.kde.maildir");
+        resource.setProperty("identifier", "sink.maildir.test1");
+        resource.setProperty("type", "sink.maildir");
         resource.setProperty("path", targetPath);
         Sink::Store::create(resource).exec().waitForFinished();
     }
 
     void cleanup()
     {
-        MaildirResource::removeFromDisk("org.kde.maildir.test1");
+        MaildirResource::removeFromDisk("sink.maildir.test1");
         QDir dir(targetPath);
         dir.removeRecursively();
     }
@@ -83,8 +83,8 @@ private slots:
 
     void testbench()
     {
-        auto pipeline = QSharedPointer<Sink::Pipeline>::create("org.kde.maildir.test1");
-        MaildirResource resource("org.kde.maildir.test1", pipeline);
+        auto pipeline = QSharedPointer<Sink::Pipeline>::create("sink.maildir.test1");
+        MaildirResource resource("sink.maildir.test1", pipeline);
         QTime time;
         time.start();
         resource.Sink::GenericResource::synchronizeWithSource().exec().waitForFinished();
diff --git a/tests/mailquerybenchmark.cpp b/tests/mailquerybenchmark.cpp
index 4e58899..450955f 100644
--- a/tests/mailquerybenchmark.cpp
+++ b/tests/mailquerybenchmark.cpp
@@ -148,7 +148,7 @@ private slots:
 
     void init()
     {
-        resourceIdentifier = "org.kde.test.instance1";
+        resourceIdentifier = "sink.test.instance1";
         Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Mail, TestMailAdaptorFactory>("test");
     }
 
diff --git a/tests/messagequeuetest.cpp b/tests/messagequeuetest.cpp
index 27dd12b..e79bba2 100644
--- a/tests/messagequeuetest.cpp
+++ b/tests/messagequeuetest.cpp
@@ -21,7 +21,7 @@ private slots:
     void initTestCase()
     {
         Sink::Test::initTest();
-        Sink::Storage store(Sink::Store::storageLocation(), "org.kde.dummy.testqueue", Sink::Storage::ReadWrite);
+        Sink::Storage store(Sink::Store::storageLocation(), "sink.dummy.testqueue", Sink::Storage::ReadWrite);
         store.removeFromDisk();
     }
 
@@ -31,13 +31,13 @@ private slots:
 
     void cleanup()
     {
-        Sink::Storage store(Sink::Store::storageLocation(), "org.kde.dummy.testqueue", Sink::Storage::ReadWrite);
+        Sink::Storage store(Sink::Store::storageLocation(), "sink.dummy.testqueue", Sink::Storage::ReadWrite);
         store.removeFromDisk();
     }
 
     void testEmpty()
     {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         QVERIFY(queue.isEmpty());
         queue.enqueue("value");
         QVERIFY(!queue.isEmpty());
@@ -45,7 +45,7 @@ private slots:
 
     void testDequeueEmpty()
     {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         bool gotValue = false;
         bool gotError = false;
         queue.dequeue([&](void *ptr, int size, std::function<void(bool success)> callback) { gotValue = true; }, [&](const MessageQueue::Error &error) { gotError = true; });
@@ -55,7 +55,7 @@ private slots:
 
     void testEnqueue()
     {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         QSignalSpy spy(&queue, SIGNAL(messageReady()));
         queue.enqueue("value1");
         QCOMPARE(spy.size(), 1);
@@ -63,7 +63,7 @@ private slots:
 
     void testDrained()
     {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         QSignalSpy spy(&queue, SIGNAL(drained()));
         queue.enqueue("value1");
 
@@ -77,7 +77,7 @@ private slots:
         values << "value1";
         values << "value2";
 
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         for (const QByteArray &value : values) {
             queue.enqueue(value);
         }
@@ -107,7 +107,7 @@ private slots:
         values << "value1";
         values << "value2";
 
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         for (const QByteArray &value : values) {
             queue.enqueue(value);
         }
@@ -145,7 +145,7 @@ private slots:
      */
     void testNestedEnqueue()
     {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         queue.enqueue("value1");
 
         bool gotError = false;
@@ -160,7 +160,7 @@ private slots:
 
     void testBatchDequeue()
     {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         queue.enqueue("value1");
         queue.enqueue("value2");
         queue.enqueue("value3");
@@ -181,7 +181,7 @@ private slots:
 
     void testBatchEnqueue()
     {
-        MessageQueue queue(Sink::Store::storageLocation(), "org.kde.dummy.testqueue");
+        MessageQueue queue(Sink::Store::storageLocation(), "sink.dummy.testqueue");
         QSignalSpy spy(&queue, SIGNAL(messageReady()));
         queue.startTransaction();
         queue.enqueue("value1");
diff --git a/tests/modelinteractivitytest.cpp b/tests/modelinteractivitytest.cpp
index d13cdf7..4819ccc 100644
--- a/tests/modelinteractivitytest.cpp
+++ b/tests/modelinteractivitytest.cpp
@@ -51,13 +51,13 @@ private slots:
     void initTestCase()
     {
         Sink::Test::initTest();
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
     }
 
     void cleanup()
     {
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
     }
 
     void init()
@@ -68,14 +68,14 @@ private slots:
     {
         // Setup
         {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
             for (int i = 0; i < 1000; i++) {
                 Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
             }
         }
 
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query.liveQuery = true;
 
         Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
diff --git a/tests/pipelinebenchmark.cpp b/tests/pipelinebenchmark.cpp
index 51481fd..0c0b9e6 100644
--- a/tests/pipelinebenchmark.cpp
+++ b/tests/pipelinebenchmark.cpp
@@ -131,7 +131,7 @@ private slots:
     {
         Sink::Log::setDebugOutputLevel(Sink::Log::Warning);
         Sink::AdaptorFactoryRegistry::instance().registerFactory<Sink::ApplicationDomain::Mail, TestMailAdaptorFactory>("test");
-        resourceIdentifier = "org.kde.test.instance1";
+        resourceIdentifier = "sink.test.instance1";
     }
 
     void testWithoutIndex()
diff --git a/tests/pipelinetest.cpp b/tests/pipelinetest.cpp
index 65d4b49..7216f62 100644
--- a/tests/pipelinetest.cpp
+++ b/tests/pipelinetest.cpp
@@ -195,7 +195,7 @@ private slots:
 
     void init()
     {
-        removeFromDisk("org.kde.pipelinetest.instance1");
+        removeFromDisk("sink.pipelinetest.instance1");
     }
 
     void testCreate()
@@ -203,14 +203,14 @@ private slots:
         flatbuffers::FlatBufferBuilder entityFbb;
         auto command = createEntityCommand(createEvent(entityFbb));
 
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
         pipeline.setResourceType("test");
 
         pipeline.startTransaction();
         pipeline.newEntity(command.constData(), command.size());
         pipeline.commit();
 
-        auto result = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto result = getKeys("sink.pipelinetest.instance1", "event.main");
         qDebug() << result;
         QCOMPARE(result.size(), 1);
     }
@@ -220,7 +220,7 @@ private slots:
         flatbuffers::FlatBufferBuilder entityFbb;
         auto command = createEntityCommand(createEvent(entityFbb, "summary", "description"));
 
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
         pipeline.setResourceType("test");
 
         auto adaptorFactory = QSharedPointer<TestEventAdaptorFactory>::create();
@@ -231,7 +231,7 @@ private slots:
         pipeline.commit();
 
         // Get uid of written entity
-        auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto keys = getKeys("sink.pipelinetest.instance1", "event.main");
         QCOMPARE(keys.size(), 1);
         const auto key = keys.first();
         const auto uid = Sink::Storage::uidFromKey(key);
@@ -244,7 +244,7 @@ private slots:
         pipeline.commit();
 
         // Ensure we've got the new revision with the modification
-        auto buffer = getEntity("org.kde.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 2));
+        auto buffer = getEntity("sink.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 2));
         QVERIFY(!buffer.isEmpty());
         Sink::EntityBuffer entityBuffer(buffer.data(), buffer.size());
         auto adaptor = adaptorFactory->createAdaptor(entityBuffer.entity());
@@ -253,7 +253,7 @@ private slots:
         QVERIFY2(adaptor->getProperty("description").toString() == QString("description"), "The modification has sideeffects.");
 
         // Both revisions are in the store at this point
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 2);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 2);
 
         // Cleanup old revisions
         pipeline.startTransaction();
@@ -261,7 +261,7 @@ private slots:
         pipeline.commit();
 
         // And now only the latest revision is left
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 1);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 1);
     }
 
     void testModifyWithUnrelatedOperationInbetween()
@@ -269,7 +269,7 @@ private slots:
         flatbuffers::FlatBufferBuilder entityFbb;
         auto command = createEntityCommand(createEvent(entityFbb));
 
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
         pipeline.setResourceType("test");
 
         auto adaptorFactory = QSharedPointer<TestEventAdaptorFactory>::create();
@@ -280,7 +280,7 @@ private slots:
         pipeline.commit();
 
         // Get uid of written entity
-        auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto keys = getKeys("sink.pipelinetest.instance1", "event.main");
         QCOMPARE(keys.size(), 1);
         const auto uid = Sink::Storage::uidFromKey(keys.first());
 
@@ -302,7 +302,7 @@ private slots:
         pipeline.commit();
 
         // Ensure we've got the new revision with the modification
-        auto buffer = getEntity("org.kde.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 3));
+        auto buffer = getEntity("sink.pipelinetest.instance1", "event.main", Sink::Storage::assembleKey(uid, 3));
         QVERIFY(!buffer.isEmpty());
         Sink::EntityBuffer entityBuffer(buffer.data(), buffer.size());
         auto adaptor = adaptorFactory->createAdaptor(entityBuffer.entity());
@@ -313,7 +313,7 @@ private slots:
     {
         flatbuffers::FlatBufferBuilder entityFbb;
         auto command = createEntityCommand(createEvent(entityFbb));
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
         pipeline.setResourceType("test");
 
         // Create the initial revision
@@ -321,7 +321,7 @@ private slots:
         pipeline.newEntity(command.constData(), command.size());
         pipeline.commit();
 
-        auto result = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto result = getKeys("sink.pipelinetest.instance1", "event.main");
         QCOMPARE(result.size(), 1);
 
         const auto uid = Sink::Storage::uidFromKey(result.first());
@@ -333,7 +333,7 @@ private slots:
         pipeline.commit();
 
         // We have a new revision that indicates the deletion
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 2);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 2);
 
         // Cleanup old revisions
         pipeline.startTransaction();
@@ -341,7 +341,7 @@ private slots:
         pipeline.commit();
 
         // And all revisions are gone
-        QCOMPARE(getKeys("org.kde.pipelinetest.instance1", "event.main").size(), 0);
+        QCOMPARE(getKeys("sink.pipelinetest.instance1", "event.main").size(), 0);
     }
 
     void testPreprocessor()
@@ -350,7 +350,7 @@ private slots:
 
         auto testProcessor = new TestProcessor;
 
-        Sink::Pipeline pipeline("org.kde.pipelinetest.instance1");
+        Sink::Pipeline pipeline("sink.pipelinetest.instance1");
         pipeline.setResourceType("test");
         pipeline.setPreprocessors("event", QVector<Sink::Preprocessor *>() << testProcessor);
         pipeline.startTransaction();
@@ -368,7 +368,7 @@ private slots:
         pipeline.commit();
         entityFbb.Clear();
         pipeline.startTransaction();
-        auto keys = getKeys("org.kde.pipelinetest.instance1", "event.main");
+        auto keys = getKeys("sink.pipelinetest.instance1", "event.main");
         QCOMPARE(keys.size(), 1);
         const auto uid = Sink::Storage::uidFromKey(keys.first());
         {
diff --git a/tests/querytest.cpp b/tests/querytest.cpp
index 95c22b3..d3a97f6 100644
--- a/tests/querytest.cpp
+++ b/tests/querytest.cpp
@@ -23,15 +23,15 @@ private slots:
     void initTestCase()
     {
         Sink::Test::initTest();
-        auto factory = Sink::ResourceFactory::load("org.kde.dummy");
+        auto factory = Sink::ResourceFactory::load("sink.dummy");
         QVERIFY(factory);
-        ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        ResourceConfig::addResource("sink.dummy.instance1", "sink.dummy");
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
     }
 
     void cleanup()
     {
-        Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
+        Sink::Store::removeDataFromDisk(QByteArray("sink.dummy.instance1")).exec().waitForFinished();
     }
 
     void init()
@@ -59,13 +59,13 @@ private slots:
     {
         // Setup
         {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
             Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
         }
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query.liveQuery = true;
 
         // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
@@ -77,13 +77,13 @@ private slots:
     {
         // Setup
         {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
             Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
         }
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query.liveQuery = false;
 
         // Ensure all local data is processed
@@ -101,12 +101,12 @@ private slots:
         QByteArray id;
         // Setup
         {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
             Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
             Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
 
             Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
 
             // Ensure all local data is processed
             Sink::Store::synchronize(query).exec().waitForFinished();
@@ -120,7 +120,7 @@ private slots:
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query.ids << id;
         auto model = Sink::Store::loadModel<Sink::ApplicationDomain::Mail>(query);
         QTRY_VERIFY(model->data(QModelIndex(), Sink::Store::ChildrenFetchedRole).toBool());
@@ -131,13 +131,13 @@ private slots:
     {
         // Setup
         {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
             Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
         }
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query.liveQuery = true;
 
         // We fetch before the data is available and rely on the live query mechanism to deliver the actual data
@@ -151,11 +151,11 @@ private slots:
     {
         // Setup
         {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
             Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
 
             Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
 
             // Ensure all local data is processed
             Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -167,14 +167,14 @@ private slots:
             auto folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
             QVERIFY(!folderEntity->identifier().isEmpty());
 
-            Sink::ApplicationDomain::Folder subfolder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder subfolder("sink.dummy.instance1");
             subfolder.setProperty("parent", folderEntity->identifier());
             Sink::Store::create<Sink::ApplicationDomain::Folder>(subfolder).exec().waitForFinished();
         }
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query.parentProperty = "parent";
 
         // Ensure all local data is processed
@@ -193,7 +193,7 @@ private slots:
     {
         // Setup
         {
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
             mail.setProperty("uid", "test1");
             mail.setProperty("sender", "doe@example.org");
             Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
@@ -201,7 +201,7 @@ private slots:
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query.liveQuery = false;
         query += Sink::Query::PropertyFilter("uid", "test1");
 
@@ -219,11 +219,11 @@ private slots:
         // Setup
         Sink::ApplicationDomain::Folder::Ptr folderEntity;
         {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
             Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
 
             Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
 
             // Ensure all local data is processed
             Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -235,7 +235,7 @@ private slots:
             folderEntity = model->index(0, 0).data(Sink::Store::DomainObjectRole).value<Sink::ApplicationDomain::Folder::Ptr>();
             QVERIFY(!folderEntity->identifier().isEmpty());
 
-            Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
             mail.setProperty("uid", "test1");
             mail.setProperty("folder", folderEntity->identifier());
             Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
@@ -243,7 +243,7 @@ private slots:
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query += Sink::Query::PropertyFilter("folder", *folderEntity);
 
         // Ensure all local data is processed
@@ -260,11 +260,11 @@ private slots:
         // Setup
         Sink::ApplicationDomain::Folder::Ptr folderEntity;
         {
-            Sink::ApplicationDomain::Folder folder("org.kde.dummy.instance1");
+            Sink::ApplicationDomain::Folder folder("sink.dummy.instance1");
             Sink::Store::create<Sink::ApplicationDomain::Folder>(folder).exec().waitForFinished();
 
             Sink::Query query;
-            query.resources << "org.kde.dummy.instance1";
+            query.resources << "sink.dummy.instance1";
 
             // Ensure all local data is processed
             Sink::ResourceControl::flushMessageQueue(query.resources).exec().waitForFinished();
@@ -278,21 +278,21 @@ private slots:
 
             const auto date = QDateTime(QDate(2015, 7, 7), QTime(12, 0));
             {
-                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
                 mail.setProperty("uid", "testSecond");
                 mail.setProperty("folder", folderEntity->identifier());
                 mail.setProperty("date", date.addDays(-1));
                 Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
             }
             {
-                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
                 mail.setProperty("uid", "testLatest");
                 mail.setProperty("folder", folderEntity->identifier());
                 mail.setProperty("date", date);
                 Sink::Store::create<Sink::ApplicationDomain::Mail>(mail).exec().waitForFinished();
             }
             {
-                Sink::ApplicationDomain::Mail mail("org.kde.dummy.instance1");
+                Sink::ApplicationDomain::Mail mail("sink.dummy.instance1");
                 mail.setProperty("uid", "testLast");
                 mail.setProperty("folder", folderEntity->identifier());
                 mail.setProperty("date", date.addDays(-2));
@@ -302,7 +302,7 @@ private slots:
 
         // Test
         Sink::Query query;
-        query.resources << "org.kde.dummy.instance1";
+        query.resources << "sink.dummy.instance1";
         query += Sink::Query::PropertyFilter("folder", *folderEntity);
         query.sortProperty = "date";
         query.limit = 1;