diff --git a/scst/src/dev_handlers/scst_cdrom.c b/scst/src/dev_handlers/scst_cdrom.c
index 921ac34e4..5090e824c 100644
--- a/scst/src/dev_handlers/scst_cdrom.c
+++ b/scst/src/dev_handlers/scst_cdrom.c
@@ -90,7 +90,7 @@ static int cdrom_attach(struct scst_device *dev)
 	cmd[0] = READ_CAPACITY;
 	cmd[1] = (dev->scsi_dev->scsi_level <= SCSI_2) ?
 	    ((dev->scsi_dev->lun << 5) & 0xe0) : 0;
-	retries = SCST_DEV_UA_RETRIES;
+	retries = SCST_DEV_RETRIES_ON_UA;
 	while (1) {
 		memset(buffer, 0, buffer_size);
 		memset(sense_buffer, 0, sizeof(sense_buffer));
@@ -115,7 +115,7 @@ static int cdrom_attach(struct scst_device *dev)
 
 		if (!--retries) {
 			PRINT_ERROR("UA not cleared after %d retries",
-				SCST_DEV_UA_RETRIES);
+				SCST_DEV_RETRIES_ON_UA);
 			dev->block_shift = CDROM_DEF_BLOCK_SHIFT;
 			res = -ENODEV;
 			goto out_free_buf;
diff --git a/scst/src/dev_handlers/scst_changer.c b/scst/src/dev_handlers/scst_changer.c
index 4d44c2742..66fc7b1cf 100644
--- a/scst/src/dev_handlers/scst_changer.c
+++ b/scst/src/dev_handlers/scst_changer.c
@@ -80,7 +80,7 @@ static int changer_attach(struct scst_device *dev)
 		goto out;
 	}
 
-	retries = SCST_DEV_UA_RETRIES;
+	retries = SCST_DEV_RETRIES_ON_UA;
 	do {
 		TRACE_DBG("%s", "Doing TEST_UNIT_READY");
 		rc = scsi_test_unit_ready(dev->scsi_dev,
diff --git a/scst/src/dev_handlers/scst_dev_handler.h b/scst/src/dev_handlers/scst_dev_handler.h
index 224b7e5ee..12eb82836 100644
--- a/scst/src/dev_handlers/scst_dev_handler.h
+++ b/scst/src/dev_handlers/scst_dev_handler.h
@@ -9,7 +9,7 @@
 #include "scst_debug.h"
 #endif
 
-#define SCST_DEV_UA_RETRIES 5
+#define SCST_DEV_RETRIES_ON_UA 5
 #define SCST_PASSTHROUGH_RETRIES	0
 
 #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING)
diff --git a/scst/src/dev_handlers/scst_disk.c b/scst/src/dev_handlers/scst_disk.c
index 1bd18e6d7..7c2644be5 100644
--- a/scst/src/dev_handlers/scst_disk.c
+++ b/scst/src/dev_handlers/scst_disk.c
@@ -187,7 +187,7 @@ static int disk_attach(struct scst_device *dev)
 	cmd[0] = READ_CAPACITY;
 	cmd[1] = (dev->scsi_dev->scsi_level <= SCSI_2) ?
 	    ((dev->scsi_dev->lun << 5) & 0xe0) : 0;
-	retries = SCST_DEV_UA_RETRIES;
+	retries = SCST_DEV_RETRIES_ON_UA;
 	while (1) {
 		memset(buffer, 0, buffer_size);
 		memset(sense_buffer, 0, sizeof(sense_buffer));
@@ -211,7 +211,7 @@ static int disk_attach(struct scst_device *dev)
 			break;
 		if (!--retries) {
 			PRINT_ERROR("UA not clear after %d retries",
-				SCST_DEV_UA_RETRIES);
+				SCST_DEV_RETRIES_ON_UA);
 			res = -ENODEV;
 			goto out_free_buf;
 		}
diff --git a/scst/src/dev_handlers/scst_modisk.c b/scst/src/dev_handlers/scst_modisk.c
index 434696179..9667f8c9c 100644
--- a/scst/src/dev_handlers/scst_modisk.c
+++ b/scst/src/dev_handlers/scst_modisk.c
@@ -191,7 +191,7 @@ static int modisk_attach(struct scst_device *dev)
 	cmd[0] = READ_CAPACITY;
 	cmd[1] = (dev->scsi_dev->scsi_level <= SCSI_2) ?
 	    ((dev->scsi_dev->lun << 5) & 0xe0) : 0;
-	retries = SCST_DEV_UA_RETRIES;
+	retries = SCST_DEV_RETRIES_ON_UA;
 	while (1) {
 		memset(buffer, 0, buffer_size);
 		memset(sense_buffer, 0, sizeof(sense_buffer));
@@ -215,7 +215,7 @@ static int modisk_attach(struct scst_device *dev)
 
 		if (!--retries) {
 			PRINT_ERROR("UA not cleared after %d retries",
-				    SCST_DEV_UA_RETRIES);
+				    SCST_DEV_RETRIES_ON_UA);
 			res = -ENODEV;
 			goto out_free_buf;
 		}
diff --git a/scst/src/dev_handlers/scst_processor.c b/scst/src/dev_handlers/scst_processor.c
index 6ccde9e5a..cd90d08e5 100644
--- a/scst/src/dev_handlers/scst_processor.c
+++ b/scst/src/dev_handlers/scst_processor.c
@@ -80,7 +80,7 @@ static int processor_attach(struct scst_device *dev)
 		goto out;
 	}
 
-	retries = SCST_DEV_UA_RETRIES;
+	retries = SCST_DEV_RETRIES_ON_UA;
 	do {
 		TRACE_DBG("%s", "Doing TEST_UNIT_READY");
 		rc = scsi_test_unit_ready(dev->scsi_dev,
diff --git a/scst/src/dev_handlers/scst_raid.c b/scst/src/dev_handlers/scst_raid.c
index 3ff78b89c..b8eaddfb2 100644
--- a/scst/src/dev_handlers/scst_raid.c
+++ b/scst/src/dev_handlers/scst_raid.c
@@ -80,7 +80,7 @@ static int raid_attach(struct scst_device *dev)
 		goto out;
 	}
 
-	retries = SCST_DEV_UA_RETRIES;
+	retries = SCST_DEV_RETRIES_ON_UA;
 	do {
 		TRACE_DBG("%s", "Doing TEST_UNIT_READY");
 		rc = scsi_test_unit_ready(dev->scsi_dev,
diff --git a/scst/src/dev_handlers/scst_tape.c b/scst/src/dev_handlers/scst_tape.c
index 546731cd7..818a4dbe9 100644
--- a/scst/src/dev_handlers/scst_tape.c
+++ b/scst/src/dev_handlers/scst_tape.c
@@ -176,7 +176,7 @@ static int tape_attach(struct scst_device *dev)
 		goto out;
 	}
 
-	retries = SCST_DEV_UA_RETRIES;
+	retries = SCST_DEV_RETRIES_ON_UA;
 	do {
 		TRACE_DBG("%s", "Doing TEST_UNIT_READY");
 		rc = scsi_test_unit_ready(dev->scsi_dev,