diff --git a/src/lib/base/Path.cpp b/src/lib/base/Path.cpp
index 546c7ab8a..35260bdb7 100644
--- a/src/lib/base/Path.cpp
+++ b/src/lib/base/Path.cpp
@@ -10,9 +10,7 @@
 #include "arch/win32/ArchMiscWindows.h"
 #endif
 
-namespace deskflow {
-
-namespace filesystem {
+namespace deskflow::filesystem {
 
 #ifdef SYSAPI_WIN32
 
@@ -36,6 +34,4 @@ std::string path(const std::string &filePath)
 }
 #endif
 
-} // namespace filesystem
-
-} // namespace deskflow
+} // namespace deskflow::filesystem
diff --git a/src/lib/base/Path.h b/src/lib/base/Path.h
index aac684ee9..89fed6520 100644
--- a/src/lib/base/Path.h
+++ b/src/lib/base/Path.h
@@ -9,9 +9,7 @@
 #include "common/Common.h"
 #include <string>
 
-namespace deskflow {
-
-namespace filesystem {
+namespace deskflow::filesystem {
 
 #ifdef SYSAPI_WIN32
 std::wstring path(const std::string &filePath);
@@ -19,6 +17,4 @@ std::wstring path(const std::string &filePath);
 std::string path(const std::string &filePath);
 #endif
 
-} // namespace filesystem
-
-} // namespace deskflow
+} // namespace deskflow::filesystem
diff --git a/src/lib/base/String.cpp b/src/lib/base/String.cpp
index 34be792f3..bc5eb072e 100644
--- a/src/lib/base/String.cpp
+++ b/src/lib/base/String.cpp
@@ -13,8 +13,7 @@
 #include <sstream>
 #include <vector>
 
-namespace deskflow {
-namespace string {
+namespace deskflow::string {
 
 std::string format(const char *fmt, ...)
 {
@@ -178,5 +177,4 @@ bool CaselessCmp::cmpLess(const std::string::value_type &a, const std::string::v
   return tolower(a) < tolower(b);
 }
 
-} // namespace string
-} // namespace deskflow
+} // namespace deskflow::string
diff --git a/src/lib/base/String.h b/src/lib/base/String.h
index b2d9a6bcc..89a40d0ee 100644
--- a/src/lib/base/String.h
+++ b/src/lib/base/String.h
@@ -12,13 +12,11 @@
 
 #include <string>
 
-namespace deskflow {
-
 //! std::string utilities
 /*!
 Provides functions for string manipulation.
 */
-namespace string {
+namespace deskflow::string {
 
 //! Format positional arguments
 /*!
@@ -76,5 +74,4 @@ public:
   static bool cmpLess(const std::string::value_type &a, const std::string::value_type &b);
 };
 
-} // namespace string
-} // namespace deskflow
+} // namespace deskflow::string
diff --git a/src/lib/deskflow/languages/LanguageManager.cpp b/src/lib/deskflow/languages/LanguageManager.cpp
index be91fe295..0e5ecfcdb 100644
--- a/src/lib/deskflow/languages/LanguageManager.cpp
+++ b/src/lib/deskflow/languages/LanguageManager.cpp
@@ -25,9 +25,7 @@ std::string vectorToString(const std::vector<std::string> &vector, const std::st
 
 } // anonymous namespace
 
-namespace deskflow {
-
-namespace languages {
+namespace deskflow::languages {
 
 LanguageManager::LanguageManager(const std::vector<std::string> &localLanguages) : m_localLanguages(localLanguages)
 {
@@ -88,6 +86,4 @@ bool LanguageManager::isLanguageInstalled(const std::string &language) const
   return isInstalled;
 }
 
-} // namespace languages
-
-} // namespace deskflow
+} // namespace deskflow::languages
diff --git a/src/lib/deskflow/languages/LanguageManager.h b/src/lib/deskflow/languages/LanguageManager.h
index 68cd49c26..3cd1f19fa 100644
--- a/src/lib/deskflow/languages/LanguageManager.h
+++ b/src/lib/deskflow/languages/LanguageManager.h
@@ -9,9 +9,7 @@
 #include "deskflow/AppUtil.h"
 #include <vector>
 
-namespace deskflow {
-
-namespace languages {
+namespace deskflow::languages {
 
 class LanguageManager
 {
@@ -62,6 +60,4 @@ public:
   bool isLanguageInstalled(const std::string &language) const;
 };
 
-} // namespace languages
-
-} // namespace deskflow
+} // namespace deskflow::languages
diff --git a/src/lib/deskflow/unix/DeskflowXkbKeyboard.cpp b/src/lib/deskflow/unix/DeskflowXkbKeyboard.cpp
index 63bd5b5d3..5da54ff59 100644
--- a/src/lib/deskflow/unix/DeskflowXkbKeyboard.cpp
+++ b/src/lib/deskflow/unix/DeskflowXkbKeyboard.cpp
@@ -11,9 +11,7 @@
 #include "DeskflowXkbKeyboard.h"
 #include "base/Log.h"
 
-namespace deskflow {
-
-namespace linux {
+namespace deskflow::linux {
 
 DeskflowXkbKeyboard::DeskflowXkbKeyboard()
 {
@@ -47,8 +45,6 @@ DeskflowXkbKeyboard::~DeskflowXkbKeyboard()
   std::free(m_data.options);
 }
 
-} // namespace linux
-
-} // namespace deskflow
+} // namespace deskflow::linux
 
 #endif // WINAPI_XWINDOWS
diff --git a/src/lib/deskflow/unix/DeskflowXkbKeyboard.h b/src/lib/deskflow/unix/DeskflowXkbKeyboard.h
index 3b43cac74..3df531a54 100644
--- a/src/lib/deskflow/unix/DeskflowXkbKeyboard.h
+++ b/src/lib/deskflow/unix/DeskflowXkbKeyboard.h
@@ -13,9 +13,7 @@
 #include <X11/extensions/XKBrules.h>
 #include <cstdio>
 
-namespace deskflow {
-
-namespace linux {
+namespace deskflow::linux {
 
 class DeskflowXkbKeyboard
 {
@@ -32,8 +30,6 @@ public:
   ~DeskflowXkbKeyboard();
 };
 
-} // namespace linux
-
-} // namespace deskflow
+} // namespace deskflow::linux
 
 #endif // WINAPI_XWINDOWS