diff --git a/gpu/src/CommandEncoder.zig b/gpu/src/CommandEncoder.zig
deleted file mode 100644
index 1bdfcf23..00000000
--- a/gpu/src/CommandEncoder.zig
+++ /dev/null
@@ -1 +0,0 @@
-ptr: *anyopaque,
diff --git a/gpu/src/command_encoder.zig b/gpu/src/command_encoder.zig
new file mode 100644
index 00000000..d51e42bc
--- /dev/null
+++ b/gpu/src/command_encoder.zig
@@ -0,0 +1,5 @@
+pub const CommandEncoder = enum(usize) {
+    _,
+
+    pub const none: CommandEncoder = @intToEnum(CommandEncoder, 0);
+};
diff --git a/gpu/src/main.zig b/gpu/src/main.zig
index 8ebeb250..155f1486 100644
--- a/gpu/src/main.zig
+++ b/gpu/src/main.zig
@@ -14,7 +14,7 @@ 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("command_buffer.zig").CommandBuffer;
-pub const CommandEncoder = @import("CommandEncoder.zig");
+pub const CommandEncoder = @import("command_encoder.zig").CommandEncoder;
 pub const ComputePassEncoder = @import("ComputePassEncoder.zig");
 pub const ComputePipeline = @import("ComputePipeline.zig");
 pub const Device = @import("Device.zig");
@@ -42,7 +42,7 @@ test {
     refAllDecls(@import("bind_group_layout.zig"));
     refAllDecls(@import("buffer.zig"));
     refAllDecls(@import("command_buffer.zig"));
-    refAllDecls(@import("CommandEncoder.zig"));
+    refAllDecls(@import("command_encoder.zig"));
     refAllDecls(@import("ComputePassEncoder.zig"));
     refAllDecls(@import("ComputePipeline.zig"));
     refAllDecls(@import("Device.zig"));