diff --git a/Logger.cpp b/Logger.cpp
index 4dca29985..4c1a92874 100644
--- a/Logger.cpp
+++ b/Logger.cpp
@@ -31,15 +31,15 @@ namespace expr = logging::expressions;
 namespace attrs = logging::attributes;
 namespace ptime = boost::posix_time;
 
+BOOST_LOG_GLOBAL_LOGGER_CTOR_ARGS (sys,
+                                   srcs::severity_channel_logger_mt<logging::trivial::severity_level>,
+                                   (keywords::channel = "SYSLOG"));
+BOOST_LOG_GLOBAL_LOGGER_CTOR_ARGS (data,
+                                   srcs::severity_channel_logger_mt<logging::trivial::severity_level>,
+                                   (keywords::channel = "DATALOG"));
+
 namespace Logger
 {
-  BOOST_LOG_GLOBAL_LOGGER_CTOR_ARGS (sys,
-                                     srcs::severity_channel_logger_mt<logging::trivial::severity_level>,
-                                     (keywords::channel = "SYSLOG"));
-  BOOST_LOG_GLOBAL_LOGGER_CTOR_ARGS (data,
-                                     srcs::severity_channel_logger_mt<logging::trivial::severity_level>,
-                                     (keywords::channel = "DATALOG"));
-
   namespace
   {
     // Custom formatter factory to add TimeStamp format support in config ini file.
diff --git a/Logger.hpp b/Logger.hpp
index 9c7aa5348..6e29789e4 100644
--- a/Logger.hpp
+++ b/Logger.hpp
@@ -10,13 +10,13 @@
 #include <iosfwd>
 #include <string>
 
+BOOST_LOG_GLOBAL_LOGGER (sys,
+                         boost::log::sources::severity_channel_logger_mt<boost::log::trivial::severity_level>);
+BOOST_LOG_GLOBAL_LOGGER (data,
+                         boost::log::sources::severity_channel_logger_mt<boost::log::trivial::severity_level>);
+
 namespace Logger
 {
-  BOOST_LOG_GLOBAL_LOGGER (sys,
-                           boost::log::sources::severity_channel_logger_mt<boost::log::trivial::severity_level>);
-  BOOST_LOG_GLOBAL_LOGGER (data,
-                           boost::log::sources::severity_channel_logger_mt<boost::log::trivial::severity_level>);
-
   // trivial logging to console
   void init ();
 
@@ -39,20 +39,20 @@ namespace Logger
  
 /// System Log macros.
 /// TRACE < DEBUG < INFO < WARN < ERROR < FATAL
-#define LOG_TRACE(ARG) LOG_LOG_LOCATION (Logger::sys::get(), trace, ARG);
-#define LOG_DEBUG(ARG) LOG_LOG_LOCATION (Logger::sys::get(), debug, ARG);
-#define LOG_INFO(ARG)  LOG_LOG_LOCATION (Logger::sys::get(), info, ARG);
-#define LOG_WARN(ARG)  LOG_LOG_LOCATION (Logger::sys::get(), warning, ARG);
-#define LOG_ERROR(ARG) LOG_LOG_LOCATION (Logger::sys::get(), error, ARG);
-#define LOG_FATAL(ARG) LOG_LOG_LOCATION (Logger::sys::get(), fatal, ARG);
+#define LOG_TRACE(ARG) LOG_LOG_LOCATION (sys::get(), trace, ARG);
+#define LOG_DEBUG(ARG) LOG_LOG_LOCATION (sys::get(), debug, ARG);
+#define LOG_INFO(ARG)  LOG_LOG_LOCATION (sys::get(), info, ARG);
+#define LOG_WARN(ARG)  LOG_LOG_LOCATION (sys::get(), warning, ARG);
+#define LOG_ERROR(ARG) LOG_LOG_LOCATION (sys::get(), error, ARG);
+#define LOG_FATAL(ARG) LOG_LOG_LOCATION (sys::get(), fatal, ARG);
  
 /// Data Log macros. Does not include LINE, FILE, FUNCTION.
 /// TRACE < DEBUG < INFO < WARN < ERROR < FATAL
-#define LOG_DATA_TRACE(ARG) BOOST_LOG_SEV (Logger::data::get(), boost::log::trivial::trace) << ARG
-#define LOG_DATA_DEBUG(ARG) BOOST_LOG_SEV (Logger::data::get(), boost::log::trivial::debug) << ARG
-#define LOG_DATA_INFO(ARG)  BOOST_LOG_SEV (Logger::data::get(), boost::log::trivial::info) << ARG
-#define LOG_DATA_WARN(ARG)  BOOST_LOG_SEV (Logger::data::get(), boost::log::trivial::warning) << ARG
-#define LOG_DATA_ERROR(ARG) BOOST_LOG_SEV (Logger::data::get(), boost::log::trivial::error) << ARG
-#define LOG_DATA_FATAL(ARG) BOOST_LOG_SEV (Logger::data::get(), boost::log::trivial::fatal) << ARG
+#define LOG_DATA_TRACE(ARG) BOOST_LOG_SEV (data::get(), boost::log::trivial::trace) << ARG
+#define LOG_DATA_DEBUG(ARG) BOOST_LOG_SEV (data::get(), boost::log::trivial::debug) << ARG
+#define LOG_DATA_INFO(ARG)  BOOST_LOG_SEV (data::get(), boost::log::trivial::info) << ARG
+#define LOG_DATA_WARN(ARG)  BOOST_LOG_SEV (data::get(), boost::log::trivial::warning) << ARG
+#define LOG_DATA_ERROR(ARG) BOOST_LOG_SEV (data::get(), boost::log::trivial::error) << ARG
+#define LOG_DATA_FATAL(ARG) BOOST_LOG_SEV (data::get(), boost::log::trivial::fatal) << ARG
 
 #endif
diff --git a/WSJTXLogging.cpp b/WSJTXLogging.cpp
index 603cda844..cf03ba789 100644
--- a/WSJTXLogging.cpp
+++ b/WSJTXLogging.cpp
@@ -200,7 +200,7 @@ void WSJTXLogging::qt_log_handler (QtMsgType type, QMessageLogContext const& con
     }
   // Map non-default Qt categories to logger channels, Qt logger
   // context is mapped to the appropriate logger attributes.
-  auto log = Logger::sys::get ();
+  auto log = sys::get ();
   std::string file;
   std::string function;
   if (context.file)
diff --git a/main.cpp b/main.cpp
index 98960b050..99ffe9cad 100644
--- a/main.cpp
+++ b/main.cpp
@@ -317,7 +317,7 @@ int main(int argc, char *argv[])
       do
         {
           // dump settings
-          auto sys_lg = Logger::sys::get ();
+          auto sys_lg = sys::get ();
           if (auto rec = sys_lg.open_record
               (
                boost::log::keywords::severity = boost::log::trivial::trace)