diff --git a/src/serversdk/core.cpp b/src/serversdk/core.cpp
index 2147f82..203901b 100644
--- a/src/serversdk/core.cpp
+++ b/src/serversdk/core.cpp
@@ -1,14 +1,14 @@
 #include "core.h"
 #include "logger.h"
 
-namespace core {
+namespace serversdk {
 
 void installLogger(QtMsgType type, const QMessageLogContext &context, const QString &msg) {
-    core::Logger::outputMessage(type, context, msg);
+    serversdk::Logger::outputMessage(type, context, msg);
 }
 
 void initAppLogger() {
-    auto res = qInstallMessageHandler(core::Logger::outputMessage);
+    auto res = qInstallMessageHandler(serversdk::Logger::outputMessage);
     if (res)
         qCInfo(sdkcore) << "user message handler qInstallMessageHandler installed sucessfully";
     else
diff --git a/src/serversdk/core.h b/src/serversdk/core.h
index f626317..c98b983 100644
--- a/src/serversdk/core.h
+++ b/src/serversdk/core.h
@@ -7,7 +7,7 @@
 // c++
 #include <memory>
 
-namespace core {
+namespace serversdk {
 
 /** internal application logger handler */
 void installLogger(QtMsgType type, const QMessageLogContext &context, const QString &msg);
diff --git a/src/serversdk/databasemanager.cpp b/src/serversdk/databasemanager.cpp
index 3454d10..a9a7dd9 100644
--- a/src/serversdk/databasemanager.cpp
+++ b/src/serversdk/databasemanager.cpp
@@ -1,6 +1,6 @@
 #include "databasemanager.h"
 
-namespace core {
+namespace serversdk {
 
 DatabaseManager::DatabaseManager(const QString& host, const QString& dbName, const QString& user, const QString& password, bool dryMode)
     : mDryMode(dryMode)
diff --git a/src/serversdk/databasemanager.h b/src/serversdk/databasemanager.h
index 3232b3d..1b44c9c 100644
--- a/src/serversdk/databasemanager.h
+++ b/src/serversdk/databasemanager.h
@@ -10,7 +10,7 @@
 #include <QDateTime>
 //#include "logger.h"
 
-namespace core {
+namespace serversdk {
 
 class DatabaseManager : public QObject
 {
diff --git a/src/serversdk/logger.cpp b/src/serversdk/logger.cpp
index e562103..e55f9b9 100644
--- a/src/serversdk/logger.cpp
+++ b/src/serversdk/logger.cpp
@@ -8,7 +8,7 @@ Q_LOGGING_CATEGORY(sdkcore, "sdk.core");
 Q_LOGGING_CATEGORY(sdknetwork, "sdk.network");
 Q_LOGGING_CATEGORY(sdkcompress, "sdk.compress");
 
-namespace core {
+namespace serversdk {
 
 Logger* Logger::sConsumer = nullptr;
 //bool Logger::sShowFunction = false;
diff --git a/src/serversdk/logger.h b/src/serversdk/logger.h
index decb478..4e37a3d 100644
--- a/src/serversdk/logger.h
+++ b/src/serversdk/logger.h
@@ -12,7 +12,7 @@ Q_DECLARE_LOGGING_CATEGORY(sdkcore)
 Q_DECLARE_LOGGING_CATEGORY(sdknetwork)
 Q_DECLARE_LOGGING_CATEGORY(sdkcompress)
 
-namespace core {
+namespace serversdk {
 
 /** 
  * # Loggger
@@ -24,7 +24,7 @@ namespace core {
  * 
  * @code
  * int main() {
- *   core::initAppLogger(); // <-- then Logger::outputMessage will handle all messages
+ *   serversdk::initAppLogger(); // <-- then Logger::outputMessage will handle all messages
  *   // Log messge Filtering
  *   QStringList filters;
  *   filters << "qt.*=false";
@@ -50,14 +50,14 @@ public:
 
     /**
      * @brief User specific consumer of logger messages
-     * @param consumer - sublass of core::Loger
+     * @param consumer - sublass of serversdk::Loger
      *
      * @code
      * #include "core.h"
      * int main() {
-     *   core::initAppLogger();
-     *   core::Logger logger;
-     *   core::Logger::setConsumer(&logger);
+     *   serversdk::initAppLogger();
+     *   serversdk::Logger logger;
+     *   serversdk::Logger::setConsumer(&logger);
      * }
      * @endcode
      *
@@ -70,7 +70,7 @@ public:
      * @code
      * #include "core.h"
      * int main() {
-     *     core::initAppLogger();
+     *     serversdk::initAppLogger();
      * }
      * @endcode
      */
@@ -78,11 +78,11 @@ public:
 
     /** Pusing messges from installed message handler */
     virtual void pushMessage(const LoggerMessage& logmsg);
-    QList<core::LoggerMessage> getNewMessages(int currentCount);
+    QList<serversdk::LoggerMessage> getNewMessages(int currentCount);
 
 
 signals:
-    void messageReceived(const core::LoggerMessage &message);
+    void messageReceived(const serversdk::LoggerMessage &message);
     void messageListUpdated();
 private:
     QList<LoggerMessage> mLogMessages;
diff --git a/src/serversdk/loggermessage.cpp b/src/serversdk/loggermessage.cpp
index f1a14c8..ad56fe7 100644
--- a/src/serversdk/loggermessage.cpp
+++ b/src/serversdk/loggermessage.cpp
@@ -5,7 +5,7 @@
 
 #include <utility>
 
-namespace core {
+namespace serversdk {
 
 LoggerMessage::LoggerMessage(QString file, int line, QString function, QString type, QString group, QString msg, QString detailMessage)
     : mFile(std::move(file)), mFunction(std::move(function)), mType(std::move(type)), mLine(line),
@@ -56,7 +56,7 @@ QString LoggerMessage::function() const
 } // core
 
 
-QDebug operator<<(QDebug dbg, const core::LoggerMessage &message)
+QDebug operator<<(QDebug dbg, const serversdk::LoggerMessage &message)
 {
    dbg.nospace() << "message: " << message.message();
    dbg.nospace() << "next output not implemented: " << message.message();
diff --git a/src/serversdk/loggermessage.h b/src/serversdk/loggermessage.h
index cdef6d7..3c8cf17 100644
--- a/src/serversdk/loggermessage.h
+++ b/src/serversdk/loggermessage.h
@@ -3,7 +3,7 @@
 #include <QString>
 #include <QObject>
 
-namespace core {
+namespace serversdk {
 
 class LoggerMessage
 {
@@ -31,6 +31,6 @@ private:
 
 } // core
 
-QDebug operator<<(QDebug dbg, const core::LoggerMessage &message);
+QDebug operator<<(QDebug dbg, const serversdk::LoggerMessage &message);
 
-Q_DECLARE_METATYPE(core::LoggerMessage)
+Q_DECLARE_METATYPE(serversdk::LoggerMessage)
diff --git a/src/serversdk/request.cpp b/src/serversdk/request.cpp
index 4a5d849..b9a6527 100644
--- a/src/serversdk/request.cpp
+++ b/src/serversdk/request.cpp
@@ -4,7 +4,7 @@
 #include <QDebug>
 #include <utility>
 
-namespace core {
+namespace serversdk {
 
 
 Request::~Request()
diff --git a/src/serversdk/request.h b/src/serversdk/request.h
index cfbe617..5e77961 100644
--- a/src/serversdk/request.h
+++ b/src/serversdk/request.h
@@ -3,7 +3,7 @@
 #include <QString>
 #include <QNetworkRequest>
 
-namespace core {
+namespace serversdk {
 
 class Request : public QObject {
     Q_OBJECT
diff --git a/src/serversdk/requestmanager.cpp b/src/serversdk/requestmanager.cpp
index 0fde088..7a2442a 100644
--- a/src/serversdk/requestmanager.cpp
+++ b/src/serversdk/requestmanager.cpp
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace core {
+namespace serversdk {
 
 /**
  * @brief Wrapper around QNetworkAccessManger to handle soap protocol
diff --git a/src/serversdk/requestmanager.h b/src/serversdk/requestmanager.h
index ca90368..c0a993b 100644
--- a/src/serversdk/requestmanager.h
+++ b/src/serversdk/requestmanager.h
@@ -7,7 +7,7 @@
 
 #include <memory>
 
-namespace core {
+namespace serversdk {
 
 /**
  * @brief  Will download only ONE ITEM at a time
diff --git a/src/testapp/main.cpp b/src/testapp/main.cpp
index bae6db8..7f1b504 100644
--- a/src/testapp/main.cpp
+++ b/src/testapp/main.cpp
@@ -6,7 +6,7 @@
 
 int main(int argc, char *argv[])
 {
-    core::initAppLogger();
+    serversdk::initAppLogger();
 
     qCDebug(sdkcore) << "test message";
 
diff --git a/test/unittests/tst_request.cpp b/test/unittests/tst_request.cpp
index 878e2ad..035d4a4 100644
--- a/test/unittests/tst_request.cpp
+++ b/test/unittests/tst_request.cpp
@@ -2,7 +2,7 @@
 
 #include "serversdk/request.h"
 
-namespace core {
+namespace serversdk {
 
 void RequestTest::basicAuthorization_test()
 {
@@ -16,4 +16,4 @@ void RequestTest::basicAuthorization_test()
 
 }
 
-QTEST_APPLESS_MAIN(core::RequestTest)
+QTEST_APPLESS_MAIN(serversdk::RequestTest)
diff --git a/test/unittests/tst_request.h b/test/unittests/tst_request.h
index 6e83a15..d80fc68 100644
--- a/test/unittests/tst_request.h
+++ b/test/unittests/tst_request.h
@@ -3,7 +3,7 @@
 
 #include <QtTest/QtTest>
 
-namespace core {
+namespace serversdk {
 
 class RequestTest : public QObject
 {