diff --git a/src/cntlr_commands_impl.c b/src/cntlr_commands_impl.c
index fe91910e06a1bcfae21eece70f97577f492da79f..fed5360d6ad58ce5979ef2acd5ad75231e62365e 100644
--- a/src/cntlr_commands_impl.c
+++ b/src/cntlr_commands_impl.c
@@ -278,7 +278,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 	}
 
 	if (!wildcard_scan && fresh_scan && !tb[SCAN_ATTR_BAND] && !tb[SCAN_ATTR_RADIO]) {
-		dbg("To trigger fresh scanning, provide either 'band' or 'radio' in Agent\n");
+		dbg("%s: To trigger fresh scanning, provide either 'band' or 'radio' in Agent\n", __func__);
 		return -EINVAL;
 	}
 
@@ -307,7 +307,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 		}
 
 		if (!found) {
-			dbg("radio for band %d not found in Agent\n", band);
+			dbg("%s: radio for band %d not found in Agent\n", __func__, band);
 				return -EINVAL;
 		}
 
@@ -329,7 +329,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 		}
 
 		if (!found) {
-			dbg("Radio " MACFMT " not found in Agent\n", MAC2STR(radio));
+			dbg("%s: Radio " MACFMT " not found in Agent\n", __func__, MAC2STR(radio));
 			return -EINVAL;
 		}
 		sreq.num_radio = 1;
@@ -343,7 +343,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 
 
 	if (num_opclass > 0 && num_channel > 0) {
-		dbg("Either opclass or channel list is allowed\n");
+		dbg("%s: Either opclass or channel list is allowed\n", __func__);
 		return -EINVAL;
 	}
 
@@ -373,7 +373,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 
 					io = sreq.radios[i].num_opclass;
 					if (io >= SCAN_REQ_MAX_NUM_OPCLASS) {
-						dbg("skip skan of opclass %d - max number exceeded\n", e->id);
+						dbg("%s: skip skan of opclass %d - max number exceeded\n", __func__, e->id);
 						break;
 					}
 					sreq.radios[i].opclasses[io].classid = e->id;
@@ -385,7 +385,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 
 	if (num_opclass > 0) {
 		if (!fresh_scan) {
-			dbg("opclass entries ignored for non-fresh-scan\n");
+			dbg("%s: opclass entries ignored for non-fresh-scan\n", __func__);
 			sreq.radios[0].num_opclass = 0;
 		} else {
 			struct blob_attr *cur;
@@ -415,17 +415,17 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 				}
 
 				if (!supported) {
-					dbg("skip skan of opclass %d - unsuported\n", opclass);
+					dbg("%s: skip skan of opclass %d - unsuported\n", __func__, opclass);
 					continue;
 				}
 
 				if (sreq.radios[i].num_opclass >= SCAN_REQ_MAX_NUM_OPCLASS) {
-					dbg("skip skan of opclass %d - maximum number exceeded\n", opclass);
+					dbg("%s: skip skan of opclass %d - maximum number exceeded\n", __func__, opclass);
 					continue;
 				}
 
 				if (wifi_opclass_get_bw(opclass) != 20) {
-					dbg("skip skan of opclass %d - not a 20MHz one\n", opclass);
+					dbg("%s: skip skan of opclass %d - not a 20MHz one\n", __func__, opclass);
 					continue;
 				}
 
@@ -442,7 +442,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 
 	if (num_channel > 0) {
 		if (!fresh_scan) {
-			dbg("channel entries ignored for non-fresh-scan\n");
+			dbg("%s: channel entries ignored for non-fresh-scan\n", __func__);
 			sreq.radios[0].opclasses[0].num_channel = 0;
 		} else {
 			struct blob_attr *cur;
@@ -469,7 +469,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 				}
 
 				if (!opclass) {
-					dbg("skip skan of channel %d - no matching 20MHz opclass\n", channel);
+					dbg("%s: skip skan of channel %d - no matching 20MHz opclass\n", __func__, channel);
 					continue;
 				}
 
@@ -486,7 +486,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 				if (!opclass_found) {
 					/* Must add a new 20MHz opclass to the request */
 					if (sreq.radios[i].num_opclass >= SCAN_REQ_MAX_NUM_OPCLASS) {
-						dbg("skip skan - max num opclass exceeded\n");
+						dbg("%s: skip skan - max num opclass exceeded\n", __func__);
 						continue;
 					}
 
@@ -497,7 +497,7 @@ int COMMAND(scan)(void *priv, void *args, void *out)
 
 				ic = sreq.radios[i].opclasses[io].num_channel;
 				if (ic >= SCAN_REQ_MAX_NUM_CHAN) {
-					dbg("skip skan - max num channel exceeded\n");
+					dbg("%s: skip skan - max num channel exceeded\n", __func__);
 					break;
 				}
 				sreq.radios[i].opclasses[io].channels[ic] = channel;