diff --git a/include/kernaux/multiboot2.h b/include/kernaux/multiboot2.h
index 4a25488..8de5ddd 100644
--- a/include/kernaux/multiboot2.h
+++ b/include/kernaux/multiboot2.h
@@ -38,25 +38,21 @@ extern "C" {
 #define KERNAUX_MULTIBOOT2_HTAG_FLAGS_REQUIRE_CONSOLE (1 << 0)
 #define KERNAUX_MULTIBOOT2_HTAG_FLAGS_EGA_SUPPORT     (1 << 1)
 
-/****************
- * Common types *
- ****************/
-
-enum KernAux_Multiboot2_Arch {
-    KERNAUX_MULTIBOOT2_ARCH_NONE   = 0,
-    KERNAUX_MULTIBOOT2_ARCH_I386   = 1,
-    KERNAUX_MULTIBOOT2_ARCH_MIPS32 = 4,
-};
-
 /***********************
  * Header common types *
  ***********************/
 
+enum KernAux_Multiboot2_Header_Arch {
+    KERNAUX_MULTIBOOT2_HEADER_ARCH_NONE   = 0,
+    KERNAUX_MULTIBOOT2_HEADER_ARCH_I386   = 1,
+    KERNAUX_MULTIBOOT2_HEADER_ARCH_MIPS32 = 4,
+};
+
 struct KernAux_Multiboot2_Header {
-    unsigned magic                    : 32;
-    enum KernAux_Multiboot2_Arch arch : 32;
-    unsigned total_size               : 32;
-    unsigned checksum                 : 32;
+    unsigned magic                           : 32;
+    enum KernAux_Multiboot2_Header_Arch arch : 32;
+    unsigned total_size                      : 32;
+    unsigned checksum                        : 32;
 }
 __attribute__((packed));
 
diff --git a/src/multiboot2/header_is_valid.c b/src/multiboot2/header_is_valid.c
index 39a54f8..22344d2 100644
--- a/src/multiboot2/header_is_valid.c
+++ b/src/multiboot2/header_is_valid.c
@@ -15,9 +15,9 @@ bool KernAux_Multiboot2_Header_is_valid(
         return false;
     }
 
-    if (multiboot2_header->arch != KERNAUX_MULTIBOOT2_ARCH_NONE &&
-        multiboot2_header->arch != KERNAUX_MULTIBOOT2_ARCH_I386 &&
-        multiboot2_header->arch != KERNAUX_MULTIBOOT2_ARCH_MIPS32)
+    if (multiboot2_header->arch != KERNAUX_MULTIBOOT2_HEADER_ARCH_NONE &&
+        multiboot2_header->arch != KERNAUX_MULTIBOOT2_HEADER_ARCH_I386 &&
+        multiboot2_header->arch != KERNAUX_MULTIBOOT2_HEADER_ARCH_MIPS32)
     {
         return false;
     }
diff --git a/tests/multiboot2_header_example2.h b/tests/multiboot2_header_example2.h
index 42f328b..80cdf01 100644
--- a/tests/multiboot2_header_example2.h
+++ b/tests/multiboot2_header_example2.h
@@ -33,10 +33,10 @@ static const struct {
 } multiboot2_header_example2 = {
     .multiboot2_header = {
         .magic = KERNAUX_MULTIBOOT2_HEADER_MAGIC,
-        .arch = KERNAUX_MULTIBOOT2_ARCH_I386,
+        .arch = KERNAUX_MULTIBOOT2_HEADER_ARCH_I386,
         .total_size = sizeof(multiboot2_header_example2),
         .checksum = KERNAUX_MULTIBOOT2_HEADER_CHECKSUM(
-            KERNAUX_MULTIBOOT2_ARCH_I386,
+            KERNAUX_MULTIBOOT2_HEADER_ARCH_I386,
             sizeof(multiboot2_header_example2)
         ),
     },