From: Jan Cybulski <j.cybulski@samsung.com>
Date: Fri, 13 Jun 2014 09:22:08 +0000 (+0200)
Subject: Change namespace name to SecurityManager
X-Git-Tag: submit/tizen/20140618.161300~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aba196bd9f5fe7a6a53494098f05e1aee9297cc2;p=platform%2Fcore%2Fsecurity%2Fsecurity-manager.git

Change namespace name to SecurityManager

Change-Id: I43070c39da09a67895ec5eda17bf316ff352a6e7
Signed-off-by: Jan Cybulski <j.cybulski@samsung.com>
---

diff --git a/src/server/client/client-common.cpp b/src/server/client/client-common.cpp
index 679e00e5..e245414e 100644
--- a/src/server/client/client-common.cpp
+++ b/src/server/client/client-common.cpp
@@ -38,14 +38,14 @@
 
 #include <security-manager.h>
 
-IMPLEMENT_SAFE_SINGLETON(SecurityServer::Log::LogSystem);
+IMPLEMENT_SAFE_SINGLETON(SecurityManager::Log::LogSystem);
 
 namespace {
 
 const int POLL_TIMEOUT = 2000;
 
 void securityClientEnableLogSystem(void) {
-    SecurityServer::Singleton<SecurityServer::Log::LogSystem>::Instance().SetTag("SECURITY_SERVER_CLIENT");
+    SecurityManager::Singleton<SecurityManager::Log::LogSystem>::Instance().SetTag("SECURITY_MANAGER_CLIENT");
 }
 
 int waitForSocket(int sock, int event, int timeout) {
@@ -166,7 +166,7 @@ private:
 
 } // namespace anonymous
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 
 int sendToServer(char const * const interface, const RawBuffer &send, MessageBuffer &recv) {
@@ -267,7 +267,7 @@ int try_catch(const std::function<int()>& func)
     try {
         return func();
     } catch (MessageBuffer::Exception::Base &e) {
-        LogError("SecurityServer::MessageBuffer::Exception " << e.DumpToString());
+        LogError("SecurityManager::MessageBuffer::Exception " << e.DumpToString());
     } catch (std::exception &e) {
         LogError("STD exception " << e.what());
     } catch (...) {
@@ -276,7 +276,7 @@ int try_catch(const std::function<int()>& func)
     return SECURITY_MANAGER_API_ERROR_UNKNOWN;
 }
 
-} // namespace SecurityServer
+} // namespace SecurityMANAGER
 
 static void init_lib(void) __attribute__ ((constructor));
 static void init_lib(void)
diff --git a/src/server/client/client-common.h b/src/server/client/client-common.h
index 935bb2d2..7569f2f2 100644
--- a/src/server/client/client-common.h
+++ b/src/server/client/client-common.h
@@ -39,7 +39,7 @@ extern "C" {
     struct msghdr;
 }
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 typedef std::vector<unsigned char> RawBuffer;
 
@@ -61,6 +61,6 @@ int sendToServerAncData(char const * const interface, const RawBuffer &send, str
  */
 int try_catch(const std::function<int()>& func);
 
-} // namespace SecuritySever
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_CLIENT_
diff --git a/src/server/client/client-security-manager.cpp b/src/server/client/client-security-manager.cpp
index 0e5f4d8d..e83115d2 100644
--- a/src/server/client/client-security-manager.cpp
+++ b/src/server/client/client-security-manager.cpp
@@ -118,7 +118,7 @@ int security_manager_app_inst_req_add_path(app_inst_req *p_req, const char *path
 SECURITY_MANAGER_API
 int security_manager_app_install(const app_inst_req *p_req)
 {
-    using namespace SecurityServer;
+    using namespace SecurityManager;
     MessageBuffer send, recv;
 
     LogDebug("app_install() called");
@@ -157,7 +157,7 @@ int security_manager_app_install(const app_inst_req *p_req)
 SECURITY_MANAGER_API
 int security_manager_app_uninstall(const app_inst_req *p_req)
 {
-    using namespace SecurityServer;
+    using namespace SecurityManager;
     MessageBuffer send, recv;
 
     LogDebug("app_uninstall() called");
diff --git a/src/server/common/connection-info.h b/src/server/common/connection-info.h
index 946b5c8d..734ad69c 100644
--- a/src/server/common/connection-info.h
+++ b/src/server/common/connection-info.h
@@ -29,7 +29,7 @@
 #include <generic-socket-manager.h>
 #include <message-buffer.h>
 
-namespace SecurityServer
+namespace SecurityManager
 {
     struct ConnectionInfo {
         InterfaceID interfaceID;
@@ -37,6 +37,6 @@ namespace SecurityServer
     };
 
     typedef std::map<int, ConnectionInfo> ConnectionInfoMap;
-} //namespace SecurityServer
+} //namespace SecurityManager
 
 #endif //_CONNECTION_INFO_H_
diff --git a/src/server/common/message-buffer.cpp b/src/server/common/message-buffer.cpp
index 3fc090be..66d5b851 100644
--- a/src/server/common/message-buffer.cpp
+++ b/src/server/common/message-buffer.cpp
@@ -26,7 +26,7 @@
 
 #include <dpl/log/log.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 void MessageBuffer::Push(const RawBuffer &data) {
     m_buffer.AppendCopy(&data[0], data.size());
@@ -65,5 +65,5 @@ void MessageBuffer::Write(size_t num, const void *bytes) {
     m_buffer.AppendCopy(bytes, num);
 }
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
diff --git a/src/server/common/message-buffer.h b/src/server/common/message-buffer.h
index 850c7de8..ff115e0f 100644
--- a/src/server/common/message-buffer.h
+++ b/src/server/common/message-buffer.h
@@ -31,16 +31,16 @@
 #include <dpl/exception.h>
 #include <dpl/serialization.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 typedef std::vector<unsigned char> RawBuffer;
 
-class MessageBuffer : public SecurityServer::IStream {
+class MessageBuffer : public SecurityManager::IStream {
 public:
     class Exception
     {
     public:
-        DECLARE_EXCEPTION_TYPE(SecurityServer::Exception, Base)
+        DECLARE_EXCEPTION_TYPE(SecurityManager::Exception, Base)
         DECLARE_EXCEPTION_TYPE(Base, OutOfData)
     };
 
@@ -71,9 +71,9 @@ protected:
     }
 
     size_t m_bytesLeft;
-    SecurityServer::BinaryQueue m_buffer;
+    SecurityManager::BinaryQueue m_buffer;
 };
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_SOCKET_BUFFER_
diff --git a/src/server/common/protocols.cpp b/src/server/common/protocols.cpp
index 7bc95640..24bdae5c 100644
--- a/src/server/common/protocols.cpp
+++ b/src/server/common/protocols.cpp
@@ -26,7 +26,7 @@
 #include <cstddef>
 
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 #define SOCKET_PATH_PREFIX "/run/"
 #define SOCKET_PATH_PREFIX_SECURITY_MANAGER SOCKET_PATH_PREFIX "security-manager/"
@@ -34,5 +34,5 @@ namespace SecurityServer {
 char const * const SERVICE_SOCKET_INSTALLER =
         SOCKET_PATH_PREFIX_SECURITY_MANAGER "security-manager-installer.socket";
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
diff --git a/src/server/common/protocols.h b/src/server/common/protocols.h
index 7775ccd0..ed1c5a6b 100644
--- a/src/server/common/protocols.h
+++ b/src/server/common/protocols.h
@@ -36,7 +36,7 @@ struct app_inst_req {
     std::vector<std::pair<std::string, int>> appPaths;
 };
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 extern char const * const SERVICE_SOCKET_INSTALLER;
 
@@ -46,6 +46,6 @@ enum class SecurityModuleCall
     APP_UNINSTALL
 };
 
-} // namespace SecuritySever
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_PROTOCOLS_
diff --git a/src/server/common/smack-check.cpp b/src/server/common/smack-check.cpp
index 0e7bb5af..efc36d7f 100644
--- a/src/server/common/smack-check.cpp
+++ b/src/server/common/smack-check.cpp
@@ -5,7 +5,7 @@
 
 #include <dpl/log/log.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 int smack_runtime_check(void)
 {
@@ -31,4 +31,4 @@ int smack_check(void)
 #endif
 }
 
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/common/smack-check.h b/src/server/common/smack-check.h
index 875679ce..24578ae7 100644
--- a/src/server/common/smack-check.h
+++ b/src/server/common/smack-check.h
@@ -1,5 +1,5 @@
 /*
- *  security-server
+ *  security-manager
  *
  *  Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd All Rights Reserved
  *
@@ -21,7 +21,7 @@
 #ifndef _SMACK_CHECK_H_
 #define _SMACK_CHECK_H_
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 /*
  * A very simple runtime check for SMACK on the platform
@@ -37,6 +37,6 @@ int smack_runtime_check(void);
  */
 int smack_check(void);
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // _SMACK_CHECK_H_
diff --git a/src/server/dpl/core/include/dpl/assert.h b/src/server/dpl/core/include/dpl/assert.h
index a71704dc..a02aac94 100644
--- a/src/server/dpl/core/include/dpl/assert.h
+++ b/src/server/dpl/core/include/dpl/assert.h
@@ -24,7 +24,7 @@
 
 #include <dpl/noreturn.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 // Assertion handler procedure
 // Do not call directly
 // Always use Assert macro
@@ -32,9 +32,9 @@ SECURITYSERVER_NORETURN void AssertProc(const char *condition,
                              const char *file,
                              int line,
                              const char *function);
-} // namespace SecurityServer
+} // namespace SecurityManager
 
-#define Assert(Condition) do { if (!(Condition)) { SecurityServer::AssertProc(#Condition, \
+#define Assert(Condition) do { if (!(Condition)) { SecurityManager::AssertProc(#Condition, \
                                                                    __FILE__, \
                                                                    __LINE__, \
                                                                    __FUNCTION__); \
diff --git a/src/server/dpl/core/include/dpl/binary_queue.h b/src/server/dpl/core/include/dpl/binary_queue.h
index 387a71ae..e0077124 100644
--- a/src/server/dpl/core/include/dpl/binary_queue.h
+++ b/src/server/dpl/core/include/dpl/binary_queue.h
@@ -28,7 +28,7 @@
 #include <memory>
 #include <list>
 
-namespace SecurityServer {
+namespace SecurityManager {
 /**
  * Binary queue auto pointer
  */
@@ -47,7 +47,7 @@ class BinaryQueue
     class Exception
     {
       public:
-        DECLARE_EXCEPTION_TYPE(SecurityServer::Exception, Base)
+        DECLARE_EXCEPTION_TYPE(SecurityManager::Exception, Base)
         DECLARE_EXCEPTION_TYPE(Base, OutOfData)
     };
 
@@ -293,6 +293,6 @@ class BinaryQueue
     virtual size_t Write(const BinaryQueue &buffer, size_t bufferSize);
 };
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // SECURITY_SERVER_BINARY_QUEUE_H
diff --git a/src/server/dpl/core/include/dpl/colors.h b/src/server/dpl/core/include/dpl/colors.h
index 37ce9408..69136d17 100644
--- a/src/server/dpl/core/include/dpl/colors.h
+++ b/src/server/dpl/core/include/dpl/colors.h
@@ -24,7 +24,7 @@
 #ifndef SECURITY_SERVER_COLORS_H
 #define SECURITY_SERVER_COLORS_H
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Colors {
 namespace Text {
 extern const char* BOLD_GREEN_BEGIN;
@@ -68,6 +68,6 @@ extern const char* BOLD_WHITE_BEGIN;
 extern const char* BOLD_WHITE_END;
 } //namespace Html
 } //namespace Colors
-} //namespace SecurityServer
+} //namespace SecurityManager
 
 #endif /* SECURITY_SERVER_COLORS_H */
diff --git a/src/server/dpl/core/include/dpl/exception.h b/src/server/dpl/core/include/dpl/exception.h
index ff8d3008..f9c2cf2f 100644
--- a/src/server/dpl/core/include/dpl/exception.h
+++ b/src/server/dpl/core/include/dpl/exception.h
@@ -29,7 +29,7 @@
 #include <cstdlib>
 #include <sstream>
 
-namespace SecurityServer {
+namespace SecurityManager {
 void LogUnhandledException(const std::string &str);
 void LogUnhandledException(const std::string &str,
                            const char *filename,
@@ -37,7 +37,7 @@ void LogUnhandledException(const std::string &str,
                            const char *function);
 }
 
-namespace SecurityServer {
+namespace SecurityManager {
 class Exception
 {
   private:
@@ -287,7 +287,7 @@ class Exception
         return m_className;
     }
 };
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #define Try try
 
@@ -332,7 +332,7 @@ class Exception
         Class(const char *path, \
               const char *function, \
               int line, \
-              const SecurityServer::Exception & reason, \
+              const SecurityManager::Exception & reason, \
               const std::string & message = std::string()) :                                                                                                                             \
             BaseClass(path, function, line, reason, message)                                                                            \
         {                                                                                                                                 \
@@ -343,11 +343,11 @@ class Exception
 #define UNHANDLED_EXCEPTION_HANDLER_BEGIN try
 
 #define UNHANDLED_EXCEPTION_HANDLER_END                                                                   \
-    catch (const SecurityServer::Exception &exception)                                                               \
+    catch (const SecurityManager::Exception &exception)                                                               \
     {                                                                                                     \
         std::ostringstream msg;                                                                           \
-        msg << SecurityServer::Exception::KnownExceptionToString(exception);                                         \
-        SecurityServer::LogUnhandledException(msg.str(), __FILE__, __LINE__, __FUNCTION__);                          \
+        msg << SecurityManager::Exception::KnownExceptionToString(exception);                                         \
+        SecurityManager::LogUnhandledException(msg.str(), __FILE__, __LINE__, __FUNCTION__);                          \
         abort();                                                                                          \
     }                                                                                                     \
     catch (std::exception& e)                                                                             \
@@ -355,19 +355,19 @@ class Exception
         std::ostringstream msg;                                                                           \
         msg << e.what();                                                                                  \
         msg << "\n";                                                                                      \
-        msg << SecurityServer::Exception::UnknownExceptionToString();                                                \
-        SecurityServer::LogUnhandledException(msg.str(), __FILE__, __LINE__, __FUNCTION__);                          \
+        msg << SecurityManager::Exception::UnknownExceptionToString();                                                \
+        SecurityManager::LogUnhandledException(msg.str(), __FILE__, __LINE__, __FUNCTION__);                          \
         abort();                                                                                          \
     }                                                                                                     \
     catch (...)                                                                                           \
     {                                                                                                     \
         std::ostringstream msg;                                                                           \
-        msg << SecurityServer::Exception::UnknownExceptionToString();                                                \
-        SecurityServer::LogUnhandledException(msg.str(), __FILE__, __LINE__, __FUNCTION__);                          \
+        msg << SecurityManager::Exception::UnknownExceptionToString();                                                \
+        SecurityManager::LogUnhandledException(msg.str(), __FILE__, __LINE__, __FUNCTION__);                          \
         abort();                                                                                          \
     }
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace CommonException {
 /**
  * Internal exception definitions
diff --git a/src/server/dpl/core/include/dpl/noncopyable.h b/src/server/dpl/core/include/dpl/noncopyable.h
index dae75e83..8f20bbc0 100644
--- a/src/server/dpl/core/include/dpl/noncopyable.h
+++ b/src/server/dpl/core/include/dpl/noncopyable.h
@@ -22,7 +22,7 @@
 #ifndef SECURITYSERVER_NONCOPYABLE_H
 #define SECURITYSERVER_NONCOPYABLE_H
 
-namespace SecurityServer {
+namespace SecurityManager {
 class Noncopyable
 {
   private:
@@ -33,6 +33,6 @@ class Noncopyable
     Noncopyable();
     virtual ~Noncopyable();
 };
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // SECURITYSERVER_NONCOPYABLE_H
diff --git a/src/server/dpl/core/include/dpl/serialization.h b/src/server/dpl/core/include/dpl/serialization.h
index 0c60c4e1..bb6602c4 100644
--- a/src/server/dpl/core/include/dpl/serialization.h
+++ b/src/server/dpl/core/include/dpl/serialization.h
@@ -28,7 +28,7 @@
 #include <map>
 #include <memory>
 
-namespace SecurityServer {
+namespace SecurityManager {
 // Abstract data stream buffer
 class IStream
 {
@@ -393,6 +393,6 @@ struct Deserialization {
         Deserialize(stream, *map);
     }
 }; // struct Deserialization
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // SERIALIZATION_H
diff --git a/src/server/dpl/core/include/dpl/singleton.h b/src/server/dpl/core/include/dpl/singleton.h
index b46104f7..f089107b 100644
--- a/src/server/dpl/core/include/dpl/singleton.h
+++ b/src/server/dpl/core/include/dpl/singleton.h
@@ -22,7 +22,7 @@
 #ifndef SECURITYSERVER_SINGLETON_H
 #define SECURITYSERVER_SINGLETON_H
 
-namespace SecurityServer {
+namespace SecurityManager {
 template<typename Class>
 class Singleton :
     private Class
@@ -46,6 +46,6 @@ class Singleton :
 
     static Class &Instance();
 };
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // SECURITYSERVER_SINGLETON_H
diff --git a/src/server/dpl/core/include/dpl/singleton_impl.h b/src/server/dpl/core/include/dpl/singleton_impl.h
index 31c054fd..00cdbde3 100644
--- a/src/server/dpl/core/include/dpl/singleton_impl.h
+++ b/src/server/dpl/core/include/dpl/singleton_impl.h
@@ -30,7 +30,7 @@
  * singleton_safe_impl.h if possible.
  */
 
-namespace SecurityServer {
+namespace SecurityManager {
 template<typename Class>
 Singleton<Class>& Singleton<Class>::InternalInstance()
 {
@@ -44,10 +44,10 @@ Class &Singleton<Class>::Instance()
     Singleton<Class>& instance = Singleton<Class>::InternalInstance();
     return instance;
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #define IMPLEMENT_SINGLETON(Type)                                           \
-    template SecurityServer::Singleton<Type>&SecurityServer::Singleton<Type>::InternalInstance();    \
-    template Type & SecurityServer::Singleton<Type>::Instance();                            \
+    template SecurityManager::Singleton<Type>&SecurityManager::Singleton<Type>::InternalInstance();    \
+    template Type & SecurityManager::Singleton<Type>::Instance();                            \
 
 #endif // SECURITYSERVER_SINGLETON_IMPL_H
diff --git a/src/server/dpl/core/include/dpl/singleton_safe_impl.h b/src/server/dpl/core/include/dpl/singleton_safe_impl.h
index abef281b..feeb30be 100644
--- a/src/server/dpl/core/include/dpl/singleton_safe_impl.h
+++ b/src/server/dpl/core/include/dpl/singleton_safe_impl.h
@@ -23,7 +23,7 @@
 #define SECURITYSERVER_SINGLETON_SAFE_IMPL_H
 
 #define IMPLEMENT_SAFE_SINGLETON(Class)                                        \
-    namespace SecurityServer {                                                                \
+    namespace SecurityManager {                                                    \
     template<>                                                                     \
     Singleton<Class>&Singleton<Class>::InternalInstance()                         \
     {                                                                              \
@@ -40,6 +40,6 @@
                                                                                \
     template Singleton<Class>&Singleton<Class>::InternalInstance();               \
     template Class & Singleton<Class>::Instance();                                  \
-    } // namespace SecurityServer
+    } // namespace SecurityManager
 
 #endif // SECURITYSERVER_SINGLETON_SAFE_IMPL_H
diff --git a/src/server/dpl/core/src/assert.cpp b/src/server/dpl/core/src/assert.cpp
index 440b03a6..ba1cecca 100644
--- a/src/server/dpl/core/src/assert.cpp
+++ b/src/server/dpl/core/src/assert.cpp
@@ -26,7 +26,7 @@
 #include <dpl/exception.h>
 #include <cstdlib>
 
-namespace SecurityServer {
+namespace SecurityManager {
 void AssertProc(const char *condition,
                 const char *file,
                 int line,
@@ -37,7 +37,7 @@ void AssertProc(const char *condition,
     {                                                                  \
         std::ostringstream platformLog;                                \
         platformLog << message;                                        \
-        SecurityServer::Log::LogSystemSingleton::Instance().Pedantic(             \
+        SecurityManager::Log::LogSystemSingleton::Instance().Pedantic(             \
             platformLog.str().c_str(),                                 \
             __FILE__, __LINE__, __FUNCTION__);                         \
     } \
@@ -65,4 +65,4 @@ void AssertProc(const char *condition,
     // Fail with c-library abort
     abort();
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/dpl/core/src/binary_queue.cpp b/src/server/dpl/core/src/binary_queue.cpp
index be0c65d4..72817a67 100644
--- a/src/server/dpl/core/src/binary_queue.cpp
+++ b/src/server/dpl/core/src/binary_queue.cpp
@@ -27,7 +27,7 @@
 #include <cstring>
 #include <new>
 
-namespace SecurityServer {
+namespace SecurityManager {
 BinaryQueue::BinaryQueue() :
     m_size(0)
 {}
@@ -314,4 +314,4 @@ size_t BinaryQueue::Write(const BinaryQueue &buffer, size_t bufferSize)
     AppendCopyFrom(buffer);
     return bufferSize;
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/dpl/core/src/colors.cpp b/src/server/dpl/core/src/colors.cpp
index 6563a26c..3682668d 100644
--- a/src/server/dpl/core/src/colors.cpp
+++ b/src/server/dpl/core/src/colors.cpp
@@ -23,7 +23,7 @@
 #include <stddef.h>
 #include <dpl/colors.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Colors {
 namespace Text {
 const char* BOLD_GREEN_BEGIN = "\033[1;32m";
@@ -67,4 +67,4 @@ const char* BOLD_WHITE_BEGIN = "<font color=\"white\"><b>";
 const char* BOLD_WHITE_END = "</b></font>";
 } //namespace Html
 } //namespace Colors
-} //namespace SecurityServer
+} //namespace SecurityManager
diff --git a/src/server/dpl/core/src/exception.cpp b/src/server/dpl/core/src/exception.cpp
index d1635bc7..211a69f6 100644
--- a/src/server/dpl/core/src/exception.cpp
+++ b/src/server/dpl/core/src/exception.cpp
@@ -24,7 +24,7 @@
 #include <dpl/log/log.h>
 #include <cstdio>
 
-namespace SecurityServer {
+namespace SecurityManager {
 Exception* Exception::m_lastException = NULL;
 unsigned int Exception::m_exceptionCount = 0;
 void (*Exception::m_terminateHandler)() = NULL;
@@ -51,7 +51,7 @@ void LogUnhandledException(const std::string &str,
     printf("%s\n", msg.str().c_str());
 
     // Logging to dlog
-    SecurityServer::Log::LogSystemSingleton::Instance().Error(
+    SecurityManager::Log::LogSystemSingleton::Instance().Error(
         str.c_str(), filename, line, function);
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/dpl/core/src/noncopyable.cpp b/src/server/dpl/core/src/noncopyable.cpp
index c58e25ae..e3a09874 100644
--- a/src/server/dpl/core/src/noncopyable.cpp
+++ b/src/server/dpl/core/src/noncopyable.cpp
@@ -22,10 +22,10 @@
 #include <stddef.h>
 #include <dpl/noncopyable.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 Noncopyable::Noncopyable()
 {}
 
 Noncopyable::~Noncopyable()
 {}
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/dpl/log/include/dpl/log/abstract_log_provider.h b/src/server/dpl/log/include/dpl/log/abstract_log_provider.h
index 76799243..04a000f1 100644
--- a/src/server/dpl/log/include/dpl/log/abstract_log_provider.h
+++ b/src/server/dpl/log/include/dpl/log/abstract_log_provider.h
@@ -22,7 +22,7 @@
 #ifndef SECURITYSERVER_ABSTRACT_LOG_PROVIDER_H
 #define SECURITYSERVER_ABSTRACT_LOG_PROVIDER_H
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 class AbstractLogProvider
 {
@@ -76,6 +76,6 @@ class AbstractLogProvider
     static const char *LocateSourceFileName(const char *filename);
 };
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // SECURITYSERVER_ABSTRACT_LOG_PROVIDER_H
diff --git a/src/server/dpl/log/include/dpl/log/audit-smack-log.h b/src/server/dpl/log/include/dpl/log/audit-smack-log.h
index 912ad539..98fdc15f 100644
--- a/src/server/dpl/log/include/dpl/log/audit-smack-log.h
+++ b/src/server/dpl/log/include/dpl/log/audit-smack-log.h
@@ -33,7 +33,7 @@
 #include <memory>
 #include <functional>
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 
 class AuditSmackLog :
@@ -110,5 +110,5 @@ private:
 };
 
 }  // namespace Log
-}  // namespace SecurityServer
+}  // namespace SecurityManager
 #endif  // _AUDIT_SMACK_LOG_
diff --git a/src/server/dpl/log/include/dpl/log/dlog_log_provider.h b/src/server/dpl/log/include/dpl/log/dlog_log_provider.h
index cd76c466..1d80ff75 100644
--- a/src/server/dpl/log/include/dpl/log/dlog_log_provider.h
+++ b/src/server/dpl/log/include/dpl/log/dlog_log_provider.h
@@ -26,7 +26,7 @@
 #include <memory>
 #include <string>
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 class DLOGLogProvider :
     public AbstractLogProvider
@@ -89,6 +89,6 @@ class DLOGLogProvider :
 };
 
 } // namespace Log
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // SECURITYSERVER_DLOG_LOG_PROVIDER_H
diff --git a/src/server/dpl/log/include/dpl/log/log.h b/src/server/dpl/log/include/dpl/log/log.h
index 9d8403a6..e8f3665e 100644
--- a/src/server/dpl/log/include/dpl/log/log.h
+++ b/src/server/dpl/log/include/dpl/log/log.h
@@ -28,7 +28,7 @@
 #include <sstream>
 #include <list>
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 /**
  * SecurityServer log system
@@ -168,7 +168,7 @@ class NullStream
  */
 typedef Singleton<LogSystem> LogSystemSingleton;
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 //
 // Log support
@@ -178,18 +178,18 @@ typedef Singleton<LogSystem> LogSystemSingleton;
 /* avoid warnings about unused variables */
 #define DPL_MACRO_DUMMY_LOGGING(message, function)                         \
     do {                                                                   \
-        SecurityServer::Log::NullStream ns;                                \
+        SecurityManager::Log::NullStream ns;                                \
         ns << message;                                                     \
     } while (0)
 
 #define DPL_MACRO_FOR_LOGGING(message, function)                           \
 do                                                                         \
 {                                                                          \
-    if (SecurityServer::Log::LogSystemSingleton::Instance().IsLoggingEnabled())   \
+    if (SecurityManager::Log::LogSystemSingleton::Instance().IsLoggingEnabled())   \
     {                                                                      \
         std::ostringstream platformLog;                                    \
         platformLog << message;                                            \
-        SecurityServer::Log::LogSystemSingleton::Instance().function(      \
+        SecurityManager::Log::LogSystemSingleton::Instance().function(      \
             platformLog.str().c_str(),                                     \
             __FILE__, __LINE__, __FUNCTION__);                             \
     }                                                                      \
diff --git a/src/server/dpl/log/include/dpl/log/old_style_log_provider.h b/src/server/dpl/log/include/dpl/log/old_style_log_provider.h
index 91eeb804..60b8cf90 100644
--- a/src/server/dpl/log/include/dpl/log/old_style_log_provider.h
+++ b/src/server/dpl/log/include/dpl/log/old_style_log_provider.h
@@ -25,7 +25,7 @@
 #include <dpl/log/abstract_log_provider.h>
 #include <string>
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 class OldStyleLogProvider :
     public AbstractLogProvider
@@ -99,6 +99,6 @@ class OldStyleLogProvider :
                       const char *function);
 };
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // SECURITYSERVER_OLD_STYLE_LOG_PROVIDER_H
diff --git a/src/server/dpl/log/src/abstract_log_provider.cpp b/src/server/dpl/log/src/abstract_log_provider.cpp
index 1da7bba1..5b7574cc 100644
--- a/src/server/dpl/log/src/abstract_log_provider.cpp
+++ b/src/server/dpl/log/src/abstract_log_provider.cpp
@@ -25,7 +25,7 @@
 
 #define UNUSED __attribute__((unused))
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 
 void AbstractLogProvider::SetTag(const char *tag UNUSED) {}
diff --git a/src/server/dpl/log/src/audit-smack-log.cpp b/src/server/dpl/log/src/audit-smack-log.cpp
index 8960b516..1d03b6f4 100644
--- a/src/server/dpl/log/src/audit-smack-log.cpp
+++ b/src/server/dpl/log/src/audit-smack-log.cpp
@@ -53,7 +53,7 @@ const std::string AUDIT_LOG_SMACK_LABEL = "security-manager::audit-files";
 
 } // namespace anonymous
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 
 AuditSmackLog::AuditSmackLog()
@@ -307,4 +307,4 @@ void AuditSmackLog::SecureError(const char *message UNUSED,
 }
 
 } // namespace Log
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/dpl/log/src/dlog_log_provider.cpp b/src/server/dpl/log/src/dlog_log_provider.cpp
index ffe23da3..c96dfd05 100644
--- a/src/server/dpl/log/src/dlog_log_provider.cpp
+++ b/src/server/dpl/log/src/dlog_log_provider.cpp
@@ -27,7 +27,7 @@
 
 #define UNUSED __attribute__((unused))
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 std::string DLOGLogProvider::FormatMessage(const char *message,
                                            const char *filename,
@@ -149,4 +149,4 @@ void DLOGLogProvider::SmackAudit(const char *message UNUSED,
 }
 
 } // nemespace Log
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/dpl/log/src/log.cpp b/src/server/dpl/log/src/log.cpp
index ef67fb27..0b1a5288 100644
--- a/src/server/dpl/log/src/log.cpp
+++ b/src/server/dpl/log/src/log.cpp
@@ -28,9 +28,9 @@
 #include <dpl/log/old_style_log_provider.h>
 #include <dpl/log/audit-smack-log.h>
 
-IMPLEMENT_SINGLETON(SecurityServer::Log::LogSystem)
+IMPLEMENT_SINGLETON(SecurityManager::Log::LogSystem)
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 namespace // anonymous
 {
@@ -291,4 +291,4 @@ void LogSystem::SmackAudit(const char *message,
 }
 
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/dpl/log/src/old_style_log_provider.cpp b/src/server/dpl/log/src/old_style_log_provider.cpp
index 4c107492..b3ea65a4 100644
--- a/src/server/dpl/log/src/old_style_log_provider.cpp
+++ b/src/server/dpl/log/src/old_style_log_provider.cpp
@@ -29,11 +29,11 @@
 #include <unistd.h>
 #include <dlog.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 namespace Log {
 namespace // anonymous
 {
-using namespace SecurityServer::Colors::Text;
+using namespace SecurityManager::Colors::Text;
 const char *DEBUG_BEGIN = GREEN_BEGIN;
 const char *DEBUG_END = GREEN_END;
 const char *INFO_BEGIN = CYAN_BEGIN;
@@ -310,4 +310,4 @@ void OldStyleLogProvider::SmackAudit(const char *message,
 }
 
 }
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/main/generic-event.h b/src/server/main/generic-event.h
index 30d9e88b..8e70ae38 100644
--- a/src/server/main/generic-event.h
+++ b/src/server/main/generic-event.h
@@ -25,12 +25,12 @@
 #ifndef _SECURITY_SERVER_GENERIC_EVENT_
 #define _SECURITY_SERVER_GENERIC_EVENT_
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 struct GenericEvent {
     virtual ~GenericEvent(){}
 };
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_GENERIC_EVENT_
diff --git a/src/server/main/generic-socket-manager.cpp b/src/server/main/generic-socket-manager.cpp
index 5bf06950..1e6bc5ef 100644
--- a/src/server/main/generic-socket-manager.cpp
+++ b/src/server/main/generic-socket-manager.cpp
@@ -27,7 +27,7 @@
 
 #include <generic-socket-manager.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 class SendMsgData::Internal {
 public:
@@ -112,5 +112,5 @@ int SendMsgData::flags() {
     return m_flags;
 }
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
diff --git a/src/server/main/generic-socket-manager.h b/src/server/main/generic-socket-manager.h
index 4417a30e..8603eabf 100644
--- a/src/server/main/generic-socket-manager.h
+++ b/src/server/main/generic-socket-manager.h
@@ -36,7 +36,7 @@ extern "C" {
 struct msghdr;
 } // extern "C"
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 typedef int InterfaceID;
 
@@ -138,6 +138,6 @@ struct GenericSocketManager {
     virtual ~GenericSocketManager(){}
 };
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_GENERIC_SERVICE_MANAGER_
diff --git a/src/server/main/security-manager-util.cpp b/src/server/main/security-manager-util.cpp
index b0febfaf..030c5ca1 100644
--- a/src/server/main/security-manager-util.cpp
+++ b/src/server/main/security-manager-util.cpp
@@ -33,7 +33,7 @@ namespace {
 const size_t SIZE_T_MAX = std::numeric_limits<size_t>::max();
 } // namespace anonymous
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 int util_smack_label_is_valid(const char *smack_label)
 {
@@ -112,5 +112,5 @@ char *read_exe_path_from_proc(pid_t pid)
     return exe;
 }
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
diff --git a/src/server/main/security-manager-util.h b/src/server/main/security-manager-util.h
index 3bb37d49..611696e9 100644
--- a/src/server/main/security-manager-util.h
+++ b/src/server/main/security-manager-util.h
@@ -24,11 +24,11 @@
 
 #include <sys/types.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 int util_smack_label_is_valid(const char *smack_label);
 char *read_exe_path_from_proc(pid_t pid);
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif /*SECURITY_SERVER_UTIL_H*/
diff --git a/src/server/main/server2-main.cpp b/src/server/main/server2-main.cpp
index 42f72e7c..0111e42e 100644
--- a/src/server/main/server2-main.cpp
+++ b/src/server/main/server2-main.cpp
@@ -33,13 +33,13 @@
 
 #include <installer.h>
 
-IMPLEMENT_SAFE_SINGLETON(SecurityServer::Log::LogSystem);
+IMPLEMENT_SAFE_SINGLETON(SecurityManager::Log::LogSystem);
 
 #define REGISTER_SOCKET_SERVICE(manager, service) \
     registerSocketService<service>(manager, #service)
 
 template<typename T>
-void registerSocketService(SecurityServer::SocketManager &manager, const std::string& serviceName)
+void registerSocketService(SecurityManager::SocketManager &manager, const std::string& serviceName)
 {
     T *service = NULL;
     try {
@@ -47,7 +47,7 @@ void registerSocketService(SecurityServer::SocketManager &manager, const std::st
         service->Create();
         manager.RegisterSocketService(service);
         service = NULL;
-    } catch (const SecurityServer::Exception &exception) {
+    } catch (const SecurityManager::Exception &exception) {
         LogError("Error in creating service " << serviceName <<
                  ", details:\n" << exception.DumpToString());
     } catch (const std::exception& e) {
@@ -65,16 +65,16 @@ int main(void) {
 
     UNHANDLED_EXCEPTION_HANDLER_BEGIN
     {
-        SecurityServer::Singleton<SecurityServer::Log::LogSystem>::Instance().SetTag("SECURITY_SERVER");
+        SecurityManager::Singleton<SecurityManager::Log::LogSystem>::Instance().SetTag("SECURITY_MANAGER");
 
         // This provider may be used in security-server only.
         // If we add it inside LogSystem constructor it also
         // will be used by security-server-client library.
-        SecurityServer::Log::AuditSmackLog *smackLog = new SecurityServer::Log::AuditSmackLog;
+        SecurityManager::Log::AuditSmackLog *smackLog = new SecurityManager::Log::AuditSmackLog;
         if (smackLog->Fail())
             delete smackLog;
         else
-            SecurityServer::Singleton<SecurityServer::Log::LogSystem>::Instance().AddProvider(smackLog);
+            SecurityManager::Singleton<SecurityManager::Log::LogSystem>::Instance().AddProvider(smackLog);
 
         sigset_t mask;
         sigemptyset(&mask);
@@ -86,9 +86,9 @@ int main(void) {
         }
 
         LogInfo("Start!");
-        SecurityServer::SocketManager manager;
+        SecurityManager::SocketManager manager;
 
-        REGISTER_SOCKET_SERVICE(manager, SecurityServer::InstallerService);
+        REGISTER_SOCKET_SERVICE(manager, SecurityManager::InstallerService);
 
         manager.MainLoop();
     }
diff --git a/src/server/main/service-thread.h b/src/server/main/service-thread.h
index e5989e64..71c6e3fe 100644
--- a/src/server/main/service-thread.h
+++ b/src/server/main/service-thread.h
@@ -40,7 +40,7 @@
 
 #define DEFINE_THREAD_EVENT(eventType)                                \
     void Event(const eventType &event) {                              \
-        SecurityServer::ServiceThread<ParentClassName>::              \
+        SecurityManager::ServiceThread<ParentClassName>::              \
             Event(event,                                              \
                   this,                                               \
                   &ParentClassName::EventInternal##eventType);        \
@@ -49,13 +49,13 @@
 
 #define DECLARE_THREAD_EVENT(eventType, methodName)                   \
     void Event(const eventType &event) {                              \
-        SecurityServer::ServiceThread<ParentClassName>::              \
+        SecurityManager::ServiceThread<ParentClassName>::              \
             Event(event,                                              \
                   this,                                               \
                   &ParentClassName::methodName);                      \
     }
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 template <class Service>
 class ServiceThread {
@@ -172,6 +172,6 @@ protected:
     bool m_quit;
 };
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_SERVICE_THREAD_
diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
index e7d2f3f9..c9f497bf 100644
--- a/src/server/main/socket-manager.cpp
+++ b/src/server/main/socket-manager.cpp
@@ -52,7 +52,7 @@ const time_t SOCKET_TIMEOUT = 20;
 
 } // namespace anonymous
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 struct DummyService : public GenericSocketService {
     ServiceDescriptionVector GetServiceDescription() {
@@ -728,4 +728,4 @@ void SocketManager::CloseSocket(int sock) {
     FD_CLR(sock, &m_writeSet);
 }
 
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/main/socket-manager.h b/src/server/main/socket-manager.h
index b7b733c2..fdc6516d 100644
--- a/src/server/main/socket-manager.h
+++ b/src/server/main/socket-manager.h
@@ -35,13 +35,13 @@
 
 #include <generic-socket-manager.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 class SocketManager : public GenericSocketManager {
 public:
     class Exception {
     public:
-        DECLARE_EXCEPTION_TYPE(SecurityServer::Exception, Base)
+        DECLARE_EXCEPTION_TYPE(SecurityManager::Exception, Base)
         DECLARE_EXCEPTION_TYPE(Base, InitFailed)
     };
     SocketManager();
@@ -130,6 +130,6 @@ protected:
     std::priority_queue<Timeout> m_timeoutQueue;
 };
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_SOCKET_MANAGER_
diff --git a/src/server/service/installer.cpp b/src/server/service/installer.cpp
index 0445c786..20829fdd 100644
--- a/src/server/service/installer.cpp
+++ b/src/server/service/installer.cpp
@@ -41,7 +41,7 @@
 #include "smack-rules.h"
 #include "security-manager-common.h"
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 namespace {
 
@@ -507,4 +507,4 @@ bool InstallerService::processAppUninstall(MessageBuffer &buffer, MessageBuffer
     return true;
 }
 
-} // namespace SecurityServer
+} // namespace SecurityManager
diff --git a/src/server/service/installer.h b/src/server/service/installer.h
index 45c95f60..43bf1db6 100644
--- a/src/server/service/installer.h
+++ b/src/server/service/installer.h
@@ -29,18 +29,18 @@
 #include <message-buffer.h>
 #include <connection-info.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 class InstallerException
 {
 public:
-    DECLARE_EXCEPTION_TYPE(SecurityServer::Exception, Base)
+    DECLARE_EXCEPTION_TYPE(SecurityManager::Exception, Base)
     DECLARE_EXCEPTION_TYPE(Base, InvalidAction)
 };
 
 class InstallerService :
-    public SecurityServer::GenericSocketService,
-    public SecurityServer::ServiceThread<InstallerService>
+    public SecurityManager::GenericSocketService,
+    public SecurityManager::ServiceThread<InstallerService>
 {
 public:
     InstallerService();
@@ -90,6 +90,6 @@ private:
     bool processAppUninstall(MessageBuffer &buffer, MessageBuffer &send);
 };
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif // _SECURITY_SERVER_INSTALLER_
diff --git a/src/server/service/smack-common.cpp b/src/server/service/smack-common.cpp
index 4eb59073..dcb14bb6 100644
--- a/src/server/service/smack-common.cpp
+++ b/src/server/service/smack-common.cpp
@@ -9,7 +9,7 @@
 
 #include <smack-check.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 int get_smack_label_from_process(pid_t pid, char *smack_label)
 {
@@ -114,5 +114,5 @@ int smack_pid_have_access(pid_t pid,
 
 
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
diff --git a/src/server/service/smack-common.h b/src/server/service/smack-common.h
index 49698b64..fd12ecc4 100644
--- a/src/server/service/smack-common.h
+++ b/src/server/service/smack-common.h
@@ -3,11 +3,11 @@
 
 #include <sys/types.h>
 
-namespace SecurityServer {
+namespace SecurityManager {
 
 int get_smack_label_from_process(pid_t pid, char *smack_label);
 int smack_pid_have_access(pid_t pid, const char *object, const char *access_type);
 
-} // namespace SecurityServer
+} // namespace SecurityManager
 
 #endif