diff --git a/lib/std/os/uefi/protocol/absolute_pointer.zig b/lib/std/os/uefi/protocol/absolute_pointer.zig
index 175d02f4ff..c1e4db03fb 100644
--- a/lib/std/os/uefi/protocol/absolute_pointer.zig
+++ b/lib/std/os/uefi/protocol/absolute_pointer.zig
@@ -4,7 +4,6 @@ const Event = uefi.Event;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Protocol for touchscreens.
 pub const AbsolutePointer = extern struct {
@@ -20,7 +19,7 @@ pub const AbsolutePointer = extern struct {
     pub fn reset(self: *AbsolutePointer, verify: bool) ResetError!void {
         switch (self._reset(self, verify)) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -30,8 +29,8 @@ pub const AbsolutePointer = extern struct {
         var state: State = undefined;
         switch (self._get_state(self, &state)) {
             .success => return state,
-            .not_ready => return Error.NotReady,
-            .device_error => return Error.DeviceError,
+            .not_ready => return error.NotReady,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/block_io.zig b/lib/std/os/uefi/protocol/block_io.zig
index 2ba608d7fd..cfe0b86166 100644
--- a/lib/std/os/uefi/protocol/block_io.zig
+++ b/lib/std/os/uefi/protocol/block_io.zig
@@ -2,7 +2,6 @@ const std = @import("std");
 const uefi = std.os.uefi;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const BlockIo = extern struct {
     const Self = @This();
@@ -39,7 +38,7 @@ pub const BlockIo = extern struct {
     pub fn reset(self: *Self, extended_verification: bool) ResetError!void {
         switch (self._reset(self, extended_verification)) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -48,10 +47,10 @@ pub const BlockIo = extern struct {
     pub fn readBlocks(self: *Self, media_id: u32, lba: u64, buf: []u8) ReadBlocksError!void {
         switch (self._read_blocks(self, media_id, lba, buf.len, buf.ptr)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .no_media => return Error.NoMedia,
-            .bad_buffer_size => return Error.BadBufferSize,
-            .invalid_parameter => return Error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .no_media => return error.NoMedia,
+            .bad_buffer_size => return error.BadBufferSize,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -60,12 +59,12 @@ pub const BlockIo = extern struct {
     pub fn writeBlocks(self: *Self, media_id: u32, lba: u64, buf: []const u8) WriteBlocksError!void {
         switch (self._write_blocks(self, media_id, lba, buf.len, buf.ptr)) {
             .success => {},
-            .write_protected => return Error.WriteProtected,
-            .no_media => return Error.NoMedia,
-            .media_changed => return Error.MediaChanged,
-            .device_error => return Error.DeviceError,
-            .bad_buffer_size => return Error.BadBufferSize,
-            .invalid_parameter => return Error.InvalidParameter,
+            .write_protected => return error.WriteProtected,
+            .no_media => return error.NoMedia,
+            .media_changed => return error.MediaChanged,
+            .device_error => return error.DeviceError,
+            .bad_buffer_size => return error.BadBufferSize,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -74,8 +73,8 @@ pub const BlockIo = extern struct {
     pub fn flushBlocks(self: *Self) FlushBlocksError!void {
         switch (self._flush_blocks(self)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .no_media => return Error.NoMedia,
+            .device_error => return error.DeviceError,
+            .no_media => return error.NoMedia,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/edid.zig b/lib/std/os/uefi/protocol/edid.zig
index 97e0601e2f..9196d95b2a 100644
--- a/lib/std/os/uefi/protocol/edid.zig
+++ b/lib/std/os/uefi/protocol/edid.zig
@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
 const Handle = uefi.Handle;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// EDID information for an active video output device
 pub const Active = extern struct {
@@ -51,7 +50,7 @@ pub const Override = extern struct {
         var attributes: Attributes = undefined;
         switch (self._get_edid(self, &handle, &attributes, &size, &ptr)) {
             .success => {},
-            .unsupported => return Error.Unsupported,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
 
diff --git a/lib/std/os/uefi/protocol/file.zig b/lib/std/os/uefi/protocol/file.zig
index 9b371916a7..0d3d11c708 100644
--- a/lib/std/os/uefi/protocol/file.zig
+++ b/lib/std/os/uefi/protocol/file.zig
@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
 const Time = uefi.Time;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const File = extern struct {
     revision: u64,
@@ -93,16 +92,16 @@ pub const File = extern struct {
             create_attributes,
         )) {
             .success => return new,
-            .not_found => return Error.NotFound,
-            .no_media => return Error.NoMedia,
-            .media_changed => return Error.MediaChanged,
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
-            .write_protected => return Error.WriteProtected,
-            .access_denied => return Error.AccessDenied,
-            .out_of_resources => return Error.OutOfResources,
-            .volume_full => return Error.VolumeFull,
-            .invalid_parameter => return Error.InvalidParameter,
+            .not_found => return error.NotFound,
+            .no_media => return error.NoMedia,
+            .media_changed => return error.MediaChanged,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
+            .write_protected => return error.WriteProtected,
+            .access_denied => return error.AccessDenied,
+            .out_of_resources => return error.OutOfResources,
+            .volume_full => return error.VolumeFull,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -130,10 +129,10 @@ pub const File = extern struct {
         var size: usize = buffer.len;
         switch (self._read(self, &size, buffer.ptr)) {
             .success => return size,
-            .no_media => return Error.NoMedia,
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
-            .buffer_too_small => return Error.BufferTooSmall,
+            .no_media => return error.NoMedia,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
+            .buffer_too_small => return error.BufferTooSmall,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -142,13 +141,13 @@ pub const File = extern struct {
         var size: usize = buffer.len;
         switch (self._write(self, &size, buffer.ptr)) {
             .success => return size,
-            .unsupported => return Error.Unsupported,
-            .no_media => return Error.NoMedia,
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
-            .write_protected => return Error.WriteProtected,
-            .access_denied => return Error.AccessDenied,
-            .volume_full => return Error.VolumeFull,
+            .unsupported => return error.Unsupported,
+            .no_media => return error.NoMedia,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
+            .write_protected => return error.WriteProtected,
+            .access_denied => return error.AccessDenied,
+            .volume_full => return error.VolumeFull,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -157,8 +156,8 @@ pub const File = extern struct {
         var position: u64 = undefined;
         switch (self._get_position(self, &position)) {
             .success => return position,
-            .unsupported => return Error.Unsupported,
-            .device_error => return Error.DeviceError,
+            .unsupported => return error.Unsupported,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -166,8 +165,8 @@ pub const File = extern struct {
     pub fn setPosition(self: *File, position: u64) SeekError!void {
         switch (self._set_position(self, position)) {
             .success => {},
-            .unsupported => return Error.Unsupported,
-            .device_error => return Error.DeviceError,
+            .unsupported => return error.Unsupported,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -190,10 +189,10 @@ pub const File = extern struct {
         var len: usize = 0;
         switch (self._get_info(self, &InfoType.guid, &len, null)) {
             .success, .buffer_too_small => return len,
-            .unsupported => return Error.Unsupported,
-            .no_media => return Error.NoMedia,
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
+            .unsupported => return error.Unsupported,
+            .no_media => return error.NoMedia,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -216,11 +215,11 @@ pub const File = extern struct {
             buffer.ptr,
         )) {
             .success => return @as(*InfoType, @ptrCast(buffer.ptr)),
-            .buffer_too_small => return Error.BufferTooSmall,
-            .unsupported => return Error.Unsupported,
-            .no_media => return Error.NoMedia,
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
+            .buffer_too_small => return error.BufferTooSmall,
+            .unsupported => return error.Unsupported,
+            .no_media => return error.NoMedia,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -244,14 +243,14 @@ pub const File = extern struct {
 
         switch (self._set_info(self, &InfoType.guid, len, @ptrCast(data))) {
             .success => {},
-            .unsupported => return Error.Unsupported,
-            .no_media => return Error.NoMedia,
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
-            .write_protected => return Error.WriteProtected,
-            .access_denied => return Error.AccessDenied,
-            .volume_full => return Error.VolumeFull,
-            .bad_buffer_size => return Error.BadBufferSize,
+            .unsupported => return error.Unsupported,
+            .no_media => return error.NoMedia,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
+            .write_protected => return error.WriteProtected,
+            .access_denied => return error.AccessDenied,
+            .volume_full => return error.VolumeFull,
+            .bad_buffer_size => return error.BadBufferSize,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -259,11 +258,11 @@ pub const File = extern struct {
     pub fn flush(self: *File) FlushError!void {
         switch (self._flush(self)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
-            .write_protected => return Error.WriteProtected,
-            .access_denied => return Error.AccessDenied,
-            .volume_full => return Error.VolumeFull,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
+            .write_protected => return error.WriteProtected,
+            .access_denied => return error.AccessDenied,
+            .volume_full => return error.VolumeFull,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/graphics_output.zig b/lib/std/os/uefi/protocol/graphics_output.zig
index eba19fc0f5..397afdee45 100644
--- a/lib/std/os/uefi/protocol/graphics_output.zig
+++ b/lib/std/os/uefi/protocol/graphics_output.zig
@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const GraphicsOutput = extern struct {
     _query_mode: *const fn (*const GraphicsOutput, u32, *usize, **Mode.Info) callconv(cc) Status,
@@ -30,8 +29,8 @@ pub const GraphicsOutput = extern struct {
         var info: *Mode.Info = undefined;
         switch (self._query_mode(self, mode_id, &size_of_info, &info)) {
             .success => return info,
-            .device_error => return Error.DeviceError,
-            .invalid_parameter => return Error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -40,8 +39,8 @@ pub const GraphicsOutput = extern struct {
     pub fn setMode(self: *GraphicsOutput, mode_id: u32) SetModeError!void {
         switch (self._set_mode(self, mode_id)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -72,8 +71,8 @@ pub const GraphicsOutput = extern struct {
             delta,
         )) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .invalid_parameter => return Error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/hii_database.zig b/lib/std/os/uefi/protocol/hii_database.zig
index f974dd7907..72d4e8fde0 100644
--- a/lib/std/os/uefi/protocol/hii_database.zig
+++ b/lib/std/os/uefi/protocol/hii_database.zig
@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
 const Status = uefi.Status;
 const hii = uefi.hii;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Database manager for HII-related data structures.
 pub const HiiDatabase = extern struct {
@@ -38,10 +37,10 @@ pub const HiiDatabase = extern struct {
     };
 
     /// Removes a package list from the HII database.
-    pub fn removePackageList(self: *HiiDatabase, handle: hii.Handle) !void {
+    pub fn removePackageList(self: *HiiDatabase, handle: hii.Handle) RemovePackageListError!void {
         switch (self._remove_package_list(self, handle)) {
             .success => {},
-            .not_found => return Error.NotFound,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -54,9 +53,9 @@ pub const HiiDatabase = extern struct {
     ) UpdatePackageListError!void {
         switch (self._update_package_list(self, handle, buffer)) {
             .success => {},
-            .out_of_resources => return Error.OutOfResources,
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_found => return Error.NotFound,
+            .out_of_resources => return error.OutOfResources,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -77,9 +76,9 @@ pub const HiiDatabase = extern struct {
             handles.ptr,
         )) {
             .success => return handles[0..len],
-            .buffer_too_small => return Error.BufferTooSmall,
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_found => return Error.NotFound,
+            .buffer_too_small => return error.BufferTooSmall,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -93,9 +92,9 @@ pub const HiiDatabase = extern struct {
         var len = buffer.len;
         switch (self._export_package_lists(self, handle, &len, buffer.ptr)) {
             .success => return buffer[0..len],
-            .buffer_too_small => return Error.BufferTooSmall,
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_found => return Error.NotFound,
+            .buffer_too_small => return error.BufferTooSmall,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/hii_popup.zig b/lib/std/os/uefi/protocol/hii_popup.zig
index 19a9b4ace6..71a19a4239 100644
--- a/lib/std/os/uefi/protocol/hii_popup.zig
+++ b/lib/std/os/uefi/protocol/hii_popup.zig
@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
 const Status = uefi.Status;
 const hii = uefi.hii;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Display a popup window
 pub const HiiPopup = extern struct {
@@ -27,8 +26,8 @@ pub const HiiPopup = extern struct {
         var res: PopupSelection = undefined;
         switch (self._create_popup(self, style, popup_type, handle, msg, &res)) {
             .success => return res,
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/ip6.zig b/lib/std/os/uefi/protocol/ip6.zig
index 802ea3cde8..a2e89b97cd 100644
--- a/lib/std/os/uefi/protocol/ip6.zig
+++ b/lib/std/os/uefi/protocol/ip6.zig
@@ -7,7 +7,6 @@ const MacAddress = uefi.MacAddress;
 const ManagedNetworkConfigData = uefi.protocol.ManagedNetwork.Config;
 const SimpleNetwork = uefi.protocol.SimpleNetwork;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const Ip6 = extern struct {
     _get_mode_data: *const fn (*const Ip6, ?*Mode, ?*ManagedNetworkConfigData, ?*SimpleNetwork) callconv(cc) Status,
@@ -102,8 +101,8 @@ pub const Ip6 = extern struct {
         var data: ModeData = undefined;
         switch (self._get_mode_data(self, &data.ip6_mode, &data.mnp_config, &data.snp_mode)) {
             .success => return data,
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -114,12 +113,12 @@ pub const Ip6 = extern struct {
     pub fn configure(self: *Ip6, ip6_config_data: *const Config) ConfigureError!void {
         switch (self._configure(self, ip6_config_data)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
-            .no_mapping => return Error.NoMapping,
-            .already_started => return Error.AlreadyStarted,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
+            .no_mapping => return error.NoMapping,
+            .already_started => return error.AlreadyStarted,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -127,12 +126,12 @@ pub const Ip6 = extern struct {
     pub fn disable(self: *Ip6) ConfigureError!void {
         switch (self._configure(self, null)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
-            .no_mapping => return Error.NoMapping,
-            .already_started => return Error.AlreadyStarted,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
+            .no_mapping => return error.NoMapping,
+            .already_started => return error.AlreadyStarted,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -140,13 +139,13 @@ pub const Ip6 = extern struct {
     pub fn leaveAllGroups(self: *Ip6) GroupsError!void {
         switch (self._groups(self, false, null)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_started => return Error.NotStarted,
-            .out_of_resources => return Error.OutOfResources,
-            .unsupported => return Error.Unsupported,
-            .already_started => return Error.AlreadyStarted,
-            .not_found => return Error.NotFound,
-            .device_error => return Error.DeviceError,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_started => return error.NotStarted,
+            .out_of_resources => return error.OutOfResources,
+            .unsupported => return error.Unsupported,
+            .already_started => return error.AlreadyStarted,
+            .not_found => return error.NotFound,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -166,13 +165,13 @@ pub const Ip6 = extern struct {
             group_address,
         )) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_started => return Error.NotStarted,
-            .out_of_resources => return Error.OutOfResources,
-            .unsupported => return Error.Unsupported,
-            .already_started => return Error.AlreadyStarted,
-            .not_found => return Error.NotFound,
-            .device_error => return Error.DeviceError,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_started => return error.NotStarted,
+            .out_of_resources => return error.OutOfResources,
+            .unsupported => return error.Unsupported,
+            .already_started => return error.AlreadyStarted,
+            .not_found => return error.NotFound,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -193,11 +192,11 @@ pub const Ip6 = extern struct {
             gateway_address,
         )) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
-            .not_found => return Error.NotFound,
-            .access_denied => return Error.AccessDenied,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
+            .not_found => return error.NotFound,
+            .access_denied => return error.AccessDenied,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -222,11 +221,11 @@ pub const Ip6 = extern struct {
             override,
         )) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
-            .not_found => return Error.NotFound,
-            .access_denied => return Error.AccessDenied,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
+            .not_found => return error.NotFound,
+            .access_denied => return error.AccessDenied,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -235,17 +234,17 @@ pub const Ip6 = extern struct {
     pub fn transmit(self: *Ip6, token: *CompletionToken) TransmitError!void {
         switch (self._transmit(self, token)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .no_mapping => return Error.NoMapping,
-            .invalid_parameter => return Error.InvalidParameter,
-            .access_denied => return Error.AccessDenied,
-            .not_ready => return Error.NotReady,
-            .not_found => return Error.NotFound,
-            .out_of_resources => return Error.OutOfResources,
-            .buffer_too_small => return Error.BufferTooSmall,
-            .bad_buffer_size => return Error.BadBufferSize,
-            .device_error => return Error.DeviceError,
-            .no_media => return Error.NoMedia,
+            .not_started => return error.NotStarted,
+            .no_mapping => return error.NoMapping,
+            .invalid_parameter => return error.InvalidParameter,
+            .access_denied => return error.AccessDenied,
+            .not_ready => return error.NotReady,
+            .not_found => return error.NotFound,
+            .out_of_resources => return error.OutOfResources,
+            .buffer_too_small => return error.BufferTooSmall,
+            .bad_buffer_size => return error.BadBufferSize,
+            .device_error => return error.DeviceError,
+            .no_media => return error.NoMedia,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -254,14 +253,14 @@ pub const Ip6 = extern struct {
     pub fn receive(self: *Ip6, token: *CompletionToken) ReceiveError!void {
         switch (self._receive(self, token)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .no_mapping => return Error.NoMapping,
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
-            .device_error => return Error.DeviceError,
-            .access_denied => return Error.AccessDenied,
-            .not_ready => return Error.NotReady,
-            .no_media => return Error.NoMedia,
+            .not_started => return error.NotStarted,
+            .no_mapping => return error.NoMapping,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
+            .device_error => return error.DeviceError,
+            .access_denied => return error.AccessDenied,
+            .not_ready => return error.NotReady,
+            .no_media => return error.NoMedia,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -270,10 +269,10 @@ pub const Ip6 = extern struct {
     pub fn cancel(self: *Ip6, token: ?*CompletionToken) CancelError!void {
         switch (self._cancel(self, token)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_started => return Error.NotStarted,
-            .not_found => return Error.NotFound,
-            .device_error => return Error.DeviceError,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_started => return error.NotStarted,
+            .not_found => return error.NotFound,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -285,10 +284,10 @@ pub const Ip6 = extern struct {
         switch (self._poll(self)) {
             .success => return true,
             .not_ready => return false,
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .timeout => return Error.Timeout,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .timeout => return error.Timeout,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/ip6_config.zig b/lib/std/os/uefi/protocol/ip6_config.zig
index 0ada2a7899..ad50b80b4c 100644
--- a/lib/std/os/uefi/protocol/ip6_config.zig
+++ b/lib/std/os/uefi/protocol/ip6_config.zig
@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
 const Event = uefi.Event;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 const MacAddress = uefi.MacAddress;
 const Ip6 = uefi.protocol.Ip6;
 
@@ -49,14 +48,14 @@ pub const Ip6Config = extern struct {
         const data_size = @sizeOf(@TypeOf(payload));
         switch (self._set_data(self, data_type, data_size, @ptrCast(payload))) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .write_protected => return Error.WriteProtected,
-            .access_denied => return Error.AccessDenied,
-            .not_ready => return Error.NotReady,
-            .bad_buffer_size => return Error.BadBufferSize,
-            .unsupported => return Error.Unsupported,
-            .out_of_resources => return Error.OutOfResources,
-            .device_error => return Error.DeviceError,
+            .invalid_parameter => return error.InvalidParameter,
+            .write_protected => return error.WriteProtected,
+            .access_denied => return error.AccessDenied,
+            .not_ready => return error.NotReady,
+            .bad_buffer_size => return error.BadBufferSize,
+            .unsupported => return error.Unsupported,
+            .out_of_resources => return error.OutOfResources,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -72,10 +71,10 @@ pub const Ip6Config = extern struct {
 
         switch (self._get_data(self, data_type, &payload_size, @ptrCast(&payload))) {
             .success => return payload,
-            .invalid_parameter => return Error.InvalidParameter,
-            .buffer_too_small => return Error.BufferTooSmall,
-            .not_ready => return Error.NotReady,
-            .not_found => return Error.NotFound,
+            .invalid_parameter => return error.InvalidParameter,
+            .buffer_too_small => return error.BufferTooSmall,
+            .not_ready => return error.NotReady,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -87,10 +86,10 @@ pub const Ip6Config = extern struct {
     ) RegisterDataNotifyError!void {
         switch (self._register_data_notify(self, data_type, event)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .unsupported => return Error.Unsupported,
-            .out_of_resources => return Error.OutOfResources,
-            .access_denied => return Error.AccessDenied,
+            .invalid_parameter => return error.InvalidParameter,
+            .unsupported => return error.Unsupported,
+            .out_of_resources => return error.OutOfResources,
+            .access_denied => return error.AccessDenied,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -102,8 +101,8 @@ pub const Ip6Config = extern struct {
     ) UnregisterDataNotifyError!void {
         switch (self._unregister_data_notify(self, data_type, event)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_found => return Error.NotFound,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/loaded_image.zig b/lib/std/os/uefi/protocol/loaded_image.zig
index f539bac537..3d768dbb67 100644
--- a/lib/std/os/uefi/protocol/loaded_image.zig
+++ b/lib/std/os/uefi/protocol/loaded_image.zig
@@ -7,7 +7,6 @@ const SystemTable = uefi.tables.SystemTable;
 const MemoryType = uefi.tables.MemoryType;
 const DevicePath = uefi.protocol.DevicePath;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const LoadedImage = extern struct {
     revision: u32,
@@ -30,7 +29,7 @@ pub const LoadedImage = extern struct {
     pub fn unload(self: *LoadedImage, handle: Handle) UnloadError!void {
         switch (self._unload(self, handle)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/managed_network.zig b/lib/std/os/uefi/protocol/managed_network.zig
index f9e484be08..302cc2c2c1 100644
--- a/lib/std/os/uefi/protocol/managed_network.zig
+++ b/lib/std/os/uefi/protocol/managed_network.zig
@@ -141,13 +141,13 @@ pub const ManagedNetwork = extern struct {
     pub fn transmit(self: *ManagedNetwork, token: *CompletionToken) TransmitError!void {
         switch (self._transmit(self, token)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .access_denied => return Error.AccessDenied,
-            .out_of_resources => return Error.OutOfResources,
-            .device_error => return Error.DeviceError,
-            .not_ready => return Error.NotReady,
-            .no_media => return Error.NoMedia,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .access_denied => return error.AccessDenied,
+            .out_of_resources => return error.OutOfResources,
+            .device_error => return error.DeviceError,
+            .not_ready => return error.NotReady,
+            .no_media => return error.NoMedia,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -156,13 +156,13 @@ pub const ManagedNetwork = extern struct {
     pub fn receive(self: *ManagedNetwork, token: *CompletionToken) TransmitError!void {
         switch (self._receive(self, token)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
-            .device_error => return Error.DeviceError,
-            .access_denied => return Error.AccessDenied,
-            .not_ready => return Error.NotReady,
-            .no_media => return Error.NoMedia,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
+            .device_error => return error.DeviceError,
+            .access_denied => return error.AccessDenied,
+            .not_ready => return error.NotReady,
+            .no_media => return error.NoMedia,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -171,9 +171,9 @@ pub const ManagedNetwork = extern struct {
     pub fn cancel(self: *ManagedNetwork, token: ?*const CompletionToken) CancelError!void {
         switch (self._cancel(self, token)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_found => return Error.NotFound,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -182,10 +182,10 @@ pub const ManagedNetwork = extern struct {
     pub fn poll(self: *ManagedNetwork) PollError!void {
         switch (self._poll(self)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .device_error => return Error.DeviceError,
-            .not_ready => return Error.NotReady,
-            .timeout => return Error.Timeout,
+            .not_started => return error.NotStarted,
+            .device_error => return error.DeviceError,
+            .not_ready => return error.NotReady,
+            .timeout => return error.Timeout,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/rng.zig b/lib/std/os/uefi/protocol/rng.zig
index 4cc3edee64..d5385a3a70 100644
--- a/lib/std/os/uefi/protocol/rng.zig
+++ b/lib/std/os/uefi/protocol/rng.zig
@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Random Number Generator protocol
 pub const Rng = extern struct {
@@ -27,9 +26,9 @@ pub const Rng = extern struct {
         var len: usize = list.len;
         switch (self._get_info(self, &len, list.ptr)) {
             .success => return list[0..len],
-            .unsupported => return Error.Unsupported,
-            .device_error => return Error.DeviceError,
-            .buffer_too_small => return Error.BufferTooSmall,
+            .unsupported => return error.Unsupported,
+            .device_error => return error.DeviceError,
+            .buffer_too_small => return error.BufferTooSmall,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -38,10 +37,10 @@ pub const Rng = extern struct {
     pub fn getRNG(self: *const Rng, algo: ?*align(8) const Guid, value: []u8) GetRNGError!void {
         switch (self._get_rng(self, algo, value.len, value.ptr)) {
             .success => {},
-            .unsupported => return Error.Unsupported,
-            .device_error => return Error.DeviceError,
-            .not_ready => return Error.NotReady,
-            .invalid_parameter => return Error.InvalidParameter,
+            .unsupported => return error.Unsupported,
+            .device_error => return error.DeviceError,
+            .not_ready => return error.NotReady,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/serial_io.zig b/lib/std/os/uefi/protocol/serial_io.zig
index 83210d2e5f..3ce8bc2e87 100644
--- a/lib/std/os/uefi/protocol/serial_io.zig
+++ b/lib/std/os/uefi/protocol/serial_io.zig
@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const SerialIo = extern struct {
     revision: u64,
@@ -39,7 +38,7 @@ pub const SerialIo = extern struct {
     pub fn reset(self: *SerialIo) ResetError!void {
         switch (self._reset(self)) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -64,8 +63,8 @@ pub const SerialIo = extern struct {
             stop_bits,
         )) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -74,8 +73,8 @@ pub const SerialIo = extern struct {
     pub fn setControl(self: *SerialIo, control: u32) SetControlError!void {
         switch (self._set_control(self, control)) {
             .success => {},
-            .unsupported => return Error.Unsupported,
-            .device_error => return Error.DeviceError,
+            .unsupported => return error.Unsupported,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -85,7 +84,7 @@ pub const SerialIo = extern struct {
         var control: u32 = undefined;
         switch (self._get_control(self, &control)) {
             .success => return control,
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -95,8 +94,8 @@ pub const SerialIo = extern struct {
         var len: usize = buffer.len;
         switch (self._write(self, &len, buffer.ptr)) {
             .success => return len,
-            .device_error => return Error.DeviceError,
-            .timeout => return Error.Timeout,
+            .device_error => return error.DeviceError,
+            .timeout => return error.Timeout,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -106,8 +105,8 @@ pub const SerialIo = extern struct {
         var len: usize = buffer.len;
         switch (self._read(self, &len, buffer.ptr)) {
             .success => return len,
-            .device_error => return Error.DeviceError,
-            .timeout => return Error.Timeout,
+            .device_error => return error.DeviceError,
+            .timeout => return error.Timeout,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/simple_file_system.zig b/lib/std/os/uefi/protocol/simple_file_system.zig
index 23118e1710..ad85837db6 100644
--- a/lib/std/os/uefi/protocol/simple_file_system.zig
+++ b/lib/std/os/uefi/protocol/simple_file_system.zig
@@ -4,7 +4,6 @@ const Guid = uefi.Guid;
 const File = uefi.protocol.File;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const SimpleFileSystem = extern struct {
     revision: u64,
@@ -24,13 +23,13 @@ pub const SimpleFileSystem = extern struct {
         var root: *File = undefined;
         switch (self._open_volume(self, &root)) {
             .success => return root,
-            .unsupported => return Error.Unsupported,
-            .no_media => return Error.NoMedia,
-            .device_error => return Error.DeviceError,
-            .volume_corrupted => return Error.VolumeCorrupted,
-            .access_denied => return Error.AccessDenied,
-            .out_of_resources => return Error.OutOfResources,
-            .media_changed => return Error.MediaChanged,
+            .unsupported => return error.Unsupported,
+            .no_media => return error.NoMedia,
+            .device_error => return error.DeviceError,
+            .volume_corrupted => return error.VolumeCorrupted,
+            .access_denied => return error.AccessDenied,
+            .out_of_resources => return error.OutOfResources,
+            .media_changed => return error.MediaChanged,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/simple_network.zig b/lib/std/os/uefi/protocol/simple_network.zig
index 1a151865fa..b735b23409 100644
--- a/lib/std/os/uefi/protocol/simple_network.zig
+++ b/lib/std/os/uefi/protocol/simple_network.zig
@@ -4,7 +4,6 @@ const Event = uefi.Event;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const SimpleNetwork = extern struct {
     revision: u64,
@@ -110,10 +109,10 @@ pub const SimpleNetwork = extern struct {
     pub fn start(self: *SimpleNetwork) StartError!void {
         switch (self._start(self)) {
             .success => {},
-            .already_started => return Error.AlreadyStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .already_started => return error.AlreadyStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -122,10 +121,10 @@ pub const SimpleNetwork = extern struct {
     pub fn stop(self: *SimpleNetwork) StopError!void {
         switch (self._stop(self)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -138,11 +137,11 @@ pub const SimpleNetwork = extern struct {
     ) InitializeError!void {
         switch (self._initialize(self, extra_rx_buffer_size, extra_tx_buffer_size)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .out_of_resources => return Error.OutOfResources,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .out_of_resources => return error.OutOfResources,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -151,10 +150,10 @@ pub const SimpleNetwork = extern struct {
     pub fn reset(self: *SimpleNetwork, extended_verification: bool) ResetError!void {
         switch (self._reset(self, extended_verification)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -163,9 +162,9 @@ pub const SimpleNetwork = extern struct {
     pub fn shutdown(self: *SimpleNetwork) ShutdownError!void {
         switch (self._shutdown(self)) {
             .success => {},
-            .not_started => return ShutdownError.NotStarted,
-            .invalid_parameter => return ShutdownError.InvalidParameter,
-            .device_error => return ShutdownError.DeviceError,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -186,10 +185,10 @@ pub const SimpleNetwork = extern struct {
 
         switch (self._receive_filters(self, enable, disable, reset_mcast_filter, count, ptr)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -202,10 +201,10 @@ pub const SimpleNetwork = extern struct {
     ) StationAddressError!void {
         switch (self._station_address(self, reset_flag, new)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -213,10 +212,10 @@ pub const SimpleNetwork = extern struct {
     pub fn resetStatistics(self: *SimpleNetwork) StatisticsError!void {
         switch (self._statistics(self, true, null, null)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -227,10 +226,10 @@ pub const SimpleNetwork = extern struct {
         var stats_size: usize = @sizeOf(Statistics);
         switch (self._statistics(self, reset_flag, &stats_size, &stats)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
 
@@ -249,10 +248,10 @@ pub const SimpleNetwork = extern struct {
         var mac: MacAddress = undefined;
         switch (self._mcast_ip_to_mac(self, ipv6, ip, &mac)) {
             .success => return mac,
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -273,10 +272,10 @@ pub const SimpleNetwork = extern struct {
             buffer.ptr,
         )) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -289,9 +288,9 @@ pub const SimpleNetwork = extern struct {
     ) GetStatusError!void {
         switch (self._get_status(self, interrupt_status, recycled_tx_buf)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -315,12 +314,12 @@ pub const SimpleNetwork = extern struct {
             protocol,
         )) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .not_ready => return Error.NotReady,
-            .buffer_too_small => return Error.BufferTooSmall,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_started => return error.NotStarted,
+            .not_ready => return error.NotReady,
+            .buffer_too_small => return error.BufferTooSmall,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -340,11 +339,11 @@ pub const SimpleNetwork = extern struct {
             &packet.protocol,
         )) {
             .success => return packet,
-            .not_started => return Error.NotStarted,
-            .not_ready => return Error.NotReady,
-            .buffer_too_small => return Error.BufferTooSmall,
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
+            .not_started => return error.NotStarted,
+            .not_ready => return error.NotReady,
+            .buffer_too_small => return error.BufferTooSmall,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/simple_pointer.zig b/lib/std/os/uefi/protocol/simple_pointer.zig
index ea160b2b18..87d74a0aef 100644
--- a/lib/std/os/uefi/protocol/simple_pointer.zig
+++ b/lib/std/os/uefi/protocol/simple_pointer.zig
@@ -4,7 +4,6 @@ const Event = uefi.Event;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Protocol for mice.
 pub const SimplePointer = struct {
@@ -23,7 +22,7 @@ pub const SimplePointer = struct {
     pub fn reset(self: *SimplePointer, verify: bool) ResetError!void {
         switch (self._reset(self, verify)) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -33,8 +32,8 @@ pub const SimplePointer = struct {
         var state: State = undefined;
         switch (self._get_state(self, &state)) {
             .success => return state,
-            .not_ready => return Error.NotReady,
-            .device_error => return Error.DeviceError,
+            .not_ready => return error.NotReady,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/simple_text_input.zig b/lib/std/os/uefi/protocol/simple_text_input.zig
index a39e312b68..14172e2e7f 100644
--- a/lib/std/os/uefi/protocol/simple_text_input.zig
+++ b/lib/std/os/uefi/protocol/simple_text_input.zig
@@ -4,7 +4,6 @@ const Event = uefi.Event;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Character input devices, e.g. Keyboard
 pub const SimpleTextInput = extern struct {
@@ -23,7 +22,7 @@ pub const SimpleTextInput = extern struct {
     pub fn reset(self: *SimpleTextInput, verify: bool) ResetError!void {
         switch (self._reset(self, verify)) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -33,9 +32,9 @@ pub const SimpleTextInput = extern struct {
         var key: Key.Input = undefined;
         switch (self._read_key_stroke(self, &key)) {
             .success => return key,
-            .not_ready => return Error.NotReady,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_ready => return error.NotReady,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/simple_text_input_ex.zig b/lib/std/os/uefi/protocol/simple_text_input_ex.zig
index 9cc4a50844..7a74ea1071 100644
--- a/lib/std/os/uefi/protocol/simple_text_input_ex.zig
+++ b/lib/std/os/uefi/protocol/simple_text_input_ex.zig
@@ -4,7 +4,6 @@ const Event = uefi.Event;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Character input devices, e.g. Keyboard
 pub const SimpleTextInputEx = extern struct {
@@ -32,7 +31,7 @@ pub const SimpleTextInputEx = extern struct {
     pub fn reset(self: *SimpleTextInputEx, verify: bool) ResetError!void {
         switch (self._reset(self, verify)) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -42,9 +41,9 @@ pub const SimpleTextInputEx = extern struct {
         var key: Key = undefined;
         switch (self._read_key_stroke_ex(self, &key)) {
             .success => return key,
-            .not_ready => return Error.NotReady,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .not_ready => return error.NotReady,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -53,8 +52,8 @@ pub const SimpleTextInputEx = extern struct {
     pub fn setState(self: *SimpleTextInputEx, state: *const Key.State.Toggle) SetStateError!void {
         switch (self._set_state(self, @ptrCast(state))) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -68,7 +67,7 @@ pub const SimpleTextInputEx = extern struct {
         var handle: uefi.Handle = undefined;
         switch (self._register_key_notify(self, key_data, notify, &handle)) {
             .success => return handle,
-            .out_of_resources => return Error.OutOfResources,
+            .out_of_resources => return error.OutOfResources,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -80,7 +79,7 @@ pub const SimpleTextInputEx = extern struct {
     ) UnregisterKeyNotifyError!void {
         switch (self._unregister_key_notify(self, handle)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/simple_text_output.zig b/lib/std/os/uefi/protocol/simple_text_output.zig
index af1ded2303..6c3802dabb 100644
--- a/lib/std/os/uefi/protocol/simple_text_output.zig
+++ b/lib/std/os/uefi/protocol/simple_text_output.zig
@@ -3,7 +3,6 @@ const uefi = std.os.uefi;
 const Guid = uefi.Guid;
 const Status = uefi.Status;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 /// Character output devices
 pub const SimpleTextOutput = extern struct {
@@ -49,7 +48,7 @@ pub const SimpleTextOutput = extern struct {
     pub fn reset(self: *SimpleTextOutput, verify: bool) ResetError!void {
         switch (self._reset(self, verify)) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -61,8 +60,8 @@ pub const SimpleTextOutput = extern struct {
         switch (self._output_string(self, msg)) {
             .success => return true,
             .warn_unknown_glyph => return false,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -81,8 +80,8 @@ pub const SimpleTextOutput = extern struct {
         var geo: Geometry = undefined;
         switch (self._query_mode(self, mode_number, &geo.columns, &geo.rows)) {
             .success => return geo,
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -91,8 +90,8 @@ pub const SimpleTextOutput = extern struct {
     pub fn setMode(self: *SimpleTextOutput, mode_number: usize) SetModeError!void {
         switch (self._set_mode(self, mode_number)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -102,7 +101,7 @@ pub const SimpleTextOutput = extern struct {
         const attr_as_num: u8 = @bitCast(attribute);
         switch (self._set_attribute(self, @intCast(attr_as_num))) {
             .success => {},
-            .device_error => return Error.DeviceError,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -111,8 +110,8 @@ pub const SimpleTextOutput = extern struct {
     pub fn clearScreen(self: *SimpleTextOutput) ClearScreenError!void {
         switch (self._clear_screen(self)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -125,8 +124,8 @@ pub const SimpleTextOutput = extern struct {
     ) SetCursorPositionError!void {
         switch (self._set_cursor_position(self, column, row)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -135,8 +134,8 @@ pub const SimpleTextOutput = extern struct {
     pub fn enableCursor(self: *SimpleTextOutput, visible: bool) EnableCursorError!void {
         switch (self._enable_cursor(self, visible)) {
             .success => {},
-            .device_error => return Error.DeviceError,
-            .unsupported => return Error.Unsupported,
+            .device_error => return error.DeviceError,
+            .unsupported => return error.Unsupported,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
diff --git a/lib/std/os/uefi/protocol/udp6.zig b/lib/std/os/uefi/protocol/udp6.zig
index 7994fa98b0..74b72c4a56 100644
--- a/lib/std/os/uefi/protocol/udp6.zig
+++ b/lib/std/os/uefi/protocol/udp6.zig
@@ -8,7 +8,6 @@ const Ip6 = uefi.protocol.Ip6;
 const ManagedNetworkConfigData = uefi.protocol.ManagedNetwork.Config;
 const SimpleNetwork = uefi.protocol.SimpleNetwork;
 const cc = uefi.cc;
-const Error = Status.Error;
 
 pub const Udp6 = extern struct {
     _get_mode_data: *const fn (*const Udp6, ?*Config, ?*Ip6.Mode, ?*ManagedNetworkConfigData, ?*SimpleNetwork) callconv(cc) Status,
@@ -81,8 +80,8 @@ pub const Udp6 = extern struct {
             &data.snp_mode_data,
         )) {
             .success => return data,
-            .not_started => return Error.NotStarted,
-            .invalid_parameter => return Error.InvalidParameter,
+            .not_started => return error.NotStarted,
+            .invalid_parameter => return error.InvalidParameter,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -90,12 +89,12 @@ pub const Udp6 = extern struct {
     pub fn configure(self: *Udp6, udp6_config_data: ?*const Config) ConfigureError!void {
         switch (self._configure(self, udp6_config_data)) {
             .success => {},
-            .no_mapping => return Error.NoMapping,
-            .invalid_parameter => return Error.InvalidParameter,
-            .already_started => return Error.AlreadyStarted,
-            .access_denied => return Error.AccessDenied,
-            .out_of_resources => return Error.OutOfResources,
-            .device_error => return Error.DeviceError,
+            .no_mapping => return error.NoMapping,
+            .invalid_parameter => return error.InvalidParameter,
+            .already_started => return error.AlreadyStarted,
+            .access_denied => return error.AccessDenied,
+            .out_of_resources => return error.OutOfResources,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -112,12 +111,12 @@ pub const Udp6 = extern struct {
             multicast_address,
         )) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .out_of_resources => return Error.OutOfResources,
-            .invalid_parameter => return Error.InvalidParameter,
-            .already_started => return Error.AlreadyStarted,
-            .not_found => return Error.NotFound,
-            .device_error => return Error.DeviceError,
+            .not_started => return error.NotStarted,
+            .out_of_resources => return error.OutOfResources,
+            .invalid_parameter => return error.InvalidParameter,
+            .already_started => return error.AlreadyStarted,
+            .not_found => return error.NotFound,
+            .device_error => return error.DeviceError,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -125,15 +124,15 @@ pub const Udp6 = extern struct {
     pub fn transmit(self: *Udp6, token: *CompletionToken) TransmitError!void {
         switch (self._transmit(self, token)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .no_mapping => return Error.NoMapping,
-            .invalid_parameter => return Error.InvalidParameter,
-            .access_denied => return Error.AccessDenied,
-            .not_ready => return Error.NotReady,
-            .out_of_resources => return Error.OutOfResources,
-            .not_found => return Error.NotFound,
-            .bad_buffer_size => return Error.BadBufferSize,
-            .no_media => return Error.NoMedia,
+            .not_started => return error.NotStarted,
+            .no_mapping => return error.NoMapping,
+            .invalid_parameter => return error.InvalidParameter,
+            .access_denied => return error.AccessDenied,
+            .not_ready => return error.NotReady,
+            .out_of_resources => return error.OutOfResources,
+            .not_found => return error.NotFound,
+            .bad_buffer_size => return error.BadBufferSize,
+            .no_media => return error.NoMedia,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -141,14 +140,14 @@ pub const Udp6 = extern struct {
     pub fn receive(self: *Udp6, token: *CompletionToken) ReceiveError!void {
         switch (self._receive(self, token)) {
             .success => {},
-            .not_started => return Error.NotStarted,
-            .no_mapping => return Error.NoMapping,
-            .invalid_parameter => return Error.InvalidParameter,
-            .out_of_resources => return Error.OutOfResources,
-            .device_error => return Error.DeviceError,
-            .access_denied => return Error.AccessDenied,
-            .not_ready => return Error.NotReady,
-            .no_media => return Error.NoMedia,
+            .not_started => return error.NotStarted,
+            .no_mapping => return error.NoMapping,
+            .invalid_parameter => return error.InvalidParameter,
+            .out_of_resources => return error.OutOfResources,
+            .device_error => return error.DeviceError,
+            .access_denied => return error.AccessDenied,
+            .not_ready => return error.NotReady,
+            .no_media => return error.NoMedia,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -156,9 +155,9 @@ pub const Udp6 = extern struct {
     pub fn cancel(self: *Udp6, token: ?*CompletionToken) CancelError!void {
         switch (self._cancel(self, token)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .not_started => return Error.NotStarted,
-            .not_found => return Error.NotFound,
+            .invalid_parameter => return error.InvalidParameter,
+            .not_started => return error.NotStarted,
+            .not_found => return error.NotFound,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }
@@ -166,9 +165,9 @@ pub const Udp6 = extern struct {
     pub fn poll(self: *Udp6) PollError!void {
         switch (self._poll(self)) {
             .success => {},
-            .invalid_parameter => return Error.InvalidParameter,
-            .device_error => return Error.DeviceError,
-            .timeout => return Error.Timeout,
+            .invalid_parameter => return error.InvalidParameter,
+            .device_error => return error.DeviceError,
+            .timeout => return error.Timeout,
             else => |status| return uefi.unexpectedStatus(status),
         }
     }