diff --git a/examples/iscsiclient.c b/examples/iscsiclient.c
index e93e922..8041a39 100644
--- a/examples/iscsiclient.c
+++ b/examples/iscsiclient.c
@@ -294,7 +294,7 @@ void inquiry_cb(struct iscsi_context *iscsi, int status, void *command_data, voi
 		exit(10);
 	}
 
-	printf("Device Type is %d. VendorId:%s ProductId:%s\n", inq->periperal_device_type, inq->vendor_identification, inq->product_identification);
+	printf("Device Type is %d. VendorId:%s ProductId:%s\n", inq->device_type, inq->vendor_identification, inq->product_identification);
 	printf("Send MODESENSE6\n");
 	if (iscsi_modesense6_task(iscsi, clnt->lun, 0, SCSI_MODESENSE_PC_CURRENT, SCSI_MODESENSE_PAGECODE_RETURN_ALL_PAGES, 0, 4, modesense6_cb, private_data) == NULL) {
 		printf("failed to send modesense6 command\n");
diff --git a/include/scsi-lowlevel.h b/include/scsi-lowlevel.h
index de9b9ba..2908e33 100644
--- a/include/scsi-lowlevel.h
+++ b/include/scsi-lowlevel.h
@@ -367,9 +367,13 @@ enum scsi_inquiry_tpgs {
 	SCSI_INQUIRY_TPGS_IMPLICIT_AND_EXPLICIT = 0x03
 };
 
+/* fix typos, leave old names for backward compatibility */
+#define periperal_qualifier qualifier
+#define periperal_device_type device_type
+
 struct scsi_inquiry_standard {
-	enum scsi_inquiry_peripheral_qualifier periperal_qualifier;
-	enum scsi_inquiry_peripheral_device_type periperal_device_type;
+	enum scsi_inquiry_peripheral_qualifier qualifier;
+	enum scsi_inquiry_peripheral_device_type device_type;
 	int rmb;
 	int version;
 	int normaca;
@@ -410,8 +414,8 @@ enum scsi_inquiry_pagecode {
 EXTERN const char *scsi_inquiry_pagecode_to_str(int pagecode);
 
 struct scsi_inquiry_supported_pages {
-	enum scsi_inquiry_peripheral_qualifier periperal_qualifier;
-	enum scsi_inquiry_peripheral_device_type periperal_device_type;
+	enum scsi_inquiry_peripheral_qualifier qualifier;
+	enum scsi_inquiry_peripheral_device_type device_type;
 	enum scsi_inquiry_pagecode pagecode;
 
 	int num_pages;
@@ -419,8 +423,8 @@ struct scsi_inquiry_supported_pages {
 };
 
 struct scsi_inquiry_block_limits {
-	enum scsi_inquiry_peripheral_qualifier periperal_qualifier;
-	enum scsi_inquiry_peripheral_device_type periperal_device_type;
+	enum scsi_inquiry_peripheral_qualifier qualifier;
+	enum scsi_inquiry_peripheral_device_type device_type;
 	enum scsi_inquiry_pagecode pagecode;
 
 	int wsnz;		   		/* write same no zero */
@@ -438,8 +442,8 @@ struct scsi_inquiry_block_limits {
 };
 
 struct scsi_inquiry_block_device_characteristics {
-	enum scsi_inquiry_peripheral_qualifier periperal_qualifier;
-	enum scsi_inquiry_peripheral_device_type periperal_device_type;
+	enum scsi_inquiry_peripheral_qualifier qualifier;
+	enum scsi_inquiry_peripheral_device_type device_type;
 	enum scsi_inquiry_pagecode pagecode;
 
 	int medium_rotation_rate;
@@ -452,8 +456,8 @@ enum scsi_inquiry_provisioning_type {
 };
 
 struct scsi_inquiry_logical_block_provisioning {
-	enum scsi_inquiry_peripheral_qualifier periperal_qualifier;
-	enum scsi_inquiry_peripheral_device_type periperal_device_type;
+	enum scsi_inquiry_peripheral_qualifier qualifier;
+	enum scsi_inquiry_peripheral_device_type device_type;
 	enum scsi_inquiry_pagecode pagecode;
 
        int threshold_exponent;
@@ -469,8 +473,8 @@ struct scsi_inquiry_logical_block_provisioning {
 EXTERN struct scsi_task *scsi_cdb_inquiry(int evpd, int page_code, int alloc_len);
 
 struct scsi_inquiry_unit_serial_number {
-	enum scsi_inquiry_peripheral_qualifier periperal_qualifier;
-	enum scsi_inquiry_peripheral_device_type periperal_device_type;
+	enum scsi_inquiry_peripheral_qualifier qualifier;
+	enum scsi_inquiry_peripheral_device_type device_type;
 	enum scsi_inquiry_pagecode pagecode;
 
 	char *usn;
@@ -533,8 +537,8 @@ struct scsi_inquiry_device_designator {
 };
 
 struct scsi_inquiry_device_identification {
-	enum scsi_inquiry_peripheral_qualifier periperal_qualifier;
-	enum scsi_inquiry_peripheral_device_type periperal_device_type;
+	enum scsi_inquiry_peripheral_qualifier qualifier;
+	enum scsi_inquiry_peripheral_device_type device_type;
 	enum scsi_inquiry_pagecode pagecode;
 
 	struct scsi_inquiry_device_designator *designators;
diff --git a/lib/scsi-lowlevel.c b/lib/scsi-lowlevel.c
index c18245d..92453df 100644
--- a/lib/scsi-lowlevel.c
+++ b/lib/scsi-lowlevel.c
@@ -469,8 +469,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
 			return NULL;
 		}
 
-		inq->periperal_qualifier    = (task->datain.data[0]>>5)&0x07;
-		inq->periperal_device_type  = task->datain.data[0]&0x1f;
+		inq->qualifier              = (task->datain.data[0]>>5)&0x07;
+		inq->device_type            = task->datain.data[0]&0x1f;
 		inq->rmb                    = !!(task->datain.data[1]&0x80);
 		inq->version                = task->datain.data[2];
 		inq->normaca                = !!(task->datain.data[3]&0x20);
@@ -513,8 +513,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
 		if (inq == NULL) {
 			return NULL;
 		}
-		inq->periperal_qualifier   = (task->datain.data[0]>>5)&0x07;
-		inq->periperal_device_type = task->datain.data[0]&0x1f;
+		inq->qualifier             = (task->datain.data[0]>>5)&0x07;
+		inq->device_type           = task->datain.data[0]&0x1f;
 		inq->pagecode              = task->datain.data[1];
 
 		inq->num_pages = task->datain.data[3];
@@ -533,8 +533,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
 		if (inq == NULL) {
 			return NULL;
 		}
-		inq->periperal_qualifier   = (task->datain.data[0]>>5)&0x07;
-		inq->periperal_device_type = task->datain.data[0]&0x1f;
+		inq->qualifier             = (task->datain.data[0]>>5)&0x07;
+		inq->device_type           = task->datain.data[0]&0x1f;
 		inq->pagecode              = task->datain.data[1];
 
 		inq->usn = scsi_malloc(task, task->datain.data[3]+1);
@@ -555,8 +555,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
 		if (inq == NULL) {
 			return NULL;
 		}
-		inq->periperal_qualifier   = (task->datain.data[0]>>5)&0x07;
-		inq->periperal_device_type = task->datain.data[0]&0x1f;
+		inq->qualifier             = (task->datain.data[0]>>5)&0x07;
+		inq->device_type           = task->datain.data[0]&0x1f;
 		inq->pagecode              = task->datain.data[1];
 
 		dptr = &task->datain.data[4];
@@ -603,8 +603,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
 		if (inq == NULL) {
 			return NULL;
 		}
-		inq->periperal_qualifier   = (task->datain.data[0]>>5)&0x07;
-		inq->periperal_device_type = task->datain.data[0]&0x1f;
+		inq->qualifier             = (task->datain.data[0]>>5)&0x07;
+		inq->device_type           = task->datain.data[0]&0x1f;
 		inq->pagecode              = task->datain.data[1];
 
 		inq->wsnz                  = task->datain.data[4] & 0x01;
@@ -631,8 +631,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
 		if (inq == NULL) {
 			return NULL;
 		}
-		inq->periperal_qualifier   = (task->datain.data[0]>>5)&0x07;
-		inq->periperal_device_type = task->datain.data[0]&0x1f;
+		inq->qualifier             = (task->datain.data[0]>>5)&0x07;
+		inq->device_type           = task->datain.data[0]&0x1f;
 		inq->pagecode              = task->datain.data[1];
 
 		inq->medium_rotation_rate  = ntohs(*(uint16_t *)&task->datain.data[4]);
@@ -646,8 +646,8 @@ scsi_inquiry_datain_unmarshall(struct scsi_task *task)
 		if (inq == NULL) {
 			return NULL;
 		}
-		inq->periperal_qualifier   = (task->datain.data[0]>>5)&0x07;
-		inq->periperal_device_type = task->datain.data[0]&0x1f;
+		inq->qualifier             = (task->datain.data[0]>>5)&0x07;
+		inq->device_type           = task->datain.data[0]&0x1f;
 		inq->pagecode              = task->datain.data[1];
 
 		inq->threshold_exponent = task->datain.data[4];
diff --git a/src/iscsi-inq.c b/src/iscsi-inq.c
index 3a507bf..e0fe471 100644
--- a/src/iscsi-inq.c
+++ b/src/iscsi-inq.c
@@ -66,9 +66,9 @@ void inquiry_device_identification(struct scsi_inquiry_device_identification *in
 	int i;
 
 	printf("Peripheral Qualifier:%s\n",
-		scsi_devqualifier_to_str(inq->periperal_qualifier));
+		scsi_devqualifier_to_str(inq->qualifier));
 	printf("Peripheral Device Type:%s\n",
-		scsi_devtype_to_str(inq->periperal_device_type));
+		scsi_devtype_to_str(inq->device_type));
 	printf("Page Code:(0x%02x) %s\n",
 		inq->pagecode, scsi_inquiry_pagecode_to_str(inq->pagecode));
 
@@ -102,9 +102,9 @@ void inquiry_supported_pages(struct scsi_inquiry_supported_pages *inq)
 void inquiry_standard(struct scsi_inquiry_standard *inq)
 {
 	printf("Peripheral Qualifier:%s\n",
-		scsi_devqualifier_to_str(inq->periperal_qualifier));
+		scsi_devqualifier_to_str(inq->qualifier));
 	printf("Peripheral Device Type:%s\n",
-		scsi_devtype_to_str(inq->periperal_device_type));
+		scsi_devtype_to_str(inq->device_type));
 	printf("Removable:%d\n", inq->rmb);
 	printf("Version:%d %s\n", inq->version, scsi_version_to_str(inq->version));
 	printf("NormACA:%d\n", inq->normaca);
diff --git a/src/iscsi-ls.c b/src/iscsi-ls.c
index 3d42468..1ce5b3b 100644
--- a/src/iscsi-ls.c
+++ b/src/iscsi-ls.c
@@ -103,7 +103,7 @@ tur_try_again:
 		fprintf(stderr, "failed to unmarshall inquiry datain blob\n");
 		exit(10);
 	}
-	type = inq->periperal_device_type;
+	type = inq->device_type;
 	scsi_free_scsi_task(task);
 
 
diff --git a/test-tool/0103_read10_rdprotect.c b/test-tool/0103_read10_rdprotect.c
index 3c30107..c4d0668 100644
--- a/test-tool/0103_read10_rdprotect.c
+++ b/test-tool/0103_read10_rdprotect.c
@@ -71,7 +71,7 @@ int T0103_read10_rdprotect(const char *initiator, const char *url, int data_loss
 		return -1;
 	}
 
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -2;
diff --git a/test-tool/0104_read10_flags.c b/test-tool/0104_read10_flags.c
index f021293..a86100c 100644
--- a/test-tool/0104_read10_flags.c
+++ b/test-tool/0104_read10_flags.c
@@ -62,7 +62,7 @@ int T0104_read10_flags(const char *initiator, const char *url, int data_loss _U_
 		scsi_free_scsi_task(task);
 		return -1;
 	}
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -2;
diff --git a/test-tool/0202_read16_flags.c b/test-tool/0202_read16_flags.c
index 71da173..c006eb4 100644
--- a/test-tool/0202_read16_flags.c
+++ b/test-tool/0202_read16_flags.c
@@ -59,7 +59,7 @@ int T0202_read16_flags(const char *initiator, const char *url, int data_loss _U_
 		scsi_free_scsi_task(task);
 		return -1;
 	}
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -2;
diff --git a/test-tool/0212_read12_flags.c b/test-tool/0212_read12_flags.c
index 8efbca3..71f11b7 100644
--- a/test-tool/0212_read12_flags.c
+++ b/test-tool/0212_read12_flags.c
@@ -59,7 +59,7 @@ int T0212_read12_flags(const char *initiator, const char *url, int data_loss _U_
 		scsi_free_scsi_task(task);
 		return -1;
 	}
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -2;
diff --git a/test-tool/0222_write16_flags.c b/test-tool/0222_write16_flags.c
index 9790ab8..9e4b818 100644
--- a/test-tool/0222_write16_flags.c
+++ b/test-tool/0222_write16_flags.c
@@ -60,7 +60,7 @@ int T0222_write16_flags(const char *initiator, const char *url, int data_loss, i
 		scsi_free_scsi_task(task);
 		return -1;
 	}
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -2;
diff --git a/test-tool/0232_write12_flags.c b/test-tool/0232_write12_flags.c
index 621736e..2e6434f 100644
--- a/test-tool/0232_write12_flags.c
+++ b/test-tool/0232_write12_flags.c
@@ -60,7 +60,7 @@ int T0232_write12_flags(const char *initiator, const char *url, int data_loss, i
 		scsi_free_scsi_task(task);
 		return -1;
 	}
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -2;
diff --git a/test-tool/0292_write10_flags.c b/test-tool/0292_write10_flags.c
index 9bf1672..1f22c00 100644
--- a/test-tool/0292_write10_flags.c
+++ b/test-tool/0292_write10_flags.c
@@ -60,7 +60,7 @@ int T0292_write10_flags(const char *initiator, const char *url, int data_loss, i
 		scsi_free_scsi_task(task);
 		return -1;
 	}
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -2;
diff --git a/test-tool/0300_readonly.c b/test-tool/0300_readonly.c
index 3b8752f..74759f7 100644
--- a/test-tool/0300_readonly.c
+++ b/test-tool/0300_readonly.c
@@ -103,7 +103,7 @@ int T0300_readonly(const char *initiator, const char *url, int data_loss, int sh
 		scsi_free_scsi_task(task);
 		return -1;
 	}
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("LUN is not SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		return -1;
diff --git a/test-tool/0390_mandatory_opcodes_sbc.c b/test-tool/0390_mandatory_opcodes_sbc.c
index 44de673..d7c85dc 100644
--- a/test-tool/0390_mandatory_opcodes_sbc.c
+++ b/test-tool/0390_mandatory_opcodes_sbc.c
@@ -114,7 +114,7 @@ int T0390_mandatory_opcodes_sbc(const char *initiator, const char *url, int data
 	}
 	sccs    = inq->sccs;
 	encserv = inq->encserv;
-	if (inq->periperal_device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
+	if (inq->device_type != SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS) {
 		printf("Not a SBC device. Skipping test\n");
 		scsi_free_scsi_task(task);
 		ret = -2;