diff --git a/smocore/componentThread.cpp b/smocore/componentThread.cpp
index 32d3af5..aa059e2 100644
--- a/smocore/componentThread.cpp
+++ b/smocore/componentThread.cpp
@@ -139,7 +139,8 @@ public:
 		[[maybe_unused]] std::shared_ptr<ThreadLifetimeMgmtOp> context
 		)
 	{
-		std::cout << "Thread '" << target->name << "': handling JOLT request."
+		std::cout << __func__ << ": Thread '" << target->name << "': handling "
+			"JOLT request."
 			<< "\n";
 
 		target->io_service.stop();
@@ -150,7 +151,8 @@ public:
 		[[maybe_unused]] std::shared_ptr<ThreadLifetimeMgmtOp> context
 		)
 	{
-		std::cout << "Thread '" << target->name << "': handling startThread."
+		std::cout << __func__ << ": Thread '" << target->name << "': handling "
+			"startThread."
 			<< "\n";
 
 		// Execute private setup sequence here
@@ -163,8 +165,8 @@ public:
 		[[maybe_unused]] std::shared_ptr<ThreadLifetimeMgmtOp> context
 		)
 	{
-		std::cout << "Thread '" << target->name << "': handling exitThread "
-			"(main queue)." << std::endl;
+		std::cout << __func__ << ": Thread '" << target->name << "': handling "
+			"exitThread (main queue)." << "\n";
 
 		target->cleanup();
 		target->io_service.stop();
@@ -175,8 +177,8 @@ public:
 		[[maybe_unused]] std::shared_ptr<ThreadLifetimeMgmtOp> context
 		)
 	{
-		std::cout << "Thread '" << target->name << "': handling exitThread "
-			"(pause queue)." << std::endl;
+		std::cout << __func__ << ": Thread '" << target->name << "': handling "
+			"exitThread (pause queue)."<< "\n";
 
 		target->cleanup();
 		target->pause_io_service.stop();
@@ -188,8 +190,8 @@ public:
 		[[maybe_unused]] std::shared_ptr<ThreadLifetimeMgmtOp> context
 		)
 	{
-		std::cout << "Thread '" << target->name << "': handling pauseThread."
-			<< std::endl;
+		std::cout << __func__ << ": Thread '" << target->name << "': handling "
+			"pauseThread." << "\n";
 
 		/* We have to invoke the callback here before moving on because 
 		 * our next operation is going to block the thread, so it won't
@@ -204,8 +206,8 @@ public:
 		[[maybe_unused]] std::shared_ptr<ThreadLifetimeMgmtOp> context
 		)
 	{
-		std::cout << "Thread '" << target->name << "': handling resumeThread."
-			<< std::endl;
+		std::cout << __func__ << ": Thread '" << target->name << "': handling "
+			"resumeThread." << "\n";
 
 		target->pause_io_service.stop();
 		callOriginalCbFn();