diff --git a/examples/callbacks.cpp b/examples/callbacks.cpp
index 2365f2a6a96df23c23e9fe3537b9934904d8bf14..25aa5f779986acfcf8ce83a6b3dcbd94940321da 100644
--- a/examples/callbacks.cpp
+++ b/examples/callbacks.cpp
@@ -66,7 +66,7 @@ int main(void)
   std::shared_ptr<DSP::u::Amplifier>     Scale;
   std::shared_ptr<DSP::u::Multiplexer>   Multiplexer2;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl;
diff --git a/examples/echo.cpp b/examples/echo.cpp
index ffb1d29ba31123e2cc3eb7ee59bbd4ee55ce22c5..05f8b17f01524ef94e3c707154aea6ab3376f4b4 100644
--- a/examples/echo.cpp
+++ b/examples/echo.cpp
@@ -11,7 +11,7 @@ int main(void)
   int temp;
   long int Fp;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl;
diff --git a/examples/hello.cpp b/examples/hello.cpp
index 824ced6e961588e54937785f76f8245fe9220a12..5f1bfaf6e3723c2926aa59e602383e4ed3b3aa0c 100644
--- a/examples/hello.cpp
+++ b/examples/hello.cpp
@@ -17,7 +17,7 @@ int test_hello(void)
   int temp;
   long int Fp;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl << endl;
diff --git a/examples/macro_example.cpp b/examples/macro_example.cpp
index ea66e7a1e97e16076738586325a5e516aaca5e20..26125e8186e0cb23ddd6814d09b1fdbe9c4cf98f 100644
--- a/examples/macro_example.cpp
+++ b/examples/macro_example.cpp
@@ -58,7 +58,7 @@ int main(void)
   int temp;
   long int Fp;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl << endl;
diff --git a/examples/multirate.cpp b/examples/multirate.cpp
index feebfb07c25f1b80274a34e0d5972e394fadc983..7ba74bf0008c0de80061b6104f977e94405feb8f 100644
--- a/examples/multirate.cpp
+++ b/examples/multirate.cpp
@@ -49,7 +49,7 @@ int main(int argn, char *args[])
   /*************************************************************/
   // Log file setup  
   DSP::log.SetLogFileName("log_file.log");
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_file | DSP::E_LS_Mode::LS_console);
+  DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
 
   DSP::log << DSP::lib_version_string() << endl << endl;
   /*************************************************************/
diff --git a/examples/socket_client.cpp b/examples/socket_client.cpp
index b14b82244d83068c845208ea45a7ef0388e05e1c..15a8e696c52e21cec101c6d6edfdd8738cf7ae69 100644
--- a/examples/socket_client.cpp
+++ b/examples/socket_client.cpp
@@ -13,7 +13,7 @@ int main(void)
   int temp;
   long int Fp;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file_client.log");
 
   DSP::log << DSP::lib_version_string() << endl << endl;
diff --git a/examples/socket_client_2.cpp b/examples/socket_client_2.cpp
index 5df18748b740b4bbd0bf9460f006461ee62f0880..cf1095e7a526767119481ef0702efec96943b5db 100644
--- a/examples/socket_client_2.cpp
+++ b/examples/socket_client_2.cpp
@@ -15,7 +15,7 @@ int main(void)
   DSP::LoadCoef coef_info;
   int N_SRC;  DSP::Float_vector h_SRC;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file_client.log");
 
   DSP::log << DSP::lib_version_string() << endl << endl;
diff --git a/examples/socket_server.cpp b/examples/socket_server.cpp
index d816e754caa87db45278593d1d43d63f78798841..6e6a067eb07243b73b28f3e9f2f397d778a2669b 100644
--- a/examples/socket_server.cpp
+++ b/examples/socket_server.cpp
@@ -14,7 +14,7 @@ int main(void)
   int temp;
   long int Fp;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl << endl;
diff --git a/examples/socket_server_2.cpp b/examples/socket_server_2.cpp
index 767e36feb8f7ddfe5f167af5ef60b3d3c9f5123f..857fd796bffea7f69a5ed2aeb4e13c45fad72ca1 100644
--- a/examples/socket_server_2.cpp
+++ b/examples/socket_server_2.cpp
@@ -14,7 +14,7 @@ int main(void)
   int temp;
   long int Fp, Fp1;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl << endl;
diff --git a/src/Main.cpp b/src/Main.cpp
index 213ccee2afd3c86f268e900975c3cf30d35dd5b7..9e986e2b979dd2031e08dc74827d04c07008a73a 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -929,7 +929,7 @@ int test_3()
   DSP::Clock_ptr MasterClock; //, MasterClock2, Zegar1, Zegar2, Zegar3;
 
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file_append);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file_append);
   DSP::log.SetLogFileName("log_file.log");
 
   MasterClock=DSP::Clock::CreateMasterClock();
@@ -1153,7 +1153,7 @@ int test_4()
 //  char dir_name[]=".";
 
 //  DSP::f::SetLogState(DSP_LS_console | DSP_LS_file | DSP_LS_errors_only);
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file_append);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file_append);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::Float Fp, Fp1, Fp2; //sampling frequencies
@@ -1660,7 +1660,7 @@ int test_7()
   int temp;
   long int Fp;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl << endl;
@@ -1838,7 +1838,7 @@ int test_9()
   /*************************************************************/
   // Log file setup
   DSP::log.SetLogFileName("log_file.txt");
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_file | DSP::E_LS_Mode::LS_console);
+  DSP::log.SetLogState(DSP::e::LogState::file | DSP::e::LogState::console);
 
   DSP::log << DSP::lib_version_string() << endl << endl;
   /*************************************************************/
@@ -2014,7 +2014,7 @@ int test_11()
   // Log file setup
   DSP::log.SetLogFileName("log_file.log");
   //DSP::f::SetLogState(DSP_LS_file | DSP_LS_console);
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::file);
 
   DSP::log << DSP::lib_version_string() << endl << endl;
   /*************************************************************/
@@ -2268,7 +2268,7 @@ int test_12(void)
   DSP::u::Amplifier     *Scale;
   DSP::u::Multiplexer   *Multiplexer2;
 
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("log_file.log");
 
   DSP::log << DSP::lib_version_string() << endl;
@@ -2713,7 +2713,7 @@ int test_ZPSTC_cw_3()
 int main(int argc, char*argv[])
 {
   //  DSP::f::SetLogState(DSP_LS_console | DSP_LS_file);
-  DSP::log.SetLogState(DSP::E_LS_Mode::LS_console | DSP::E_LS_Mode::LS_file);
+  DSP::log.SetLogState(DSP::e::LogState::console | DSP::e::LogState::file);
   DSP::log.SetLogFileName("DSPElib_test_log.txt");
 
   DSP::log << "test DSP::log" << endl;