diff --git a/app/cc_view/src/GuiAppMgr.h b/app/cc_view/src/GuiAppMgr.h
index 30d2319..e90913b 100644
--- a/app/cc_view/src/GuiAppMgr.h
+++ b/app/cc_view/src/GuiAppMgr.h
@@ -62,7 +62,7 @@ class GuiAppMgr : public QObject
         RecvListMode_ApplyFilter = 1U << 3
     };
 
-    using MsgType = MsgMgr::MsgType ;
+    using MsgType = ToolsMsgMgr::MsgType;
     using ActionPtr = std::shared_ptr<QAction>;
     using ListOfPluginInfos = PluginMgr::ListOfPluginInfos;
     using MessagesList = ToolsProtocol::MessagesList;
diff --git a/app/cc_view/src/MsgMgrG.cpp b/app/cc_view/src/MsgMgrG.cpp
index 5a553c3..f5efbb7 100644
--- a/app/cc_view/src/MsgMgrG.cpp
+++ b/app/cc_view/src/MsgMgrG.cpp
@@ -17,5 +17,5 @@
 
 #include "MsgMgrG.h"
 
-template class cc_tools_qt::ToolsStaticSingleton<cc_tools_qt::MsgMgr>;
+template class cc_tools_qt::ToolsStaticSingleton<cc_tools_qt::ToolsMsgMgr>;
 
diff --git a/app/cc_view/src/MsgMgrG.h b/app/cc_view/src/MsgMgrG.h
index 9e9e60b..dfdb587 100644
--- a/app/cc_view/src/MsgMgrG.h
+++ b/app/cc_view/src/MsgMgrG.h
@@ -21,16 +21,16 @@
 #pragma once
 
 #include "cc_tools_qt/ToolsStaticSingleton.h"
-#include "cc_tools_qt/MsgMgr.h"
+#include "cc_tools_qt/ToolsMsgMgr.h"
 
 namespace cc_tools_qt
 {
 
-using MsgMgrG = ToolsStaticSingleton<MsgMgr>;
+using MsgMgrG = ToolsStaticSingleton<ToolsMsgMgr>;
 
 }  // namespace cc_tools_qt
 
-extern template class cc_tools_qt::ToolsStaticSingleton<cc_tools_qt::MsgMgr>;
+extern template class cc_tools_qt::ToolsStaticSingleton<cc_tools_qt::ToolsMsgMgr>;
 
 
 
diff --git a/lib/include/cc_tools_qt/MsgMgr.h b/lib/include/cc_tools_qt/ToolsMsgMgr.h
similarity index 76%
rename from lib/include/cc_tools_qt/MsgMgr.h
rename to lib/include/cc_tools_qt/ToolsMsgMgr.h
index cdfc94f..e35ad0d 100644
--- a/lib/include/cc_tools_qt/MsgMgr.h
+++ b/lib/include/cc_tools_qt/ToolsMsgMgr.h
@@ -32,17 +32,15 @@
 namespace cc_tools_qt
 {
 
-class MsgMgrImpl;
-class CC_TOOLS_API MsgMgr
+class ToolsMsgMgrImpl;
+class CC_TOOLS_API ToolsMsgMgr
 {
 public:
-    typedef std::list<ToolsMessagePtr> AllMessages;
-    typedef ToolsProtocol::MessagesList MessagesList;
+    using MessagesList = ToolsProtocol::MessagesList;
+    using MsgType = ToolsMessage::Type;
 
-    typedef ToolsMessage::Type MsgType;
-
-    MsgMgr();
-    ~MsgMgr() noexcept;
+    ToolsMsgMgr();
+    ~ToolsMsgMgr() noexcept;
 
     void start();
     void stop();
@@ -58,23 +56,23 @@ class CC_TOOLS_API MsgMgr
 
     void sendMsgs(MessagesList&& msgs);
 
-    const AllMessages& getAllMsgs() const;
+    const MessagesList& getAllMsgs() const;
     void addMsgs(const MessagesList& msgs, bool reportAdded = true);
 
     void setSocket(ToolsSocketPtr socket);
     void setProtocol(ToolsProtocolPtr protocol);
     void addFilter(ToolsFilterPtr filter);
 
-    typedef std::function<void (ToolsMessagePtr msg)> MsgAddedCallbackFunc;
-    typedef std::function<void (const QString& error)> ErrorReportCallbackFunc;
-    typedef std::function<void (bool connected)> SocketConnectionStatusReportCallbackFunc;
+    using MsgAddedCallbackFunc = std::function<void (ToolsMessagePtr msg)>;
+    using ErrorReportCallbackFunc = std::function<void (const QString& error)>;
+    using SocketConnectionStatusReportCallbackFunc = std::function<void (bool connected)>;
 
     void setMsgAddedCallbackFunc(MsgAddedCallbackFunc&& func);
     void setErrorReportCallbackFunc(ErrorReportCallbackFunc&& func);
     void setSocketConnectionStatusReportCallbackFunc(SocketConnectionStatusReportCallbackFunc&& func);
 
 private:
-    std::unique_ptr<MsgMgrImpl> m_impl;
+    std::unique_ptr<ToolsMsgMgrImpl> m_impl;
 };
 
 }  // namespace cc_tools_qt
diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt
index a501817..eca5c82 100644
--- a/lib/src/CMakeLists.txt
+++ b/lib/src/CMakeLists.txt
@@ -21,8 +21,6 @@ function (lib_tools)
         MsgFileMgr.cpp
         MsgSendMgr.cpp
         MsgSendMgrImpl.cpp
-        MsgMgr.cpp
-        MsgMgrImpl.cpp
         ToolsDataInfo.cpp
         ToolsField.cpp
         ToolsFieldHandler.cpp
@@ -30,6 +28,8 @@ function (lib_tools)
         ToolsFrame.cpp
         ToolsMessage.cpp
         ToolsMsgFactory.cpp
+        ToolsMsgMgr.cpp
+        ToolsMsgMgrImpl.cpp
         ToolsPlugin.cpp
         ToolsProtocol.cpp
         ToolsSocket.cpp
diff --git a/lib/src/MsgMgr.cpp b/lib/src/ToolsMsgMgr.cpp
similarity index 59%
rename from lib/src/MsgMgr.cpp
rename to lib/src/ToolsMsgMgr.cpp
index 8fea719..11d8d22 100644
--- a/lib/src/MsgMgr.cpp
+++ b/lib/src/ToolsMsgMgr.cpp
@@ -16,106 +16,106 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "cc_tools_qt/MsgMgr.h"
+#include "cc_tools_qt/ToolsMsgMgr.h"
 
-#include "MsgMgrImpl.h"
+#include "ToolsMsgMgrImpl.h"
 
 namespace cc_tools_qt
 {
 
-MsgMgr::MsgMgr()
-  : m_impl(new MsgMgrImpl())
+ToolsMsgMgr::ToolsMsgMgr()
+  : m_impl(new ToolsMsgMgrImpl())
 {
 }
 
-MsgMgr::~MsgMgr() noexcept = default;
+ToolsMsgMgr::~ToolsMsgMgr() noexcept = default;
 
-void MsgMgr::start()
+void ToolsMsgMgr::start()
 {
     m_impl->start();
 }
 
-void MsgMgr::stop()
+void ToolsMsgMgr::stop()
 {
     m_impl->stop();
 }
 
-void MsgMgr::clear()
+void ToolsMsgMgr::clear()
 {
     m_impl->clear();
 }
 
-ToolsSocketPtr MsgMgr::getSocket() const
+ToolsSocketPtr ToolsMsgMgr::getSocket() const
 {
     return m_impl->getSocket();
 }
 
-ToolsProtocolPtr MsgMgr::getProtocol() const
+ToolsProtocolPtr ToolsMsgMgr::getProtocol() const
 {
     return m_impl->getProtocol();
 }
 
-void MsgMgr::setRecvEnabled(bool enabled)
+void ToolsMsgMgr::setRecvEnabled(bool enabled)
 {
     m_impl->setRecvEnabled(enabled);
 }
 
-void MsgMgr::deleteMsg(ToolsMessagePtr msg)
+void ToolsMsgMgr::deleteMsg(ToolsMessagePtr msg)
 {
     m_impl->deleteMsg(std::move(msg));
 }
 
-void MsgMgr::deleteMsgs(const MessagesList& msgs)
+void ToolsMsgMgr::deleteMsgs(const MessagesList& msgs)
 {
     m_impl->deleteMsgs(msgs);
 }
 
-void MsgMgr::deleteAllMsgs()
+void ToolsMsgMgr::deleteAllMsgs()
 {
     m_impl->deleteAllMsgs();
 }
 
-void MsgMgr::sendMsgs(MessagesList&& msgs)
+void ToolsMsgMgr::sendMsgs(MessagesList&& msgs)
 {
     m_impl->sendMsgs(std::move(msgs));
 }
 
-const MsgMgr::AllMessages& MsgMgr::getAllMsgs() const
+const ToolsMsgMgr::MessagesList& ToolsMsgMgr::getAllMsgs() const
 {
     return m_impl->getAllMsgs();
 }
 
-void MsgMgr::addMsgs(const MessagesList& msgs, bool reportAdded)
+void ToolsMsgMgr::addMsgs(const MessagesList& msgs, bool reportAdded)
 {
     m_impl->addMsgs(msgs, reportAdded);
 }
 
-void MsgMgr::setSocket(ToolsSocketPtr socket)
+void ToolsMsgMgr::setSocket(ToolsSocketPtr socket)
 {
     m_impl->setSocket(std::move(socket));
 }
 
-void MsgMgr::setProtocol(ToolsProtocolPtr protocol)
+void ToolsMsgMgr::setProtocol(ToolsProtocolPtr protocol)
 {
     m_impl->setProtocol(std::move(protocol));
 }
 
-void MsgMgr::addFilter(ToolsFilterPtr filter)
+void ToolsMsgMgr::addFilter(ToolsFilterPtr filter)
 {
     m_impl->addFilter(std::move(filter));
 }
 
-void MsgMgr::setMsgAddedCallbackFunc(MsgAddedCallbackFunc&& func)
+void ToolsMsgMgr::setMsgAddedCallbackFunc(MsgAddedCallbackFunc&& func)
 {
     m_impl->setMsgAddedCallbackFunc(std::move(func));
 }
 
-void MsgMgr::setErrorReportCallbackFunc(ErrorReportCallbackFunc&& func)
+void ToolsMsgMgr::setErrorReportCallbackFunc(ErrorReportCallbackFunc&& func)
 {
     m_impl->setErrorReportCallbackFunc(std::move(func));
 }
 
-void MsgMgr::setSocketConnectionStatusReportCallbackFunc(
+void ToolsMsgMgr::setSocketConnectionStatusReportCallbackFunc(
     SocketConnectionStatusReportCallbackFunc&& func)
 {
     m_impl->setSocketConnectionStatusReportCallbackFunc(std::move(func));
diff --git a/lib/src/MsgMgrImpl.cpp b/lib/src/ToolsMsgMgrImpl.cpp
similarity index 91%
rename from lib/src/MsgMgrImpl.cpp
rename to lib/src/ToolsMsgMgrImpl.cpp
index 11f872f..0567693 100644
--- a/lib/src/MsgMgrImpl.cpp
+++ b/lib/src/ToolsMsgMgrImpl.cpp
@@ -16,7 +16,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#include "MsgMgrImpl.h"
+#include "ToolsMsgMgrImpl.h"
 
 #include <algorithm>
 #include <cassert>
@@ -59,13 +59,13 @@ void updateMsgTimestamp(ToolsMessage& msg, const ToolsDataInfo::Timestamp& times
 
 }  // namespace
 
-MsgMgrImpl::MsgMgrImpl()
+ToolsMsgMgrImpl::ToolsMsgMgrImpl()
 {
 }
 
-MsgMgrImpl::~MsgMgrImpl() noexcept = default;
+ToolsMsgMgrImpl::~ToolsMsgMgrImpl() noexcept = default;
 
-void MsgMgrImpl::start()
+void ToolsMsgMgrImpl::start()
 {
     if (m_running) {
         [[maybe_unused]] static constexpr bool Already_running = false;
@@ -84,7 +84,7 @@ void MsgMgrImpl::start()
     m_running = true;
 }
 
-void MsgMgrImpl::stop()
+void ToolsMsgMgrImpl::stop()
 {
     if (!m_running) {
         [[maybe_unused]] static constexpr bool Already_stopped = false;
@@ -103,7 +103,7 @@ void MsgMgrImpl::stop()
     m_running = false;
 }
 
-void MsgMgrImpl::clear()
+void ToolsMsgMgrImpl::clear()
 {
     if (m_running) {
         [[maybe_unused]] static constexpr bool Still_running = false;
@@ -116,22 +116,22 @@ void MsgMgrImpl::clear()
     m_filters.clear();
 }
 
-ToolsSocketPtr MsgMgrImpl::getSocket() const
+ToolsSocketPtr ToolsMsgMgrImpl::getSocket() const
 {
     return m_socket;
 }
 
-ToolsProtocolPtr MsgMgrImpl::getProtocol() const
+ToolsProtocolPtr ToolsMsgMgrImpl::getProtocol() const
 {
     return m_protocol;
 }
 
-void MsgMgrImpl::setRecvEnabled(bool enabled)
+void ToolsMsgMgrImpl::setRecvEnabled(bool enabled)
 {
     m_recvEnabled = enabled;
 }
 
-void MsgMgrImpl::deleteMsgs(const MessagesList& msgs)
+void ToolsMsgMgrImpl::deleteMsgs(const MessagesList& msgs)
 {
     auto listIter = msgs.begin();
     auto storedIter = m_allMsgs.begin();
@@ -154,7 +154,7 @@ void MsgMgrImpl::deleteMsgs(const MessagesList& msgs)
     m_allMsgs.erase(prevStoredIter, storedIter);
 }
 
-void MsgMgrImpl::deleteMsg(ToolsMessagePtr msg)
+void ToolsMsgMgrImpl::deleteMsg(ToolsMessagePtr msg)
 {
     assert(!m_allMsgs.empty());
     assert(msg);
@@ -178,7 +178,7 @@ void MsgMgrImpl::deleteMsg(ToolsMessagePtr msg)
     m_allMsgs.erase(iter);
 }
 
-void MsgMgrImpl::sendMsgs(MessagesList&& msgs)
+void ToolsMsgMgrImpl::sendMsgs(MessagesList&& msgs)
 {
     if (msgs.empty() || (!m_socket) || (!m_protocol)) {
         return;
@@ -243,7 +243,7 @@ void MsgMgrImpl::sendMsgs(MessagesList&& msgs)
     }
 }
 
-void MsgMgrImpl::addMsgs(const MessagesList& msgs, bool reportAdded)
+void ToolsMsgMgrImpl::addMsgs(const MessagesList& msgs, bool reportAdded)
 {
     for (auto& m : msgs) {
         if (!m) {
@@ -271,7 +271,7 @@ void MsgMgrImpl::addMsgs(const MessagesList& msgs, bool reportAdded)
     }
 }
 
-void MsgMgrImpl::setSocket(ToolsSocketPtr socket)
+void ToolsMsgMgrImpl::setSocket(ToolsSocketPtr socket)
 {
     if (m_socket) {
         m_socket->setDataReceivedCallback(nullptr);
@@ -313,7 +313,7 @@ void MsgMgrImpl::setSocket(ToolsSocketPtr socket)
     m_socket = std::move(socket);
 }
 
-void MsgMgrImpl::setProtocol(ToolsProtocolPtr protocol)
+void ToolsMsgMgrImpl::setProtocol(ToolsProtocolPtr protocol)
 {
     if (m_protocol) {
         m_protocol->setErrorReportCallback(nullptr);
@@ -338,7 +338,7 @@ void MsgMgrImpl::setProtocol(ToolsProtocolPtr protocol)
     m_protocol = std::move(protocol);
 }
 
-void MsgMgrImpl::addFilter(ToolsFilterPtr filter)
+void ToolsMsgMgrImpl::addFilter(ToolsFilterPtr filter)
 {
     if (!filter) {
         return;
@@ -391,7 +391,7 @@ void MsgMgrImpl::addFilter(ToolsFilterPtr filter)
     m_filters.push_back(std::move(filter));
 }
 
-void MsgMgrImpl::socketDataReceived(ToolsDataInfoPtr dataInfoPtr)
+void ToolsMsgMgrImpl::socketDataReceived(ToolsDataInfoPtr dataInfoPtr)
 {
     if ((!m_recvEnabled) || !(m_protocol) || (!dataInfoPtr)) {
         return;
@@ -452,21 +452,21 @@ void MsgMgrImpl::socketDataReceived(ToolsDataInfoPtr dataInfoPtr)
     m_allMsgs.splice(m_allMsgs.end(), std::move(msgsList));
 }
 
-void MsgMgrImpl::updateInternalId(ToolsMessage& msg)
+void ToolsMsgMgrImpl::updateInternalId(ToolsMessage& msg)
 {
     SeqNumber().setTo(m_nextMsgNum, msg);
     ++m_nextMsgNum;
     assert(0 < m_nextMsgNum); // wrap around is not supported
 }
 
-void MsgMgrImpl::reportMsgAdded(ToolsMessagePtr msg)
+void ToolsMsgMgrImpl::reportMsgAdded(ToolsMessagePtr msg)
 {
     if (m_msgAddedCallback) {
         m_msgAddedCallback(std::move(msg));
     }
 }
 
-void MsgMgrImpl::reportError(const QString& error)
+void ToolsMsgMgrImpl::reportError(const QString& error)
 {
     auto timestamp = std::chrono::high_resolution_clock::now();
     auto sinceEpoch = timestamp.time_since_epoch();
@@ -479,7 +479,7 @@ void MsgMgrImpl::reportError(const QString& error)
     }
 }
 
-void MsgMgrImpl::reportSocketConnectionStatus(bool connected)
+void ToolsMsgMgrImpl::reportSocketConnectionStatus(bool connected)
 {
     if (m_socketConnectionStatusReportCallback) {
         m_socketConnectionStatusReportCallback(connected);
diff --git a/lib/src/MsgMgrImpl.h b/lib/src/ToolsMsgMgrImpl.h
similarity index 83%
rename from lib/src/MsgMgrImpl.h
rename to lib/src/ToolsMsgMgrImpl.h
index 2d4a3e9..562f663 100644
--- a/lib/src/MsgMgrImpl.h
+++ b/lib/src/ToolsMsgMgrImpl.h
@@ -20,21 +20,19 @@
 
 #include <vector>
 
-#include "cc_tools_qt/MsgMgr.h"
+#include "cc_tools_qt/ToolsMsgMgr.h"
 
 namespace cc_tools_qt
 {
 
-class MsgMgrImpl
+class ToolsMsgMgrImpl
 {
 public:
-    typedef MsgMgr::AllMessages AllMessages;
-    typedef MsgMgr::MessagesList MessagesList;
+    using MessagesList = ToolsMsgMgr::MessagesList;
+    using MsgType = ToolsMsgMgr::MsgType;
 
-    typedef MsgMgr::MsgType MsgType;
-
-    MsgMgrImpl();
-    ~MsgMgrImpl() noexcept;
+    ToolsMsgMgrImpl();
+    ~ToolsMsgMgrImpl() noexcept;
 
     void start();
     void stop();
@@ -53,7 +51,7 @@ class MsgMgrImpl
 
     void sendMsgs(MessagesList&& msgs);
 
-    const AllMessages& getAllMsgs() const
+    const MessagesList& getAllMsgs() const
     {
         return m_allMsgs;
     }
@@ -64,9 +62,9 @@ class MsgMgrImpl
     void setProtocol(ToolsProtocolPtr protocol);
     void addFilter(ToolsFilterPtr filter);
 
-    typedef MsgMgr::MsgAddedCallbackFunc MsgAddedCallbackFunc;
-    typedef MsgMgr::ErrorReportCallbackFunc ErrorReportCallbackFunc;
-    typedef MsgMgr::SocketConnectionStatusReportCallbackFunc SocketConnectionStatusReportCallbackFunc;
+    using MsgAddedCallbackFunc = ToolsMsgMgr::MsgAddedCallbackFunc;
+    using ErrorReportCallbackFunc = ToolsMsgMgr::ErrorReportCallbackFunc;
+    using SocketConnectionStatusReportCallbackFunc = ToolsMsgMgr::SocketConnectionStatusReportCallbackFunc;
 
     template <typename TFunc>
     void setMsgAddedCallbackFunc(TFunc&& func)
@@ -96,7 +94,7 @@ class MsgMgrImpl
     void reportError(const QString& error);
     void reportSocketConnectionStatus(bool connected);
 
-    AllMessages m_allMsgs;
+    MessagesList m_allMsgs;
     bool m_recvEnabled = false;
 
     ToolsSocketPtr m_socket;