diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp
index 7dd0ea1ef9..e72b73a22a 100644
--- a/src/v4l2/v4l2_camera.cpp
+++ b/src/v4l2/v4l2_camera.cpp
@@ -68,7 +68,7 @@ void V4L2Camera::unbind()
 	efd_ = -1;
 }
 
-std::vector<V4L2Camera::Buffer> V4L2Camera::completedBuffers()
+std::vector<V4L2Camera::CompletedBuffer> V4L2Camera::completedBuffers()
 {
 	MutexLocker lock(bufferLock_);
 	std::vector v(std::move_iterator(completedBuffers_.begin()),
diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h
index 8a58169d89..1d90eb43e4 100644
--- a/src/v4l2/v4l2_camera.h
+++ b/src/v4l2/v4l2_camera.h
@@ -23,8 +23,8 @@
 class V4L2Camera
 {
 public:
-	struct Buffer {
-		Buffer(unsigned int index, const libcamera::FrameMetadata &data)
+	struct CompletedBuffer {
+		CompletedBuffer(unsigned int index, const libcamera::FrameMetadata &data)
 			: index_(index), data_(data)
 		{
 		}
@@ -41,7 +41,7 @@ public:
 	void bind(int efd);
 	void unbind();
 
-	std::vector<Buffer> completedBuffers() LIBCAMERA_TSA_EXCLUDES(bufferLock_);
+	std::vector<CompletedBuffer> completedBuffers() LIBCAMERA_TSA_EXCLUDES(bufferLock_);
 
 	int configure(libcamera::StreamConfiguration *streamConfigOut,
 		      const libcamera::Size &size,
@@ -85,7 +85,7 @@ private:
 	std::vector<std::unique_ptr<libcamera::Request>> requestPool_;
 
 	std::deque<libcamera::Request *> pendingRequests_;
-	std::deque<Buffer> completedBuffers_
+	std::deque<CompletedBuffer> completedBuffers_
 		LIBCAMERA_TSA_GUARDED_BY(bufferLock_);
 
 	int efd_;
diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index 5281f10552..820a417a9c 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -243,8 +243,8 @@ void V4L2CameraProxy::querycap(std::shared_ptr<Camera> camera)
 
 void V4L2CameraProxy::updateBuffers()
 {
-	std::vector<V4L2Camera::Buffer> completedBuffers = vcam_->completedBuffers();
-	for (const V4L2Camera::Buffer &buffer : completedBuffers) {
+	std::vector<V4L2Camera::CompletedBuffer> completedBuffers = vcam_->completedBuffers();
+	for (const V4L2Camera::CompletedBuffer &buffer : completedBuffers) {
 		const FrameMetadata &fmd = buffer.data_;
 		struct v4l2_buffer &buf = buffers_[buffer.index_];