diff --git a/src/launcher/booster.cpp b/src/launcher/booster.cpp
index 9889ec1..13fdb73 100644
--- a/src/launcher/booster.cpp
+++ b/src/launcher/booster.cpp
@@ -88,7 +88,7 @@ void Booster::run()
             Connection::closeAllSockets();
         }
 
-        Logger::logInfo("invoking '%s' ", m_app.fileName().c_str());
+        Logger::logInfo("Booster: invoking '%s' ", m_app.fileName().c_str());
         int ret_val = launchProcess();
 
         if (m_conn->isReportAppExitStatusNeeded())
@@ -101,7 +101,7 @@ void Booster::run()
     }
     else
     {
-        Logger::logError("nothing to invoke\n");
+        Logger::logError("Booster: nothing to invoke\n");
     }
 }
 
@@ -130,7 +130,7 @@ void Booster::renameProcess(int parentArgc, char** parentArgv)
     }
 
     const char* newProcessName = m_app.appName().c_str();
-    Logger::logNotice("set new name for process: %s", newProcessName);
+    Logger::logNotice("Booster: set new name for process: %s", newProcessName);
     
     // This code copies all the new arguments to the space reserved
     // in the old argv array. If an argument won't fit then the algorithm
@@ -161,7 +161,7 @@ void Booster::renameProcess(int parentArgc, char** parentArgv)
 
     // Set the process name using prctl, killall and top use it
     if ( prctl(PR_SET_NAME, basename(newProcessName)) == -1 )
-        Logger::logError("on set new process name: %s ", strerror(errno));
+        Logger::logError("Booster: on set new process name: %s ", strerror(errno));
 
     setenv("_", newProcessName, true);
 }
@@ -198,7 +198,7 @@ int Booster::launchProcess()
         chdir(pwd);
     }
 
-    Logger::logNotice("launching process: '%s' ", m_app.fileName().c_str());
+    Logger::logNotice("Booster: launching process: '%s' ", m_app.fileName().c_str());
 
     // Close logger
     Logger::closeLog();
@@ -220,7 +220,7 @@ void* Booster::loadMain()
     if (err < 0)
     {
         // Credential setup has failed, abort.
-        Logger::logErrorAndDie(EXIT_FAILURE, "Failed to setup credentials for launching application: %d\n", err);
+        Logger::logErrorAndDie(EXIT_FAILURE, "Booster: Failed to setup credentials for launching application: %d\n", err);
     }
 #endif
 
@@ -228,7 +228,7 @@ void* Booster::loadMain()
     void * module = dlopen(m_app.fileName().c_str(), RTLD_LAZY | RTLD_GLOBAL);
 
     if (!module)
-        Logger::logErrorAndDie(EXIT_FAILURE, "loading invoked application: '%s'\n", dlerror());
+        Logger::logErrorAndDie(EXIT_FAILURE, "Booster: loading invoked application: '%s'\n", dlerror());
 
     // Find out the address for symbol "main".
     dlerror();
@@ -236,7 +236,7 @@ void* Booster::loadMain()
 
     const char * error_s = dlerror();
     if (error_s != NULL)
-        Logger::logErrorAndDie(EXIT_FAILURE, "loading symbol 'main': '%s'\n", error_s);
+        Logger::logErrorAndDie(EXIT_FAILURE, "Booster: loading symbol 'main': '%s'\n", error_s);
 
     return module;
 }
diff --git a/src/launcher/boosterfactory.h b/src/launcher/boosterfactory.h
index dfbd1b2..151339b 100644
--- a/src/launcher/boosterfactory.h
+++ b/src/launcher/boosterfactory.h
@@ -38,7 +38,7 @@ public:
     static Booster * create(char type);
 
     /*! Set current process ID globally to the given booster type
-     *  so that we now which booster to restart if on exits.
+     *  so that we know which booster to restart if on exits.
      */
     static void setProcessIdToBooster(char type, pid_t pid);
 
diff --git a/src/launcher/connection.cpp b/src/launcher/connection.cpp
index 3843252..8f25cf1 100644
--- a/src/launcher/connection.cpp
+++ b/src/launcher/connection.cpp
@@ -194,7 +194,7 @@ bool Connection::sendStr(const char * str)
     uint32_t size = strlen(str) + 1;
     sendMsg(size);
 
-    Logger::logInfo("%s: '%s'", __FUNCTION__, str);
+    Logger::logInfo("Connection: %s: '%s'", __FUNCTION__, str);
 
     // Send the string.
     return write(m_fd, str, size) != -1;
@@ -404,7 +404,7 @@ bool Connection::receiveEnv()
             {
                 if (putenv_wrapper(const_cast<char *>(var)) != 0)
                 {
-                    Logger::logWarning("putenv failed");
+                    Logger::logWarning("Connection: putenv failed");
                 }
             }
             else
@@ -476,7 +476,7 @@ bool Connection::receiveIO()
 
 bool Connection::receiveActions()
 {
-    Logger::logInfo("enter: %s", __FUNCTION__);
+    Logger::logInfo("Connection: enter: %s", __FUNCTION__);
 
     while (1)
     {