diff --git a/include/spdk_internal/bdev.h b/include/spdk_internal/bdev.h
index 6d2b73e03..d03d3f09d 100644
--- a/include/spdk_internal/bdev.h
+++ b/include/spdk_internal/bdev.h
@@ -306,7 +306,7 @@ struct spdk_bdev_io {
 			uint64_t offset;
 
 			/** Represents the number of bytes to be flushed, starting at offset. */
-			uint64_t length;
+			uint64_t len;
 		} flush;
 		struct {
 			/* The NVMe command to execute */
diff --git a/lib/bdev/aio/bdev_aio.c b/lib/bdev/aio/bdev_aio.c
index b516d80f6..cba88d72a 100644
--- a/lib/bdev/aio/bdev_aio.c
+++ b/lib/bdev/aio/bdev_aio.c
@@ -256,7 +256,7 @@ static int _bdev_aio_submit_request(struct spdk_io_channel *ch, struct spdk_bdev
 		bdev_aio_flush((struct file_disk *)bdev_io->bdev->ctxt,
 			       (struct bdev_aio_task *)bdev_io->driver_ctx,
 			       bdev_io->u.flush.offset,
-			       bdev_io->u.flush.length);
+			       bdev_io->u.flush.len);
 		return 0;
 
 	case SPDK_BDEV_IO_TYPE_RESET:
diff --git a/lib/bdev/bdev.c b/lib/bdev/bdev.c
index b8ff721cd..feaa8cd3b 100644
--- a/lib/bdev/bdev.c
+++ b/lib/bdev/bdev.c
@@ -1037,7 +1037,7 @@ spdk_bdev_flush(struct spdk_bdev_desc *desc, struct spdk_io_channel *ch,
 	bdev_io->ch = channel;
 	bdev_io->type = SPDK_BDEV_IO_TYPE_FLUSH;
 	bdev_io->u.flush.offset = offset;
-	bdev_io->u.flush.length = length;
+	bdev_io->u.flush.len = length;
 	spdk_bdev_io_init(bdev_io, bdev, cb_arg, cb);
 
 	rc = spdk_bdev_io_submit(bdev_io);
diff --git a/lib/bdev/malloc/bdev_malloc.c b/lib/bdev/malloc/bdev_malloc.c
index 3da4baff8..deb7bc4e5 100644
--- a/lib/bdev/malloc/bdev_malloc.c
+++ b/lib/bdev/malloc/bdev_malloc.c
@@ -312,7 +312,7 @@ static int _bdev_malloc_submit_request(struct spdk_io_channel *ch, struct spdk_b
 		return bdev_malloc_flush((struct malloc_disk *)bdev_io->bdev->ctxt,
 					 (struct malloc_task *)bdev_io->driver_ctx,
 					 bdev_io->u.flush.offset,
-					 bdev_io->u.flush.length);
+					 bdev_io->u.flush.len);
 
 	case SPDK_BDEV_IO_TYPE_UNMAP:
 		return bdev_malloc_unmap((struct malloc_disk *)bdev_io->bdev->ctxt,
diff --git a/lib/bdev/nvme/bdev_nvme.c b/lib/bdev/nvme/bdev_nvme.c
index 6f13b0371..630104363 100644
--- a/lib/bdev/nvme/bdev_nvme.c
+++ b/lib/bdev/nvme/bdev_nvme.c
@@ -398,7 +398,7 @@ _bdev_nvme_submit_request(struct spdk_io_channel *ch, struct spdk_bdev_io *bdev_
 		return bdev_nvme_flush((struct nvme_bdev *)bdev_io->bdev->ctxt,
 				       (struct nvme_bdev_io *)bdev_io->driver_ctx,
 				       bdev_io->u.flush.offset,
-				       bdev_io->u.flush.length);
+				       bdev_io->u.flush.len);
 
 	case SPDK_BDEV_IO_TYPE_NVME_ADMIN:
 		return bdev_nvme_admin_passthru((struct nvme_bdev *)bdev_io->bdev->ctxt,
diff --git a/lib/bdev/rbd/bdev_rbd.c b/lib/bdev/rbd/bdev_rbd.c
index 94422210c..de8b55cdf 100644
--- a/lib/bdev/rbd/bdev_rbd.c
+++ b/lib/bdev/rbd/bdev_rbd.c
@@ -288,7 +288,7 @@ static int _bdev_rbd_submit_request(struct spdk_io_channel *ch, struct spdk_bdev
 				      ch,
 				      bdev_io,
 				      bdev_io->u.flush.offset,
-				      bdev_io->u.flush.length);
+				      bdev_io->u.flush.len);
 	default:
 		return -1;
 	}