30 files changed, 115 insertions, 115 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 0dacda1..a165820 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,33 +1,33 @@
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(domain)
 
-project(sinkcommon)
+project(sink)
 
-ecm_setup_version("0.1" VARIABLE_PREFIX SinkCommon
-                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sinkcommon_version.h"
-                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfigVersion.cmake"
+ecm_setup_version("0.1" VARIABLE_PREFIX Sink
+                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/sink_version.h"
+                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
                         SOVERSION 0
 )
 
 ########### CMake Config Files ###########
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/SinkCommon")
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/Sink")
 
 ecm_configure_package_config_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/SinkCommonConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfig.cmake"
+  "${CMAKE_CURRENT_SOURCE_DIR}/SinkConfig.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
   INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
 )
 
 install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfig.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/SinkCommonConfigVersion.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfig.cmake"
+  "${CMAKE_CURRENT_BINARY_DIR}/SinkConfigVersion.cmake"
   DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
   COMPONENT Devel
 )
 
 add_definitions("-fvisibility=hidden")
 
-install(EXPORT SinkCommonTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE SinkCommonTargets.cmake)
+install(EXPORT SinkTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE SinkTargets.cmake)
 
 set(storage_SRCS storage_lmdb.cpp)
 set(storage_LIBS lmdb)
@@ -87,7 +87,7 @@ generate_flatbuffers(
     queuedcommand
 )
 
-generate_export_header(${PROJECT_NAME} BASE_NAME SinkCommon EXPORT_FILE_NAME sinkcommon_export.h)
+generate_export_header(${PROJECT_NAME} BASE_NAME Sink EXPORT_FILE_NAME sink_export.h)
 SET_TARGET_PROPERTIES(${PROJECT_NAME}
     PROPERTIES LINKER_LANGUAGE CXX
     VERSION "0.1"
@@ -97,7 +97,7 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME}
 qt5_use_modules(${PROJECT_NAME} Network)
 target_link_libraries(${PROJECT_NAME} ${storage_LIBS} KF5::Async)
 install(TARGETS ${PROJECT_NAME}
-    EXPORT SinkCommonTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK} )
+    EXPORT SinkTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK} )
 
 add_clang_static_analysis(${PROJECT_NAME})
 
@@ -108,7 +108,7 @@ install(FILES
     inspection.h
     notification.h
     bufferadaptor.h
-    ${CMAKE_CURRENT_BINARY_DIR}/sinkcommon_export.h
+    ${CMAKE_CURRENT_BINARY_DIR}/sink_export.h
     DESTINATION ${INCLUDE_INSTALL_DIR}/${PROJECT_NAME} COMPONENT Devel
 )
 
diff --git a/common/SinkCommonConfig.cmake.in b/common/SinkConfig.cmake.in
index 6c2a1c2..930b2db 100644
--- a/common/SinkCommonConfig.cmake.in
+++ b/common/SinkConfig.cmake.in
@@ -2,4 +2,4 @@
 
 find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
 
-include("${CMAKE_CURRENT_LIST_DIR}/SinkCommonTargets.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/SinkTargets.cmake")
diff --git a/common/clientapi.h b/common/clientapi.h
index f88eb5c..ff23da5 100644
--- a/common/clientapi.h
+++ b/common/clientapi.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QString>
 #include <QSharedPointer>
 
@@ -36,7 +36,7 @@ namespace Sink {
 class ResourceAccess;
 class Notification;
 
-class SINKCOMMON_EXPORT Notifier {
+class SINK_EXPORT Notifier {
 public:
     Notifier(const QSharedPointer<ResourceAccess> &resourceAccess);
     Notifier(const QByteArray &resourceInstanceIdentifier);
@@ -54,8 +54,8 @@ private:
  */
 namespace Store {
 
-QString SINKCOMMON_EXPORT storageLocation();
-QByteArray SINKCOMMON_EXPORT resourceName(const QByteArray &instanceIdentifier);
+QString SINK_EXPORT storageLocation();
+QByteArray SINK_EXPORT resourceName(const QByteArray &instanceIdentifier);
 
 enum Roles {
     DomainObjectRole = Qt::UserRole + 1, //Must be the same as in ModelResult
@@ -67,13 +67,13 @@ enum Roles {
     * Asynchronusly load a dataset with tree structure information
     */
 template <class DomainType>
-QSharedPointer<QAbstractItemModel> SINKCOMMON_EXPORT loadModel(Query query);
+QSharedPointer<QAbstractItemModel> SINK_EXPORT loadModel(Query query);
 
 /**
  * Create a new entity.
  */
 template <class DomainType>
-KAsync::Job<void> SINKCOMMON_EXPORT create(const DomainType &domainObject);
+KAsync::Job<void> SINK_EXPORT create(const DomainType &domainObject);
 
 /**
  * Modify an entity.
@@ -81,51 +81,51 @@ KAsync::Job<void> SINKCOMMON_EXPORT create(const DomainType &domainObject);
  * This includes moving etc. since these are also simple settings on a property.
  */
 template <class DomainType>
-KAsync::Job<void> SINKCOMMON_EXPORT modify(const DomainType &domainObject);
+KAsync::Job<void> SINK_EXPORT modify(const DomainType &domainObject);
 
 /**
  * Remove an entity.
  */
 template <class DomainType>
-KAsync::Job<void> SINKCOMMON_EXPORT remove(const DomainType &domainObject);
+KAsync::Job<void> SINK_EXPORT remove(const DomainType &domainObject);
 
 /**
  * Synchronize data to local cache.
  */
-KAsync::Job<void> SINKCOMMON_EXPORT synchronize(const Sink::Query &query);
+KAsync::Job<void> SINK_EXPORT synchronize(const Sink::Query &query);
 
 /**
  * Removes a resource from disk.
  */
-void SINKCOMMON_EXPORT removeFromDisk(const QByteArray &resourceIdentifier);
+void SINK_EXPORT removeFromDisk(const QByteArray &resourceIdentifier);
 
 /**
  * Removes all resource data from disk.
  * 
  * This will not touch the configuration. All commands that that arrived at the resource before this command will be dropped. All commands that arrived later will be executed.
  */
-KAsync::Job<void> SINKCOMMON_EXPORT removeDataFromDisk(const QByteArray &resourceIdentifier);
+KAsync::Job<void> SINK_EXPORT removeDataFromDisk(const QByteArray &resourceIdentifier);
 
 template <class DomainType>
-KAsync::Job<DomainType> SINKCOMMON_EXPORT fetchOne(const Sink::Query &query);
+KAsync::Job<DomainType> SINK_EXPORT fetchOne(const Sink::Query &query);
 
 template <class DomainType>
-KAsync::Job<QList<typename DomainType::Ptr> > SINKCOMMON_EXPORT fetchAll(const Sink::Query &query);
+KAsync::Job<QList<typename DomainType::Ptr> > SINK_EXPORT fetchAll(const Sink::Query &query);
 
 template <class DomainType>
-KAsync::Job<QList<typename DomainType::Ptr> > SINKCOMMON_EXPORT fetch(const Sink::Query &query, int minimumAmount = 0);
+KAsync::Job<QList<typename DomainType::Ptr> > SINK_EXPORT fetch(const Sink::Query &query, int minimumAmount = 0);
 
 };
 
 namespace Resources {
 
 template <class DomainType>
-KAsync::Job<void> SINKCOMMON_EXPORT inspect(const Inspection &inspectionCommand);
+KAsync::Job<void> SINK_EXPORT inspect(const Inspection &inspectionCommand);
 
 /**
     * Shutdown resource.
     */
-KAsync::Job<void> SINKCOMMON_EXPORT shutdown(const QByteArray &resourceIdentifier);
+KAsync::Job<void> SINK_EXPORT shutdown(const QByteArray &resourceIdentifier);
 
 /**
     * Start resource.
@@ -134,17 +134,17 @@ KAsync::Job<void> SINKCOMMON_EXPORT shutdown(const QByteArray &resourceIdentifie
     * This command is only necessary if a resource was shutdown previously,
     * otherwise the resource process will automatically start as necessary.
     */
-KAsync::Job<void> SINKCOMMON_EXPORT start(const QByteArray &resourceIdentifier);
+KAsync::Job<void> SINK_EXPORT start(const QByteArray &resourceIdentifier);
 
 /**
     * Flushes any pending messages to disk
     */
-KAsync::Job<void> SINKCOMMON_EXPORT flushMessageQueue(const QByteArrayList &resourceIdentifier);
+KAsync::Job<void> SINK_EXPORT flushMessageQueue(const QByteArrayList &resourceIdentifier);
 
 /**
     * Flushes any pending messages that haven't been replayed to the source.
     */
-KAsync::Job<void> SINKCOMMON_EXPORT flushReplayQueue(const QByteArrayList &resourceIdentifier);
+KAsync::Job<void> SINK_EXPORT flushReplayQueue(const QByteArrayList &resourceIdentifier);
 
 }
 
diff --git a/common/commands.h b/common/commands.h
index adf2094..64abd76 100644
--- a/common/commands.h
+++ b/common/commands.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <flatbuffers/flatbuffers.h>
 #include <QByteArray>
 
@@ -55,10 +55,10 @@ enum CommandIds {
 
 QByteArray name(int commandId);
 
-int SINKCOMMON_EXPORT headerSize();
-void SINKCOMMON_EXPORT write(QIODevice *device, int messageId, int commandId);
-void SINKCOMMON_EXPORT write(QIODevice *device, int messageId, int commandId, const char *buffer, uint size);
-void SINKCOMMON_EXPORT write(QIODevice *device, int messageId, int commandId, flatbuffers::FlatBufferBuilder &fbb);
+int SINK_EXPORT headerSize();
+void SINK_EXPORT write(QIODevice *device, int messageId, int commandId);
+void SINK_EXPORT write(QIODevice *device, int messageId, int commandId, const char *buffer, uint size);
+void SINK_EXPORT write(QIODevice *device, int messageId, int commandId, flatbuffers::FlatBufferBuilder &fbb);
 
 }
 
diff --git a/common/definitions.h b/common/definitions.h
index b17514c..029d3f8 100644
--- a/common/definitions.h
+++ b/common/definitions.h
@@ -20,11 +20,11 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QString>
 #include <QByteArray>
 
 namespace Sink {
-    QString SINKCOMMON_EXPORT storageLocation();
-    QByteArray SINKCOMMON_EXPORT resourceName(const QByteArray &instanceIdentifier);
+    QString SINK_EXPORT storageLocation();
+    QByteArray SINK_EXPORT resourceName(const QByteArray &instanceIdentifier);
 }
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index ce35af0..858049c 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QSharedPointer>
 #include <QVariant>
 #include <QByteArray>
@@ -37,7 +37,7 @@ namespace ApplicationDomain {
  *
  * ApplicationDomainTypes don't adhere to any standard and are meant to be extended frequently (hence the non-typesafe interface).
  */
-class SINKCOMMON_EXPORT ApplicationDomainType {
+class SINK_EXPORT ApplicationDomainType {
 public:
     typedef QSharedPointer<ApplicationDomainType> Ptr;
 
@@ -96,37 +96,37 @@ inline QDebug operator<< (QDebug d, const ApplicationDomainType &type)
     return d;
 }
 
-struct SINKCOMMON_EXPORT Entity : public ApplicationDomainType {
+struct SINK_EXPORT Entity : public ApplicationDomainType {
     typedef QSharedPointer<Entity> Ptr;
     using ApplicationDomainType::ApplicationDomainType;
     virtual ~Entity();
 };
 
-struct SINKCOMMON_EXPORT Event : public Entity {
+struct SINK_EXPORT Event : public Entity {
     typedef QSharedPointer<Event> Ptr;
     using Entity::Entity;
     virtual ~Event();
 };
 
-struct SINKCOMMON_EXPORT Todo : public Entity {
+struct SINK_EXPORT Todo : public Entity {
     typedef QSharedPointer<Todo> Ptr;
     using Entity::Entity;
     virtual ~Todo();
 };
 
-struct SINKCOMMON_EXPORT Calendar : public Entity {
+struct SINK_EXPORT Calendar : public Entity {
     typedef QSharedPointer<Calendar> Ptr;
     using Entity::Entity;
     virtual ~Calendar();
 };
 
-struct SINKCOMMON_EXPORT Mail : public Entity {
+struct SINK_EXPORT Mail : public Entity {
     typedef QSharedPointer<Mail> Ptr;
     using Entity::Entity;
     virtual ~Mail();
 };
 
-struct SINKCOMMON_EXPORT Folder : public Entity {
+struct SINK_EXPORT Folder : public Entity {
     typedef QSharedPointer<Folder> Ptr;
     using Entity::Entity;
     virtual ~Folder();
@@ -138,7 +138,7 @@ struct SINKCOMMON_EXPORT Folder : public Entity {
  * This type is used for configuration of resources,
  * and for creating and removing resource instances.
  */
-struct SINKCOMMON_EXPORT SinkResource : public ApplicationDomainType {
+struct SINK_EXPORT SinkResource : public ApplicationDomainType {
     typedef QSharedPointer<SinkResource> Ptr;
     using ApplicationDomainType::ApplicationDomainType;
     virtual ~SinkResource();
@@ -150,22 +150,22 @@ struct SINKCOMMON_EXPORT SinkResource : public ApplicationDomainType {
  * Do not store these types to disk, they may change over time.
  */
 template<class DomainType>
-QByteArray SINKCOMMON_EXPORT getTypeName();
+QByteArray SINK_EXPORT getTypeName();
 
 template<>
-QByteArray SINKCOMMON_EXPORT getTypeName<Event>();
+QByteArray SINK_EXPORT getTypeName<Event>();
 
 template<>
-QByteArray SINKCOMMON_EXPORT getTypeName<Todo>();
+QByteArray SINK_EXPORT getTypeName<Todo>();
 
 template<>
-QByteArray SINKCOMMON_EXPORT getTypeName<SinkResource>();
+QByteArray SINK_EXPORT getTypeName<SinkResource>();
 
 template<>
-QByteArray SINKCOMMON_EXPORT getTypeName<Mail>();
+QByteArray SINK_EXPORT getTypeName<Mail>();
 
 template<>
-QByteArray SINKCOMMON_EXPORT getTypeName<Folder>();
+QByteArray SINK_EXPORT getTypeName<Folder>();
 
 /**
  * Type implementation.
@@ -174,7 +174,7 @@ QByteArray SINKCOMMON_EXPORT getTypeName<Folder>();
  * Contains all non-resource specific, but type-specific code.
  */
 template<typename DomainType>
-class SINKCOMMON_EXPORT TypeImplementation;
+class SINK_EXPORT TypeImplementation;
 
 }
 }
diff --git a/common/domainadaptor.h b/common/domainadaptor.h
index 6299a23..893c8d0 100644
--- a/common/domainadaptor.h
+++ b/common/domainadaptor.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QVariant>
 #include <QByteArray>
 #include <functional>
@@ -122,7 +122,7 @@ public:
  * This is required by the facade the read the value, and by the pipeline preprocessors to access the domain values in a generic way.
  */
 template<typename DomainType, typename ResourceBuffer, typename ResourceBuilder>
-class SINKCOMMON_EXPORT DomainTypeAdaptorFactory : public DomainTypeAdaptorFactoryInterface
+class SINK_EXPORT DomainTypeAdaptorFactory : public DomainTypeAdaptorFactoryInterface
 {
     typedef typename Sink::ApplicationDomain::TypeImplementation<DomainType>::Buffer LocalBuffer;
     typedef typename Sink::ApplicationDomain::TypeImplementation<DomainType>::BufferBuilder LocalBuilder;
diff --git a/common/entitybuffer.h b/common/entitybuffer.h
index 495e94e..474a619 100644
--- a/common/entitybuffer.h
+++ b/common/entitybuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <functional>
 #include <flatbuffers/flatbuffers.h>
 #include <QByteArray>
@@ -8,7 +8,7 @@
 namespace Sink {
 struct Entity;
 
-class SINKCOMMON_EXPORT EntityBuffer {
+class SINK_EXPORT EntityBuffer {
 public:
     EntityBuffer(const void *dataValue, int size);
     EntityBuffer(const QByteArray &data);
diff --git a/common/facade.h b/common/facade.h
index 914b6fc..a85b1de 100644
--- a/common/facade.h
+++ b/common/facade.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include "facadeinterface.h"
 
 #include <QByteArray>
@@ -44,7 +44,7 @@ namespace Sink {
  * Additionally a resource only has to provide a synchronizer plugin to execute the synchronization
  */
 template <typename DomainType>
-class SINKCOMMON_EXPORT GenericFacade: public Sink::StoreFacade<DomainType>
+class SINK_EXPORT GenericFacade: public Sink::StoreFacade<DomainType>
 {
 public:
     /**
diff --git a/common/facadefactory.h b/common/facadefactory.h
index 8425229..ef2a3f9 100644
--- a/common/facadefactory.h
+++ b/common/facadefactory.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QByteArray>
 #include <QDebug>
 #include <QMutex>
@@ -38,7 +38,7 @@ namespace Sink {
  *
  * If we were to provide default implementations for certain capabilities. Here would be the place to do so.
  */
-class SINKCOMMON_EXPORT FacadeFactory {
+class SINK_EXPORT FacadeFactory {
 public:
     typedef std::function<std::shared_ptr<void>(const QByteArray &)> FactoryFunction;
 
diff --git a/common/genericresource.h b/common/genericresource.h
index ae505a6..ceb6b61 100644
--- a/common/genericresource.h
+++ b/common/genericresource.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <resource.h>
 #include <messagequeue.h>
 #include <flatbuffers/flatbuffers.h>
@@ -37,7 +37,7 @@ class Preprocessor;
 /**
  * Generic Resource implementation.
  */
-class SINKCOMMON_EXPORT GenericResource : public Resource
+class SINK_EXPORT GenericResource : public Resource
 {
 public:
     GenericResource(const QByteArray &resourceInstanceIdentifier, const QSharedPointer<Pipeline> &pipeline = QSharedPointer<Pipeline>());
diff --git a/common/index.h b/common/index.h
index c280571..1a5b250 100644
--- a/common/index.h
+++ b/common/index.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <string>
 #include <functional>
 #include <QString>
@@ -9,7 +9,7 @@
 /**
  * An index for value pairs.
  */
-class SINKCOMMON_EXPORT Index
+class SINK_EXPORT Index
 {
 public:
     enum ErrorCodes {
diff --git a/common/listener.h b/common/listener.h
index 1d11cf1..5bcc93e 100644
--- a/common/listener.h
+++ b/common/listener.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QObject>
 
 #include <QPointer>
@@ -57,7 +57,7 @@ public:
     qint64 currentRevision;
 };
 
-class SINKCOMMON_EXPORT Listener : public QObject
+class SINK_EXPORT Listener : public QObject
 {
     Q_OBJECT
 
diff --git a/common/log.h b/common/log.h
index bf133c4..415c7f7 100644
--- a/common/log.h
+++ b/common/log.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QDebug>
 
 namespace Sink {
@@ -13,16 +13,16 @@ enum DebugLevel {
     Error
 };
 
-QByteArray SINKCOMMON_EXPORT debugLevelName(DebugLevel debugLevel);
-DebugLevel SINKCOMMON_EXPORT debugLevelFromName(const QByteArray &name);
+QByteArray SINK_EXPORT debugLevelName(DebugLevel debugLevel);
+DebugLevel SINK_EXPORT debugLevelFromName(const QByteArray &name);
 
 /**
  * Sets the debug output level.
  *
  * Everything below is ignored.
  */
-void SINKCOMMON_EXPORT setDebugOutputLevel(DebugLevel);
-DebugLevel SINKCOMMON_EXPORT debugOutputLevel();
+void SINK_EXPORT setDebugOutputLevel(DebugLevel);
+DebugLevel SINK_EXPORT debugOutputLevel();
 
 enum FilterType {
     Area,
@@ -37,8 +37,8 @@ enum FilterType {
  *
  * Note: In case of resources the application name is the identifier.
  */
-void SINKCOMMON_EXPORT setDebugOutputFilter(FilterType, const QByteArrayList &filter);
-QByteArrayList SINKCOMMON_EXPORT debugOutputFilter(FilterType type);
+void SINK_EXPORT setDebugOutputFilter(FilterType, const QByteArrayList &filter);
+QByteArrayList SINK_EXPORT debugOutputFilter(FilterType type);
 
 /**
  * Set the debug output fields.
@@ -50,18 +50,18 @@ QByteArrayList SINKCOMMON_EXPORT debugOutputFilter(FilterType type);
  *
  * These are additional items to the default ones (level, area, message).
  */
-void SINKCOMMON_EXPORT setDebugOutputFields(const QByteArrayList &filter);
-QByteArrayList SINKCOMMON_EXPORT debugOutputFields();
+void SINK_EXPORT setDebugOutputFields(const QByteArrayList &filter);
+QByteArrayList SINK_EXPORT debugOutputFields();
 
-QDebug SINKCOMMON_EXPORT debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea = 0);
+QDebug SINK_EXPORT debugStream(DebugLevel debugLevel, int line, const char* file, const char* function, const char* debugArea = 0);
 
-struct SINKCOMMON_EXPORT TraceTime
+struct SINK_EXPORT TraceTime
 {
     TraceTime(int i) : time(i){};
     const int time;
 };
 
-inline QDebug SINKCOMMON_EXPORT operator<<(QDebug d, const TraceTime &time)
+inline QDebug SINK_EXPORT operator<<(QDebug d, const TraceTime &time)
 {
     d << time.time << "[ms]";
     return d;
diff --git a/common/messagequeue.h b/common/messagequeue.h
index 112318a..9399055 100644
--- a/common/messagequeue.h
+++ b/common/messagequeue.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QObject>
 #include <QByteArrayList>
 #include <string>
@@ -12,7 +12,7 @@
 /**
  * A persistent FIFO message queue.
  */
-class SINKCOMMON_EXPORT MessageQueue : public QObject
+class SINK_EXPORT MessageQueue : public QObject
 {
     Q_OBJECT
 public:
diff --git a/common/notification.h b/common/notification.h
index 7c25003..cf69a99 100644
--- a/common/notification.h
+++ b/common/notification.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QString>
 
 namespace Sink
@@ -28,7 +28,7 @@ namespace Sink
 /**
  * A notification
  */
-class SINKCOMMON_EXPORT Notification
+class SINK_EXPORT Notification
 {
 public:
     QByteArray id;
diff --git a/common/pipeline.h b/common/pipeline.h
index 316b525..096771f 100644
--- a/common/pipeline.h
+++ b/common/pipeline.h
@@ -25,7 +25,7 @@
 #include <QSharedDataPointer>
 #include <QObject>
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <storage.h>
 
 #include <Async/Async>
@@ -37,7 +37,7 @@ namespace Sink
 
 class Preprocessor;
 
-class SINKCOMMON_EXPORT Pipeline : public QObject
+class SINK_EXPORT Pipeline : public QObject
 {
     Q_OBJECT
 
@@ -77,7 +77,7 @@ private:
     Private * const d;
 };
 
-class SINKCOMMON_EXPORT Preprocessor
+class SINK_EXPORT Preprocessor
 {
 public:
     Preprocessor();
diff --git a/common/propertymapper.h b/common/propertymapper.h
index 3fb3b44..57202ab 100644
--- a/common/propertymapper.h
+++ b/common/propertymapper.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QVariant>
 #include <QByteArray>
 #include <functional>
@@ -29,17 +29,17 @@
  * Defines how to convert qt primitives to flatbuffer ones
  */
 template <class T>
-flatbuffers::uoffset_t SINKCOMMON_EXPORT variantToProperty(const QVariant &, flatbuffers::FlatBufferBuilder &fbb);
+flatbuffers::uoffset_t SINK_EXPORT variantToProperty(const QVariant &, flatbuffers::FlatBufferBuilder &fbb);
 
 /**
  * Defines how to convert flatbuffer primitives to qt ones
  */
 template <typename T>
-QVariant SINKCOMMON_EXPORT propertyToVariant(const flatbuffers::String *);
+QVariant SINK_EXPORT propertyToVariant(const flatbuffers::String *);
 template <typename T>
-QVariant SINKCOMMON_EXPORT propertyToVariant(uint8_t);
+QVariant SINK_EXPORT propertyToVariant(uint8_t);
 template <typename T>
-QVariant SINKCOMMON_EXPORT propertyToVariant(const flatbuffers::Vector<uint8_t> *);
+QVariant SINK_EXPORT propertyToVariant(const flatbuffers::Vector<uint8_t> *);
 
 
 /**
diff --git a/common/resource.h b/common/resource.h
index 368759c..ab30cb9 100644
--- a/common/resource.h
+++ b/common/resource.h
@@ -19,7 +19,7 @@
  */
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 
 #include <Async/Async>
 #include "notification.h"
@@ -31,7 +31,7 @@ class FacadeFactory;
 /**
  * Resource interface
  */
-class SINKCOMMON_EXPORT Resource : public QObject
+class SINK_EXPORT Resource : public QObject
 {
     Q_OBJECT
 public:
@@ -72,7 +72,7 @@ private:
 /**
  * Factory interface for resource to implement.
  */
-class SINKCOMMON_EXPORT ResourceFactory : public QObject
+class SINK_EXPORT ResourceFactory : public QObject
 {
 public:
     static ResourceFactory *load(const QString &resourceName);
diff --git a/common/resourceaccess.h b/common/resourceaccess.h
index 3acc886..4c10adb 100644
--- a/common/resourceaccess.h
+++ b/common/resourceaccess.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QLocalSocket>
 #include <QObject>
 #include <QTimer>
@@ -35,7 +35,7 @@ namespace Sink
 
 struct QueuedCommand;
 
-class SINKCOMMON_EXPORT ResourceAccessInterface : public QObject
+class SINK_EXPORT ResourceAccessInterface : public QObject
 {
     Q_OBJECT
 public:
@@ -63,7 +63,7 @@ public Q_SLOTS:
     virtual void close() = 0;
 };
 
-class SINKCOMMON_EXPORT ResourceAccess : public ResourceAccessInterface
+class SINK_EXPORT ResourceAccess : public ResourceAccessInterface
 {
     Q_OBJECT
 public:
diff --git a/common/resourceconfig.h b/common/resourceconfig.h
index 0f3d55b..2108caa 100644
--- a/common/resourceconfig.h
+++ b/common/resourceconfig.h
@@ -19,13 +19,13 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <QList>
 #include <QByteArray>
 #include <QVariant>
 #include <QMap>
 
-class SINKCOMMON_EXPORT ResourceConfig
+class SINK_EXPORT ResourceConfig
 {
 public:
     static QMap<QByteArray, QByteArray> getResources();
diff --git a/common/storage.h b/common/storage.h
index 8ec3f1d..ac03947 100644
--- a/common/storage.h
+++ b/common/storage.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 #include <string>
 #include <functional>
 #include <QString>
@@ -29,7 +29,7 @@
 namespace Sink
 {
 
-class SINKCOMMON_EXPORT Storage {
+class SINK_EXPORT Storage {
 public:
     enum AccessMode { ReadOnly, ReadWrite };
 
diff --git a/common/threadboundary.h b/common/threadboundary.h
index 193eb56..7bea4ea 100644
--- a/common/threadboundary.h
+++ b/common/threadboundary.h
@@ -20,7 +20,7 @@
 
 #pragma once
 
-#include "sinkcommon_export.h"
+#include "sink_export.h"
 
 #include <QObject>
 #include <functional>
@@ -31,7 +31,7 @@ namespace async {
 * A helper class to invoke a method in a different thread using the event loop.
 * The ThreadBoundary object must live in the thread where the function should be called.
 */
-class SINKCOMMON_EXPORT ThreadBoundary : public QObject {
+class SINK_EXPORT ThreadBoundary : public QObject {
     Q_OBJECT
 public:
     ThreadBoundary();
diff --git a/examples/client/CMakeLists.txt b/examples/client/CMakeLists.txt
index 85840c4..ef00368 100644
--- a/examples/client/CMakeLists.txt
+++ b/examples/client/CMakeLists.txt
@@ -3,6 +3,6 @@ project(sink_client)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(${PROJECT_NAME} main.cpp console.cpp)
-target_link_libraries(${PROJECT_NAME} sinkcommon)
+target_link_libraries(${PROJECT_NAME} sink)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/examples/dummyresource/CMakeLists.txt b/examples/dummyresource/CMakeLists.txt
index 6ffac9a..6400f0c 100644
--- a/examples/dummyresource/CMakeLists.txt
+++ b/examples/dummyresource/CMakeLists.txt
@@ -7,6 +7,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 add_library(${PROJECT_NAME} SHARED facade.cpp resourcefactory.cpp domainadaptor.cpp dummystore.cpp)
 generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sinkcommon)
+target_link_libraries(${PROJECT_NAME} sink)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
diff --git a/examples/maildirresource/CMakeLists.txt b/examples/maildirresource/CMakeLists.txt
index baacd44..efaa266 100644
--- a/examples/maildirresource/CMakeLists.txt
+++ b/examples/maildirresource/CMakeLists.txt
@@ -8,7 +8,7 @@ find_package(KF5 COMPONENTS REQUIRED Mime)
 add_library(${PROJECT_NAME} SHARED facade.cpp maildirresource.cpp domainadaptor.cpp)
 # generate_flatbuffers(${PROJECT_NAME} dummycalendar)
 qt5_use_modules(${PROJECT_NAME} Core Network)
-target_link_libraries(${PROJECT_NAME} sinkcommon maildir KF5::Mime)
+target_link_libraries(${PROJECT_NAME} sink maildir KF5::Mime)
 
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${SINK_RESOURCE_PLUGINS_PATH})
 
diff --git a/sinksh/CMakeLists.txt b/sinksh/CMakeLists.txt
index 90abaec..3149347 100644
--- a/sinksh/CMakeLists.txt
+++ b/sinksh/CMakeLists.txt
@@ -23,6 +23,6 @@ set(sink_cli_SRCS
 include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(${PROJECT_NAME} ${sink_cli_SRCS})
-target_link_libraries(${PROJECT_NAME} Qt5::Core ${Readline_LIBRARY} sinkcommon)
+target_link_libraries(${PROJECT_NAME} Qt5::Core ${Readline_LIBRARY} sink)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
diff --git a/synchronizer/CMakeLists.txt b/synchronizer/CMakeLists.txt
index f2802a4..9e9d8d4 100644
--- a/synchronizer/CMakeLists.txt
+++ b/synchronizer/CMakeLists.txt
@@ -7,6 +7,6 @@ set(sinksynchronizer_SRCS
 )
 
 add_executable(${PROJECT_NAME} ${sinksynchronizer_SRCS})
-target_link_libraries(${PROJECT_NAME} sinkcommon KF5::Async)
+target_link_libraries(${PROJECT_NAME} sink KF5::Async)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b01a329..b8ee5a5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ macro(manual_tests)
         add_executable(${_testname} ${_testname}.cpp testimplementations.cpp getrssusage.cpp)
         generate_flatbuffers(${_testname} calendar)
         qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sinkcommon libhawd)
+        target_link_libraries(${_testname} sink libhawd)
     endforeach(_testname)
 endmacro(manual_tests)
 
@@ -25,7 +25,7 @@ macro(auto_tests)
         generate_flatbuffers(${_testname} calendar)
         add_test(${_testname} ${_testname})
         qt5_use_modules(${_testname} Core Test Concurrent)
-        target_link_libraries(${_testname} sinkcommon libhawd)
+        target_link_libraries(${_testname} sink libhawd)
     endforeach(_testname)
 endmacro(auto_tests)
 
diff --git a/tests/hawd/CMakeLists.txt b/tests/hawd/CMakeLists.txt
index 268e7a9..d754726 100644
--- a/tests/hawd/CMakeLists.txt
+++ b/tests/hawd/CMakeLists.txt
@@ -26,7 +26,7 @@ set(SRCS
 add_library(lib${PROJECT_NAME} SHARED ${lib_SRCS})
 generate_export_header(lib${PROJECT_NAME} BASE_NAME HAWD EXPORT_FILE_NAME hawd_export.h)
 qt5_use_modules(lib${PROJECT_NAME} Core)
-target_link_libraries(lib${PROJECT_NAME} sinkcommon)
+target_link_libraries(lib${PROJECT_NAME} sink)
 if (LIBGIT2_FOUND)
    target_link_libraries(lib${PROJECT_NAME} ${LIBGIT2_LIBRARIES})
 endif(LIBGIT2_FOUND)