diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index d5d00a5..6aba97b 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -65,7 +65,7 @@
                 "a32",
                 "DEBUG=\"1\""
             ],
-            "compilerPath": "${workspaceFolder}/../tools/cross/bin/i686-elf-gcc",
+            "compilerPath": "${workspaceFolder}/../tools/cross/bin/i386-elf-gcc",
             "cStandard": "c17",
             "cppStandard": "c++20",
             "intelliSenseMode": "gcc-x86",
@@ -75,7 +75,7 @@
                 "-fPIC",
                 "-fPIE",
                 "-pie",
-                "-march=i686",
+                "-march=i386",
                 "-pipe",
                 "-ffunction-sections",
                 "-fno-builtin",
diff --git a/apps/base/echo/Makefile b/apps/base/echo/Makefile
index a55c8c2..d8d7ee7 100644
--- a/apps/base/echo/Makefile
+++ b/apps/base/echo/Makefile
@@ -15,17 +15,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD)
 GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD)
 
 ifeq ($(OSARCH), amd64)
-S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*")
-C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*")
-else ifeq ($(OSARCH), i686)
+S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+else ifeq ($(OSARCH), i386)
 S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
 C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
 CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
 else ifeq ($(OSARCH), aarch64)
-S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
-C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
+S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
 endif
 HEADERS = $(sort $(dir $(wildcard ../../../out/system/include/*)))
 OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
@@ -44,9 +44,9 @@ ifeq ($(OSARCH), amd64)
 
 CFLAGS += -march=x86-64
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
-CFLAGS += -march=i686
+CFLAGS += -march=i386
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -74,7 +74,7 @@ $(FILENAME): $(OBJ)
 	$(info Compiling $<)
 ifeq ($(OSARCH), amd64)
 	$(AS) -o $@ $<
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 	$(AS) -o $@ $<
 else ifeq ($(OSARCH), aarch64)
 	$(AS) -o $@ $<
diff --git a/apps/system/init/Makefile b/apps/system/init/Makefile
index bbf7b37..b295a15 100644
--- a/apps/system/init/Makefile
+++ b/apps/system/init/Makefile
@@ -15,17 +15,17 @@ GIT_COMMIT = $(shell git rev-parse HEAD)
 GIT_COMMIT_SHORT = $(shell git rev-parse --short HEAD)
 
 ifeq ($(OSARCH), amd64)
-S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*")
-C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i686/*" -not -path "./arch/aarch64/*")
-else ifeq ($(OSARCH), i686)
+S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/i386/*" -not -path "./arch/aarch64/*")
+else ifeq ($(OSARCH), i386)
 S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
 C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
 CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/aarch64/*")
 else ifeq ($(OSARCH), aarch64)
-S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
-C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
-CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i686/*")
+S_SOURCES = $(shell find ./ -type f -name '*.S' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+C_SOURCES = $(shell find ./ -type f -name '*.c' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
+CPP_SOURCES = $(shell find ./ -type f -name '*.cpp' -not -path "./arch/amd64/*" -not -path "./arch/i386/*")
 endif
 HEADERS = $(sort $(dir $(wildcard ../../../out/system/include/*)))
 OBJ = $(C_SOURCES:.c=.o) $(CPP_SOURCES:.cpp=.o) $(ASM_SOURCES:.asm=.o) $(S_SOURCES:.S=.o) $(PSF_SOURCES:.psf=.o) $(BMP_SOURCES:.bmp=.o)
@@ -42,8 +42,8 @@ CFLAGS :=										\
 
 ifeq ($(OSARCH), amd64)
 CFLAGS += -march=x86-64 -fstack-protector-all -fstack-clash-protection
-else ifeq ($(OSARCH), i686)
-CFLAGS += -march=i686
+else ifeq ($(OSARCH), i386)
+CFLAGS += -march=i386
 else ifeq ($(OSARCH), aarch64)
 CFLAGS += -pipe
 endif
@@ -68,7 +68,7 @@ $(FILENAME): $(OBJ)
 	$(info Compiling $<)
 ifeq ($(OSARCH), amd64)
 	$(AS) -o $@ $<
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 	$(AS) -o $@ $<
 else ifeq ($(OSARCH), aarch64)
 	$(AS) -o $@ $<
diff --git a/apps/user/games/doomgeneric b/apps/user/games/doomgeneric
index a88a906..74c746c 160000
--- a/apps/user/games/doomgeneric
+++ b/apps/user/games/doomgeneric
@@ -1 +1 @@
-Subproject commit a88a9061240a9019478dae54c188b89440db2d95
+Subproject commit 74c746cb8f9190e5847b6dfc6b21e2b7e51f3bca
diff --git a/libc/ElfInterpreter/Makefile b/libc/ElfInterpreter/Makefile
index 6b563bc..d1b0d73 100644
--- a/libc/ElfInterpreter/Makefile
+++ b/libc/ElfInterpreter/Makefile
@@ -25,7 +25,7 @@ INCLUDE = ../include
 
 ifeq ($(OSARCH), amd64)
 ASM_ARCH := elf64
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 ASM_ARCH := elf32
 endif
 
diff --git a/libc/runtime/Makefile b/libc/runtime/Makefile
index c63af5d..6674e76 100644
--- a/libc/runtime/Makefile
+++ b/libc/runtime/Makefile
@@ -12,7 +12,7 @@ OBJ = ${C_SOURCES:.c=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURCES:.S=.o}
 
 ifeq ($(OSARCH), amd64)
 ASM_ARCH := elf64
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 ASM_ARCH := elf32
 endif
 
diff --git a/libc/src/Makefile b/libc/src/Makefile
index f688c7f..f288986 100644
--- a/libc/src/Makefile
+++ b/libc/src/Makefile
@@ -22,7 +22,7 @@ INCLUDE = ../include
 
 ifeq ($(OSARCH), amd64)
 ASM_ARCH := elf64
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 ASM_ARCH := elf32
 endif
 
diff --git a/libs/libgraph/Makefile b/libs/libgraph/Makefile
index e39085d..aba0bd0 100644
--- a/libs/libgraph/Makefile
+++ b/libs/libgraph/Makefile
@@ -23,7 +23,7 @@ OBJ = ${C_SOURCES:.c=.o} ${CPP_SOURCES:.cpp=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURC
 
 ifeq ($(OSARCH), amd64)
 ASM_ARCH := elf64
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 ASM_ARCH := elf32
 endif
 
diff --git a/libs/libinit/Makefile b/libs/libinit/Makefile
index 007b5d6..a424161 100644
--- a/libs/libinit/Makefile
+++ b/libs/libinit/Makefile
@@ -23,7 +23,7 @@ OBJ = ${C_SOURCES:.c=.o} ${CPP_SOURCES:.cpp=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURC
 
 ifeq ($(OSARCH), amd64)
 ASM_ARCH := elf64
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 ASM_ARCH := elf32
 endif
 
diff --git a/libs/libssp/Makefile b/libs/libssp/Makefile
index 8dacb7b..4913632 100644
--- a/libs/libssp/Makefile
+++ b/libs/libssp/Makefile
@@ -18,7 +18,7 @@ OBJ = ${C_SOURCES:.c=.o} ${ASM_SOURCES:.asm=.o}
 
 ifeq ($(OSARCH), amd64)
 ASM_ARCH := elf64
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 ASM_ARCH := elf32
 endif
 
diff --git a/libs/libsys/Makefile b/libs/libsys/Makefile
index c52459c..8097824 100644
--- a/libs/libsys/Makefile
+++ b/libs/libsys/Makefile
@@ -23,7 +23,7 @@ OBJ = ${C_SOURCES:.c=.o} ${CPP_SOURCES:.cpp=.o} ${ASM_SOURCES:.asm=.o} ${S_SOURC
 
 ifeq ($(OSARCH), amd64)
 ASM_ARCH := elf64
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 ASM_ARCH := elf32
 endif