diff --git a/lib/iscsi/conn.c b/lib/iscsi/conn.c
index 16b6f1a36..aebc0efa4 100644
--- a/lib/iscsi/conn.c
+++ b/lib/iscsi/conn.c
@@ -1362,20 +1362,20 @@ SPDK_TRACE_REGISTER_FN(iscsi_conn_trace)
 {
 	spdk_trace_register_owner(OWNER_ISCSI_CONN, 'c');
 	spdk_trace_register_object(OBJECT_ISCSI_PDU, 'p');
-	spdk_trace_register_description("READ FROM SOCKET DONE", "", TRACE_READ_FROM_SOCKET_DONE,
+	spdk_trace_register_description("READ_FROM_SOCKET_DONE", "", TRACE_READ_FROM_SOCKET_DONE,
 					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, 0, "");
-	spdk_trace_register_description("FLUSH WRITEBUF START", "", TRACE_FLUSH_WRITEBUF_START,
+	spdk_trace_register_description("FLUSH_WRITEBUF_START", "", TRACE_FLUSH_WRITEBUF_START,
 					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, 0, "iovec: ");
-	spdk_trace_register_description("FLUSH WRITEBUF DONE", "", TRACE_FLUSH_WRITEBUF_DONE,
+	spdk_trace_register_description("FLUSH_WRITEBUF_DONE", "", TRACE_FLUSH_WRITEBUF_DONE,
 					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, 0, "");
-	spdk_trace_register_description("READ PDU", "", TRACE_READ_PDU,
+	spdk_trace_register_description("READ_PDU", "", TRACE_READ_PDU,
 					OWNER_ISCSI_CONN, OBJECT_ISCSI_PDU, 1, 0, 0, "opc:   ");
-	spdk_trace_register_description("ISCSI TASK DONE", "", TRACE_ISCSI_TASK_DONE,
+	spdk_trace_register_description("ISCSI_TASK_DONE", "", TRACE_ISCSI_TASK_DONE,
 					OWNER_ISCSI_CONN, OBJECT_SCSI_TASK, 0, 0, 0, "");
-	spdk_trace_register_description("ISCSI TASK QUEUE", "", TRACE_ISCSI_TASK_QUEUE,
+	spdk_trace_register_description("ISCSI_TASK_QUEUE", "", TRACE_ISCSI_TASK_QUEUE,
 					OWNER_ISCSI_CONN, OBJECT_SCSI_TASK, 1, 1, 0, "pdu:   ");
-	spdk_trace_register_description("ISCSI CONN ACTIVE", "", TRACE_ISCSI_CONN_ACTIVE,
+	spdk_trace_register_description("ISCSI_CONN_ACTIVE", "", TRACE_ISCSI_CONN_ACTIVE,
 					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, 0, "");
-	spdk_trace_register_description("ISCSI CONN IDLE", "", TRACE_ISCSI_CONN_IDLE,
+	spdk_trace_register_description("ISCSI_CONN_IDLE", "", TRACE_ISCSI_CONN_IDLE,
 					OWNER_ISCSI_CONN, OBJECT_NONE, 0, 0, 0, "");
 }
diff --git a/lib/scsi/scsi.c b/lib/scsi/scsi.c
index 3bc3b2ed7..776e5a62a 100644
--- a/lib/scsi/scsi.c
+++ b/lib/scsi/scsi.c
@@ -60,9 +60,9 @@ SPDK_TRACE_REGISTER_FN(scsi_trace)
 {
 	spdk_trace_register_owner(OWNER_SCSI_DEV, 'd');
 	spdk_trace_register_object(OBJECT_SCSI_TASK, 't');
-	spdk_trace_register_description("SCSI TASK DONE", "", TRACE_SCSI_TASK_DONE,
+	spdk_trace_register_description("SCSI_TASK_DONE", "", TRACE_SCSI_TASK_DONE,
 					OWNER_SCSI_DEV, OBJECT_SCSI_TASK, 0, 0, 0, "");
-	spdk_trace_register_description("SCSI TASK START", "", TRACE_SCSI_TASK_START,
+	spdk_trace_register_description("SCSI_TASK_START", "", TRACE_SCSI_TASK_START,
 					OWNER_SCSI_DEV, OBJECT_SCSI_TASK, 0, 0, 0, "");
 }