diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
index fbc8ab65372e..9db2201aa553 100644
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
@@ -813,7 +813,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
 				DA_UNMAP_ZEROES_DATA_DEFAULT;
 	dev->dev_attrib.max_write_same_len = DA_MAX_WRITE_SAME_LEN;
 	dev->dev_attrib.submit_type = TARGET_FABRIC_DEFAULT_SUBMIT;
-	dev->dev_attrib.submit_type = TARGET_FABRIC_DEFAULT_COMPL;
+	dev->dev_attrib.complete_type = TARGET_FABRIC_DEFAULT_COMPL;
 
 	/* Skip allocating lun_stats since we can't export them. */
 	xcopy_lun = &dev->xcopy_lun;
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 34249fb80c67..4e8d779dda5e 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -917,7 +917,7 @@ static void target_complete(struct se_cmd *cmd, int success)
 	da = &cmd->se_dev->dev_attrib;
 	if (da->complete_type == TARGET_FABRIC_DEFAULT_COMPL)
 		compl_type = wwn->wwn_tf->tf_ops->default_compl_type;
-	else if (da->complete_type == TARGET_DIRECT_SUBMIT &&
+	else if (da->complete_type == TARGET_DIRECT_COMPL &&
 		 wwn->wwn_tf->tf_ops->direct_compl_supp)
 		compl_type = TARGET_DIRECT_COMPL;
 	else