diff --git a/src/core/Logger.cpp b/src/core/Logger.cpp
index f6da88b..9c58fe1 100644
--- a/src/core/Logger.cpp
+++ b/src/core/Logger.cpp
@@ -58,69 +58,77 @@ void Logger::log(Level lvl, const char* msg) {
 }
 
 Logger::Sink::Sink (const Level level, Logger& parent) :
-    level(level),
-    parent(parent),
-    lineIsPrefixed(false) {}
+    level_(level),
+    parent_(parent),
+    lineIsPrefixed_(false) {}
 
 void Logger::Sink::ln  ( const string& msg ) {
     ln(msg.c_str());
 }
 
 void Logger::Sink::ln  ( const char* msg ) {
-    if ( level >= parent.logLevel ) {
+    if ( level_ >= parent_.logLevel ) {
         // If line has already been started, abort it and start new one:
-        if(lineIsPrefixed) *parent.output << endl;
+        if(lineIsPrefixed_) *parent_.output << endl;
         prefixLine(true);
-        *parent.output <<  msg << endl;
+        *parent_.output <<  msg << endl;
     }
 }
 
 void Logger::Sink::prefixLine(bool resetToFalse) {
-    if (!lineIsPrefixed) {
-        *parent.output << Logger::genTimeStamp() << " ";
-        lineIsPrefixed = resetToFalse ? false : true;
+    if (!lineIsPrefixed_) {
+        const char* lvlString;
+        switch ( level_ )
+        {
+            case DEBUG: lvlString = "DEBUG"; break;
+            case INFO:  lvlString = "INFO";  break;
+            case WARN:  lvlString = "WARN";  break;
+            case FATAL: lvlString = "FATAL"; break;
+        }
+        *parent_.output << Logger::genTimeStamp() << " [" << lvlString << "] ";
+        lineIsPrefixed_ = resetToFalse ? false : true;
     }
 }
 
 Logger::Sink& Logger::Sink::operator<<(const string& msg) {
-    if ( level >= parent.logLevel ) {
+    if ( level_ >= parent_.logLevel ) {
         prefixLine();
-        *parent.output << msg;
+        *parent_.output << msg;
     }
     return *this;
 }
 
 Logger::Sink& Logger::Sink::operator<<(const char* msg) {
-    if ( level >= parent.logLevel ) {
+    if ( level_ >= parent_.logLevel ) {
         prefixLine();
-        *parent.output << msg;
+        *parent_.output << msg;
     }
     return *this;
 }
 
 Logger::Sink& Logger::Sink::operator<<(const long msg) {
-    if ( level >= parent.logLevel ) {
+    if ( level_ >= parent_.logLevel ) {
         prefixLine();
-        *parent.output << msg;
+        *parent_.output << msg;
     }
     return *this;
 }
 
 Logger::Sink& Logger::Sink::operator<<(const unsigned long msg) {
-    if ( level >= parent.logLevel ) {
+    if ( level_ >= parent_.logLevel ) {
         prefixLine();
-        *parent.output << msg;
+        *parent_.output << msg;
     }
     return *this;
 }
 
 Logger::Sink& Logger::Sink::operator<<(const char character) {
-    if ( level >= parent.logLevel ) {
+    if ( level_ >= parent_.logLevel ) {
         switch(character) {
             // COMMIT - End message line
             case 0:
-              *parent.output << endl;
-              lineIsPrefixed = false;
+              *parent_.output << endl;
+              lineIsPrefixed_ = false;
             break;
         }
     }
diff --git a/src/core/include/Logger.hpp b/src/core/include/Logger.hpp
index 8f83f13..aa1bab0 100644
--- a/src/core/include/Logger.hpp
+++ b/src/core/include/Logger.hpp
@@ -23,9 +23,9 @@ class Logger {
 
     class Sink {
         private:
-        bool lineIsPrefixed;
-        Logger& parent;
-        const Logger::Level level;
+        bool lineIsPrefixed_;
+        Logger& parent_;
+        const Logger::Level level_;
         void prefixLine(bool resetToFalse = false);
         public:
         Sink(const Level level, Logger& parent);