diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h
index 25238df47..b19065176 100644
--- a/scst/include/scst_const.h
+++ b/scst/include/scst_const.h
@@ -32,6 +32,9 @@
 /* Max size of various names */
 #define SCST_MAX_NAME		     50
 
+/* Max size of external names, like initiator name */
+#define SCST_MAX_EXTERNAL_NAME	     256
+
 /*
  * Size of sense sufficient to carry standard sense data.
  * Warning! It's allocated on stack!
diff --git a/scst/include/scst_user.h b/scst/include/scst_user.h
index cb61ca766..434cd7a62 100644
--- a/scst/include/scst_user.h
+++ b/scst/include/scst_user.h
@@ -100,8 +100,8 @@ struct scst_user_sess {
 	aligned_u64 lun;
 	uint16_t threads_num;
 	uint8_t rd_only;
-	char initiator_name[SCST_MAX_NAME];
-	char target_name[SCST_MAX_NAME];
+	char initiator_name[SCST_MAX_EXTERNAL_NAME];
+	char target_name[SCST_MAX_EXTERNAL_NAME];
 };
 
 struct scst_user_scsi_cmd_parse {