diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 5b94754..69878b2 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -72,7 +72,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",
@@ -88,7 +88,7 @@
                 "-mno-red-zone",
                 "-mno-sse",
                 "-mno-sse2",
-                "-march=i686",
+                "-march=i386",
                 "-pipe",
                 "-ffunction-sections",
                 "-msoft-float",
diff --git a/Audio/AudioCodec97/Makefile b/Audio/AudioCodec97/Makefile
index 4da34e4..52148f6 100644
--- a/Audio/AudioCodec97/Makefile
+++ b/Audio/AudioCodec97/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -mno-red-zone -mno-sse -mno-sse2					\
-		  -march=i686 -pipe -ffunction-sections				\
+		  -march=i386 -pipe -ffunction-sections				\
 		  -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
@@ -66,7 +66,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -89,7 +89,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/Generic/ExampleDriver/Makefile b/Generic/ExampleDriver/Makefile
index e8bdf6f..5b278b9 100644
--- a/Generic/ExampleDriver/Makefile
+++ b/Generic/ExampleDriver/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
diff --git a/Input/PS2Mouse/Makefile b/Input/PS2Mouse/Makefile
index 989dca3..e9f8472 100644
--- a/Input/PS2Mouse/Makefile
+++ b/Input/PS2Mouse/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Input/VMwareMouse/Makefile b/Input/VMwareMouse/Makefile
index 1d438ee..73487c9 100644
--- a/Input/VMwareMouse/Makefile
+++ b/Input/VMwareMouse/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Input/VirtualBoxMouse/Makefile b/Input/VirtualBoxMouse/Makefile
index 4ea3176..0526e78 100644
--- a/Input/VirtualBoxMouse/Makefile
+++ b/Input/VirtualBoxMouse/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Network/AMDPCNET/Makefile b/Network/AMDPCNET/Makefile
index 86cf9d4..f19fdfc 100644
--- a/Network/AMDPCNET/Makefile
+++ b/Network/AMDPCNET/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Network/IntelGigabit/Makefile b/Network/IntelGigabit/Makefile
index 5ea6939..f534f27 100644
--- a/Network/IntelGigabit/Makefile
+++ b/Network/IntelGigabit/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Network/RTL8139/Makefile b/Network/RTL8139/Makefile
index 6fad2fc..882cda5 100644
--- a/Network/RTL8139/Makefile
+++ b/Network/RTL8139/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Network/RTL8169/Makefile b/Network/RTL8169/Makefile
index d2e1a67..f86308c 100644
--- a/Network/RTL8169/Makefile
+++ b/Network/RTL8169/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Network/Virtio/Makefile b/Network/Virtio/Makefile
index 7d56b27..72a6178 100644
--- a/Network/Virtio/Makefile
+++ b/Network/Virtio/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Storage/AHCI/Makefile b/Storage/AHCI/Makefile
index 6367bcc..bf725f4 100644
--- a/Storage/AHCI/Makefile
+++ b/Storage/AHCI/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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/Storage/ATA/Makefile b/Storage/ATA/Makefile
index a9fbbc0..6d340cb 100644
--- a/Storage/ATA/Makefile
+++ b/Storage/ATA/Makefile
@@ -13,17 +13,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 ../../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)
@@ -50,11 +50,11 @@ CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow	\
 		  -march=x86-64 -pipe -ffunction-sections			\
 		  -msoft-float -fno-builtin
 
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 CFLAGS += -fPIC -fPIE -pie -mno-80387 -mno-mmx -mno-3dnow		\
 		  -mno-red-zone -mno-sse -mno-sse2 -ffunction-sections	\
-		  -march=i686 -pipe -msoft-float -fno-builtin
+		  -march=i386 -pipe -msoft-float -fno-builtin
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -65,7 +65,7 @@ endif
 build: $(FILENAME)
 ifeq ($(OSARCH), amd64)
 	$(OBJDUMP) -b binary -D -m i386:x86-64 -d $(FILENAME) > file_dump.map
-else ifeq ($(OSARCH), i686)
+else ifeq ($(OSARCH), i386)
 
 else ifeq ($(OSARCH), aarch64)
 
@@ -88,7 +88,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 $@ $<