diff --git a/kernel-rs/Makefile b/kernel-rs/Makefile
index 913bdab6..5a421239 100644
--- a/kernel-rs/Makefile
+++ b/kernel-rs/Makefile
@@ -1,6 +1,6 @@
 SHELL	:= /bin/bash
 
-ARCH	:= i386
+ARCH	:= x86
 OS		:= bluesnow
 TARGET	?= $(ARCH)-$(OS)
 
diff --git a/kernel-rs/src/arch/mod.rs b/kernel-rs/src/arch/mod.rs
index b03878a5..baf9581d 100644
--- a/kernel-rs/src/arch/mod.rs
+++ b/kernel-rs/src/arch/mod.rs
@@ -1,4 +1,4 @@
 // we only support a single architecture at the moment
-// we called it i386 but we generally support all 32bit
+// we call it x86 but we only support all 32bit
 // intel architectures (IA-32) such as i[3456]86
-pub mod i386;
+pub mod x86;
diff --git a/kernel-rs/src/arch/i386/boot.asm b/kernel-rs/src/arch/x86/boot.asm
similarity index 100%
rename from kernel-rs/src/arch/i386/boot.asm
rename to kernel-rs/src/arch/x86/boot.asm
diff --git a/kernel-rs/src/arch/i386/consts.rs b/kernel-rs/src/arch/x86/consts.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/consts.rs
rename to kernel-rs/src/arch/x86/consts.rs
diff --git a/kernel-rs/src/arch/i386/device/cpu.rs b/kernel-rs/src/arch/x86/device/cpu.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/device/cpu.rs
rename to kernel-rs/src/arch/x86/device/cpu.rs
diff --git a/kernel-rs/src/arch/i386/device/local_apic.rs b/kernel-rs/src/arch/x86/device/local_apic.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/device/local_apic.rs
rename to kernel-rs/src/arch/x86/device/local_apic.rs
diff --git a/kernel-rs/src/arch/i386/device/mod.rs b/kernel-rs/src/arch/x86/device/mod.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/device/mod.rs
rename to kernel-rs/src/arch/x86/device/mod.rs
diff --git a/kernel-rs/src/arch/i386/device/pic.rs b/kernel-rs/src/arch/x86/device/pic.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/device/pic.rs
rename to kernel-rs/src/arch/x86/device/pic.rs
diff --git a/kernel-rs/src/arch/i386/gdt.rs b/kernel-rs/src/arch/x86/gdt.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/gdt.rs
rename to kernel-rs/src/arch/x86/gdt.rs
diff --git a/kernel-rs/src/arch/i386/grub.cfg b/kernel-rs/src/arch/x86/grub.cfg
similarity index 100%
rename from kernel-rs/src/arch/i386/grub.cfg
rename to kernel-rs/src/arch/x86/grub.cfg
diff --git a/kernel-rs/src/arch/i386/idt.rs b/kernel-rs/src/arch/x86/idt.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/idt.rs
rename to kernel-rs/src/arch/x86/idt.rs
diff --git a/kernel-rs/src/arch/i386/interrupt/exception.rs b/kernel-rs/src/arch/x86/interrupt/exception.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/interrupt/exception.rs
rename to kernel-rs/src/arch/x86/interrupt/exception.rs
diff --git a/kernel-rs/src/arch/i386/interrupt/irq.rs b/kernel-rs/src/arch/x86/interrupt/irq.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/interrupt/irq.rs
rename to kernel-rs/src/arch/x86/interrupt/irq.rs
diff --git a/kernel-rs/src/arch/i386/interrupt/mod.rs b/kernel-rs/src/arch/x86/interrupt/mod.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/interrupt/mod.rs
rename to kernel-rs/src/arch/x86/interrupt/mod.rs
diff --git a/kernel-rs/src/arch/i386/linker.ld b/kernel-rs/src/arch/x86/linker.ld
similarity index 100%
rename from kernel-rs/src/arch/i386/linker.ld
rename to kernel-rs/src/arch/x86/linker.ld
diff --git a/kernel-rs/src/arch/i386/mod.rs b/kernel-rs/src/arch/x86/mod.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/mod.rs
rename to kernel-rs/src/arch/x86/mod.rs
diff --git a/kernel-rs/src/arch/i386/multiboot_header.asm b/kernel-rs/src/arch/x86/multiboot_header.asm
similarity index 100%
rename from kernel-rs/src/arch/i386/multiboot_header.asm
rename to kernel-rs/src/arch/x86/multiboot_header.asm
diff --git a/kernel-rs/src/arch/i386/paging/mapper.rs b/kernel-rs/src/arch/x86/paging/mapper.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/paging/mapper.rs
rename to kernel-rs/src/arch/x86/paging/mapper.rs
diff --git a/kernel-rs/src/arch/i386/paging/mod.rs b/kernel-rs/src/arch/x86/paging/mod.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/paging/mod.rs
rename to kernel-rs/src/arch/x86/paging/mod.rs
diff --git a/kernel-rs/src/arch/i386/paging/table.rs b/kernel-rs/src/arch/x86/paging/table.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/paging/table.rs
rename to kernel-rs/src/arch/x86/paging/table.rs
diff --git a/kernel-rs/src/arch/i386/paging/temporary_page.rs b/kernel-rs/src/arch/x86/paging/temporary_page.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/paging/temporary_page.rs
rename to kernel-rs/src/arch/x86/paging/temporary_page.rs
diff --git a/kernel-rs/src/arch/i386/pti.rs b/kernel-rs/src/arch/x86/pti.rs
similarity index 100%
rename from kernel-rs/src/arch/i386/pti.rs
rename to kernel-rs/src/arch/x86/pti.rs
diff --git a/kernel-rs/src/arch/i386/start.asm b/kernel-rs/src/arch/x86/start.asm
similarity index 100%
rename from kernel-rs/src/arch/i386/start.asm
rename to kernel-rs/src/arch/x86/start.asm