diff --git a/test-tool/test_writeverify10_beyond_eol.c b/test-tool/test_writeverify10_beyond_eol.c
index fa6778a..6dad866 100644
--- a/test-tool/test_writeverify10_beyond_eol.c
+++ b/test-tool/test_writeverify10_beyond_eol.c
@@ -48,7 +48,7 @@ test_writeverify10_beyond_eol(void)
 				    i * block_size, block_size, 0, 0, 0, 0, buf,
 				    EXPECT_LBA_OOB);
 		if (ret == -2) {
-			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY10 is not implemented.");
+			logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
 			CU_PASS("WRITEVERIFY10 is not implemented.");
 			return;
 		}	
diff --git a/test-tool/test_writeverify10_wrprotect.c b/test-tool/test_writeverify10_wrprotect.c
index 8f38524..7364ddb 100644
--- a/test-tool/test_writeverify10_wrprotect.c
+++ b/test-tool/test_writeverify10_wrprotect.c
@@ -49,7 +49,7 @@ test_writeverify10_wrprotect(void)
 					    i, 0, 0, 0, buf,
 					    EXPECT_INVALID_FIELD_IN_CDB);
 			if (ret == -2) {
-				logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY10 is not implemented.");
+				logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY10 is not implemented.");
 				CU_PASS("WRITEVERIFY10 is not implemented.");
 				return;
 			}	
diff --git a/test-tool/test_writeverify12_0blocks.c b/test-tool/test_writeverify12_0blocks.c
index f23287a..4f84f21 100644
--- a/test-tool/test_writeverify12_0blocks.c
+++ b/test-tool/test_writeverify12_0blocks.c
@@ -41,7 +41,7 @@ test_writeverify12_0blocks(void)
 			    0, 0, 0, 0, NULL,
 			    EXPECT_STATUS_GOOD);
 	if (ret == -2) {
-		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
 		CU_PASS("WRITEVERIFY12 is not implemented.");
 		return;
 	}	
diff --git a/test-tool/test_writeverify12_beyond_eol.c b/test-tool/test_writeverify12_beyond_eol.c
index 009ba1f..0a158c4 100644
--- a/test-tool/test_writeverify12_beyond_eol.c
+++ b/test-tool/test_writeverify12_beyond_eol.c
@@ -48,7 +48,7 @@ test_writeverify12_beyond_eol(void)
 				    i * block_size, block_size, 0, 0, 0, 0, buf,
 				    EXPECT_LBA_OOB);
 		if (ret == -2) {
-			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+			logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
 			CU_PASS("WRITEVERIFY12 is not implemented.");
 			return;
 		}	
diff --git a/test-tool/test_writeverify12_flags.c b/test-tool/test_writeverify12_flags.c
index 5c0a6e3..a894e29 100644
--- a/test-tool/test_writeverify12_flags.c
+++ b/test-tool/test_writeverify12_flags.c
@@ -42,7 +42,7 @@ test_writeverify12_flags(void)
 			    block_size, block_size, 0, 1, 0, 0, buf,
 			    EXPECT_STATUS_GOOD);
 	if (ret == -2) {
-		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
 		CU_PASS("WRITEVERIFY12 is not implemented.");
 		return;
 	}	
diff --git a/test-tool/test_writeverify12_simple.c b/test-tool/test_writeverify12_simple.c
index 8ddefa3..1fc0054 100644
--- a/test-tool/test_writeverify12_simple.c
+++ b/test-tool/test_writeverify12_simple.c
@@ -45,7 +45,7 @@ test_writeverify12_simple(void)
 				    block_size, 0, 0, 0, 0, buf,
 				    EXPECT_STATUS_GOOD);
 		if (ret == -2) {
-			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+			logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
 			CU_PASS("WRITEVERIFY12 is not implemented.");
 			return;
 		}	
diff --git a/test-tool/test_writeverify12_wrprotect.c b/test-tool/test_writeverify12_wrprotect.c
index 8923d65..fac88d4 100644
--- a/test-tool/test_writeverify12_wrprotect.c
+++ b/test-tool/test_writeverify12_wrprotect.c
@@ -49,7 +49,7 @@ test_writeverify12_wrprotect(void)
 					    i, 0, 0, 0, buf,
 					    EXPECT_INVALID_FIELD_IN_CDB);
 			if (ret == -2) {
-				logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY12 is not implemented.");
+				logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY12 is not implemented.");
 				CU_PASS("WRITEVERIFY12 is not implemented.");
 				return;
 			}	
diff --git a/test-tool/test_writeverify16_0blocks.c b/test-tool/test_writeverify16_0blocks.c
index cfbe32b..ef0d29c 100644
--- a/test-tool/test_writeverify16_0blocks.c
+++ b/test-tool/test_writeverify16_0blocks.c
@@ -37,7 +37,7 @@ test_writeverify16_0blocks(void)
 			    0, block_size, 0, 0, 0, 0, NULL,
 			    EXPECT_STATUS_GOOD);
 	if (ret == -2) {
-		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
 		CU_PASS("WRITEVERIFY16 is not implemented.");
 		return;
        	}	
diff --git a/test-tool/test_writeverify16_beyond_eol.c b/test-tool/test_writeverify16_beyond_eol.c
index 11e5b81..7af0a7f 100644
--- a/test-tool/test_writeverify16_beyond_eol.c
+++ b/test-tool/test_writeverify16_beyond_eol.c
@@ -45,7 +45,7 @@ test_writeverify16_beyond_eol(void)
 				    i * block_size, block_size, 0, 0, 0, 0, buf,
 				    EXPECT_LBA_OOB);
 		if (ret == -2) {
-			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+			logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
 			CU_PASS("WRITEVERIFY16 is not implemented.");
 			return;
 	       	}	
diff --git a/test-tool/test_writeverify16_flags.c b/test-tool/test_writeverify16_flags.c
index 6316b83..911a417 100644
--- a/test-tool/test_writeverify16_flags.c
+++ b/test-tool/test_writeverify16_flags.c
@@ -42,7 +42,7 @@ test_writeverify16_flags(void)
 			    block_size, block_size, 0, 1, 0, 0, buf,
 			    EXPECT_STATUS_GOOD);
 	if (ret == -2) {
-		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
 		CU_PASS("WRITEVERIFY16 is not implemented.");
 		return;
        	}	
diff --git a/test-tool/test_writeverify16_residuals.c b/test-tool/test_writeverify16_residuals.c
index 281e3f0..bc264cc 100644
--- a/test-tool/test_writeverify16_residuals.c
+++ b/test-tool/test_writeverify16_residuals.c
@@ -48,7 +48,7 @@ test_writeverify16_residuals(void)
 			    block_size, 0, 0, 0, 0, NULL,
 			    EXPECT_STATUS_GOOD);
 	if (ret == -2) {
-		logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+		logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
 		CU_PASS("[SKIPPED] Target does not support WRITEVERIFY16. Skipping test");
 		return;
 	}
diff --git a/test-tool/test_writeverify16_simple.c b/test-tool/test_writeverify16_simple.c
index 581b055..d36558a 100644
--- a/test-tool/test_writeverify16_simple.c
+++ b/test-tool/test_writeverify16_simple.c
@@ -47,7 +47,7 @@ test_writeverify16_simple(void)
 				    block_size, 0, 0, 0, 0, buf,
 				    EXPECT_STATUS_GOOD);
 		if (ret == -2) {
-			logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+			logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
 			CU_PASS("WRITEVERIFY16 is not implemented.");
 			return;
 	       	}	
diff --git a/test-tool/test_writeverify16_wrprotect.c b/test-tool/test_writeverify16_wrprotect.c
index b104c88..48ef14a 100644
--- a/test-tool/test_writeverify16_wrprotect.c
+++ b/test-tool/test_writeverify16_wrprotect.c
@@ -51,7 +51,7 @@ test_writeverify16_wrprotect(void)
 					    i, 0, 0, 0, buf,
 					    EXPECT_INVALID_FIELD_IN_CDB);
 			if (ret == -2) {
-				logging(LOG_NORMAL, "[SKIPPED] WRITE1VERIFY16 is not implemented.");
+				logging(LOG_NORMAL, "[SKIPPED] WRITEVERIFY16 is not implemented.");
 				CU_PASS("WRITEVERIFY16 is not implemented.");
 				return;
 		       	}