diff --git a/gpu/src/CommandBuffer.zig b/gpu/src/CommandBuffer.zig
deleted file mode 100644
index 1bdfcf23..00000000
--- a/gpu/src/CommandBuffer.zig
+++ /dev/null
@@ -1 +0,0 @@
-ptr: *anyopaque,
diff --git a/gpu/src/command_buffer.zig b/gpu/src/command_buffer.zig
new file mode 100644
index 00000000..cc93af7d
--- /dev/null
+++ b/gpu/src/command_buffer.zig
@@ -0,0 +1,5 @@
+pub const CommandBuffer = enum(usize) {
+    _,
+
+    pub const none: CommandBuffer = @intToEnum(CommandBuffer, 0);
+};
diff --git a/gpu/src/main.zig b/gpu/src/main.zig
index 69bb571a..8ebeb250 100644
--- a/gpu/src/main.zig
+++ b/gpu/src/main.zig
@@ -13,7 +13,7 @@ pub const Adapter = @import("adapter.zig").Adapter;
 pub const BindGroup = @import("bind_group.zig").BindGroup;
 pub const BindGroupLayout = @import("bind_group_layout.zig").BindGroupLayout;
 pub const Buffer = @import("buffer.zig").Buffer;
-pub const CommandBuffer = @import("CommandBuffer.zig");
+pub const CommandBuffer = @import("command_buffer.zig").CommandBuffer;
 pub const CommandEncoder = @import("CommandEncoder.zig");
 pub const ComputePassEncoder = @import("ComputePassEncoder.zig");
 pub const ComputePipeline = @import("ComputePipeline.zig");
@@ -41,7 +41,7 @@ test {
     refAllDecls(@import("bind_group.zig"));
     refAllDecls(@import("bind_group_layout.zig"));
     refAllDecls(@import("buffer.zig"));
-    refAllDecls(@import("CommandBuffer.zig"));
+    refAllDecls(@import("command_buffer.zig"));
     refAllDecls(@import("CommandEncoder.zig"));
     refAllDecls(@import("ComputePassEncoder.zig"));
     refAllDecls(@import("ComputePipeline.zig"));