diff --git a/lib/iscsi/iscsi.h b/lib/iscsi/iscsi.h
index 155a19378..674754728 100644
--- a/lib/iscsi/iscsi.h
+++ b/lib/iscsi/iscsi.h
@@ -70,10 +70,10 @@
 #define DEFAULT_DEFAULTTIME2WAIT 2
 #define DEFAULT_DEFAULTTIME2RETAIN 20
 #define DEFAULT_FIRSTBURSTLENGTH 8192
-#define DEFAULT_INITIALR2T 1
-#define DEFAULT_IMMEDIATEDATA 1
-#define DEFAULT_DATAPDUINORDER 1
-#define DEFAULT_DATASEQUENCEINORDER 1
+#define DEFAULT_INITIALR2T true
+#define DEFAULT_IMMEDIATEDATA true
+#define DEFAULT_DATAPDUINORDER true
+#define DEFAULT_DATASEQUENCEINORDER true
 #define DEFAULT_ERRORRECOVERYLEVEL 0
 #define DEFAULT_TIMEOUT 60
 #define MAX_NOPININTERVAL 60
@@ -244,10 +244,10 @@ struct spdk_iscsi_sess {
 	uint32_t DefaultTime2Retain;
 	uint32_t FirstBurstLength;
 	uint32_t MaxBurstLength;
-	uint32_t InitialR2T;
-	uint32_t ImmediateData;
-	uint32_t DataPDUInOrder;
-	uint32_t DataSequenceInOrder;
+	bool InitialR2T;
+	bool ImmediateData;
+	bool DataPDUInOrder;
+	bool DataSequenceInOrder;
 	uint32_t ErrorRecoveryLevel;
 
 	uint32_t ExpCmdSN;
@@ -279,9 +279,9 @@ struct spdk_iscsi_opts {
 	uint32_t MaxQueueDepth;
 	uint32_t DefaultTime2Wait;
 	uint32_t DefaultTime2Retain;
-	uint32_t ImmediateData;
+	bool ImmediateData;
 	uint32_t ErrorRecoveryLevel;
-	uint32_t AllowDuplicateIsid;
+	bool AllowDuplicateIsid;
 };
 
 struct spdk_iscsi_globals {
@@ -306,9 +306,9 @@ struct spdk_iscsi_globals {
 	uint32_t MaxQueueDepth;
 	uint32_t DefaultTime2Wait;
 	uint32_t DefaultTime2Retain;
-	uint32_t ImmediateData;
+	bool ImmediateData;
 	uint32_t ErrorRecoveryLevel;
-	uint32_t AllowDuplicateIsid;
+	bool AllowDuplicateIsid;
 
 	struct spdk_mempool *pdu_pool;
 	struct spdk_mempool *pdu_immediate_data_pool;
diff --git a/lib/iscsi/iscsi_subsystem.c b/lib/iscsi/iscsi_subsystem.c
index 5eb64f604..99bbe24a7 100644
--- a/lib/iscsi/iscsi_subsystem.c
+++ b/lib/iscsi/iscsi_subsystem.c
@@ -111,7 +111,7 @@ spdk_iscsi_config_dump_section(FILE *fp)
 		g_spdk_iscsi.MaxConnections,
 		g_spdk_iscsi.MaxQueueDepth,
 		g_spdk_iscsi.DefaultTime2Wait, g_spdk_iscsi.DefaultTime2Retain,
-		(g_spdk_iscsi.ImmediateData == 1) ? "Yes" : "No",
+		(g_spdk_iscsi.ImmediateData) ? "Yes" : "No",
 		g_spdk_iscsi.ErrorRecoveryLevel);
 }
 
@@ -580,7 +580,7 @@ spdk_iscsi_opts_init(struct spdk_iscsi_opts *opts)
 	opts->DefaultTime2Wait = DEFAULT_DEFAULTTIME2WAIT;
 	opts->DefaultTime2Retain = DEFAULT_DEFAULTTIME2RETAIN;
 	opts->ImmediateData = DEFAULT_IMMEDIATEDATA;
-	opts->AllowDuplicateIsid = 0;
+	opts->AllowDuplicateIsid = false;
 	opts->ErrorRecoveryLevel = DEFAULT_ERRORRECOVERYLEVEL;
 	opts->timeout = DEFAULT_TIMEOUT;
 	opts->nopininterval = DEFAULT_NOPININTERVAL;
diff --git a/lib/iscsi/param.c b/lib/iscsi/param.c
index 740e7cf3b..5bfe5bf56 100644
--- a/lib/iscsi/param.c
+++ b/lib/iscsi/param.c
@@ -1163,10 +1163,10 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
 	}
 	if (strcasecmp(val, "Yes") == 0) {
 		SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "set InitialR2T=1\n");
-		conn->sess->InitialR2T = 1;
+		conn->sess->InitialR2T = true;
 	} else {
 		SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "set InitialR2T=0\n");
-		conn->sess->InitialR2T = 0;
+		conn->sess->InitialR2T = false;
 	}
 	val = spdk_iscsi_param_get_val(conn->sess->params, "ImmediateData");
 	if (val == NULL) {
@@ -1175,10 +1175,10 @@ spdk_iscsi_copy_param2var(struct spdk_iscsi_conn *conn)
 	}
 	if (strcasecmp(val, "Yes") == 0) {
 		SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "set ImmediateData=1\n");
-		conn->sess->ImmediateData = 1;
+		conn->sess->ImmediateData = true;
 	} else {
 		SPDK_DEBUGLOG(SPDK_LOG_ISCSI, "set ImmediateData=0\n");
-		conn->sess->ImmediateData = 0;
+		conn->sess->ImmediateData = false;
 	}
 	return 0;
 }
diff --git a/test/unit/lib/iscsi/param.c/param_ut.c b/test/unit/lib/iscsi/param.c/param_ut.c
index a132f41e4..d59de595a 100644
--- a/test/unit/lib/iscsi/param.c/param_ut.c
+++ b/test/unit/lib/iscsi/param.c/param_ut.c
@@ -89,7 +89,7 @@ burst_length_param_negotation(int FirstBurstLength, int MaxBurstLength,
 	sess.session_type = SESSION_TYPE_NORMAL;
 	sess.params = NULL;
 	sess.MaxBurstLength = 65536;
-	sess.InitialR2T = 1;
+	sess.InitialR2T = true;
 	sess.FirstBurstLength = SPDK_ISCSI_FIRST_BURST_LENGTH;
 	sess.MaxOutstandingR2T = 1;