diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index a683af980..f4315ac11 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -62,7 +62,7 @@ static struct scst_trace_log vdisk_local_trace_tbl[] = {
 };
 #define trace_log_tbl			vdisk_local_trace_tbl
 
-#define VDISK_TRACE_TLB_HELP	", order"
+#define VDISK_TRACE_TBL_HELP	", order"
 
 #endif
 
@@ -404,7 +404,7 @@ static struct scst_dev_type vdisk_file_devtype = {
 	.trace_flags =		&trace_flag,
 	.trace_tbl =		vdisk_local_trace_tbl,
 #ifndef CONFIG_SCST_PROC
-	.trace_tbl_help =	VDISK_TRACE_TLB_HELP,
+	.trace_tbl_help =	VDISK_TRACE_TBL_HELP,
 #endif
 #endif
 };
@@ -439,7 +439,7 @@ static struct scst_dev_type vdisk_blk_devtype = {
 	.trace_flags =		&trace_flag,
 	.trace_tbl =		vdisk_local_trace_tbl,
 #ifndef CONFIG_SCST_PROC
-	.trace_tbl_help =	VDISK_TRACE_TLB_HELP,
+	.trace_tbl_help =	VDISK_TRACE_TBL_HELP,
 #endif
 #endif
 };
@@ -471,7 +471,7 @@ static struct scst_dev_type vdisk_null_devtype = {
 	.trace_flags =		&trace_flag,
 	.trace_tbl =		vdisk_local_trace_tbl,
 #ifndef CONFIG_SCST_PROC
-	.trace_tbl_help =	VDISK_TRACE_TLB_HELP,
+	.trace_tbl_help =	VDISK_TRACE_TBL_HELP,
 #endif
 #endif
 };
@@ -504,7 +504,7 @@ static struct scst_dev_type vcdrom_devtype = {
 	.trace_flags =		&trace_flag,
 	.trace_tbl =		vdisk_local_trace_tbl,
 #ifndef CONFIG_SCST_PROC
-	.trace_tbl_help =	VDISK_TRACE_TLB_HELP,
+	.trace_tbl_help =	VDISK_TRACE_TBL_HELP,
 #endif
 #endif
 };
@@ -4989,8 +4989,7 @@ static int vcdrom_open(char *p, char *name)
 		cdrom_empty = 1;
 		TRACE_DBG("%s", "No media");
 	} else if (*filename != '/') {
-		PRINT_ERROR("File path \"%s\" is not "
-			"absolute", filename);
+		PRINT_ERROR("File path \"%s\" is not absolute", filename);
 		res = -EINVAL;
 		goto out;
 	} else