diff --git a/desktop/api.cpp b/desktop/api.cpp
index 52d5c95..e59703e 100644
--- a/desktop/api.cpp
+++ b/desktop/api.cpp
@@ -41,7 +41,7 @@
 #include <shared/common.cpp>
 
 struct EnumString { const char *cName; int value; };
-#include <bin/Generated Code/enum_strings_array.h>
+#include <bin/generated_code/enum_strings_array.h>
 
 #define DESKTOP_MSG_SET_TITLE                 (1)
 #define DESKTOP_MSG_SET_ICON                  (2)
@@ -264,7 +264,7 @@ struct APIInstance {
 
 #ifndef NO_API_TABLE
 const void *const apiTable[] = {
-#include <bin/Generated Code/api_array.h>
+#include <bin/generated_code/api_array.h>
 };
 #endif
 
diff --git a/kernel/module.h b/kernel/module.h
index 4400a5e..c730efa 100644
--- a/kernel/module.h
+++ b/kernel/module.h
@@ -533,7 +533,7 @@ void KDeviceCloseHandle(KDevice *device); // The device creator is responsible f
 void KDeviceRemoved(KDevice *device); // Call when a child device is removed. Must be called only once!
 void KDeviceSendConnectedMessage(KDevice *device, EsDeviceType type); // Send a message to Desktop to inform it the device was connected.
 
-#include <bin/Generated Code/kernel_config.h>
+#include <bin/generated_code/kernel_config.h>
 
 struct KClockDevice : KDevice {
 	EsError (*read)(KClockDevice *device, EsDateComponents *components, uint64_t *linearMs);
diff --git a/kernel/symbols.cpp b/kernel/symbols.cpp
index 847a0b0..9541f00 100644
--- a/kernel/symbols.cpp
+++ b/kernel/symbols.cpp
@@ -15,7 +15,7 @@ struct ExportedKernelFunction {
 };
 
 const ExportedKernelFunction exportedKernelFunctions[] = {
-#include <bin/Generated Code/kernel_symbols.h>
+#include <bin/generated_code/kernel_symbols.h>
 };
 
 static uintptr_t linkOffset;
diff --git a/kernel/syscall.cpp b/kernel/syscall.cpp
index 5498cff..2a5cf0d 100644
--- a/kernel/syscall.cpp
+++ b/kernel/syscall.cpp
@@ -1725,7 +1725,7 @@ SYSCALL_IMPLEMENT(ES_SYSCALL_DEBUG_COMMAND) {
 }
 
 const SyscallFunction syscallFunctions[ES_SYSCALL_COUNT + 1] {
-#include <bin/Generated Code/syscall_array.h>
+#include <bin/generated_code/syscall_array.h>
 };
 
 #pragma GCC diagnostic pop
diff --git a/start.sh b/start.sh
index 4f0ebe3..ecf8260 100755
--- a/start.sh
+++ b/start.sh
@@ -4,7 +4,7 @@
 cd "$(dirname "$0")"
 
 # Create the bin directories.
-mkdir -p bin bin/Dependency\ Files bin/Logs bin/Generated\ Code bin/cache
+mkdir -p bin bin/Dependency\ Files bin/Logs bin/generated_code bin/cache
 
 # Check that we are running on a sensible platform.
 uname -o | grep Cygwin > /dev/null
diff --git a/util/build_core.c b/util/build_core.c
index 2622e18..b05bf43 100644
--- a/util/build_core.c
+++ b/util/build_core.c
@@ -950,7 +950,7 @@ void ParseKernelConfiguration() {
 	size_t kernelConfigBytes;
 	char *kernelConfig = (char *) LoadFile("kernel/config.ini", &kernelConfigBytes);
 
-	File f = FileOpen("bin/Generated Code/kernel_config.h", 'w');
+	File f = FileOpen("bin/generated_code/kernel_config.h", 'w');
 
 	EsINIState s = {};
 	s.buffer = (char *) kernelConfig;
@@ -1057,7 +1057,7 @@ void LinkKernel() {
 		if (_Execute(&output, toolchainNM, "bin/Object Files/kernel_all.o", NULL, NULL)) {
 			return;
 		} else {
-			File f = FileOpen("bin/Generated Code/kernel_symbols.h", 'w');
+			File f = FileOpen("bin/generated_code/kernel_symbols.h", 'w');
 			uintptr_t lineStart = 0, position = 0;
 
 			while (position < arrlenu(output)) {
@@ -1509,7 +1509,7 @@ int main(int argc, char **argv) {
 	MakeDirectory("bin/Dependency Files");
 	MakeDirectory("bin/Object Files");
 	MakeDirectory("bin/Stripped Executables");
-	MakeDirectory("bin/Generated Code");
+	MakeDirectory("bin/generated_code");
 
 	if (systemBuild) {
 		MakeDirectory("root");
diff --git a/util/header_generator.c b/util/header_generator.c
index 1b20948..4f9dd3a 100644
--- a/util/header_generator.c
+++ b/util/header_generator.c
@@ -5,9 +5,9 @@ char *buffer;
 int position;
 
 #define DEST_OS "root/Applications/POSIX/include/essence.h"
-#define DEST_API_ARRAY "bin/Generated Code/api_array.h"
-#define DEST_SYSCALL_ARRAY "bin/Generated Code/syscall_array.h"
-#define DEST_ENUM_STRINGS_ARRAY "bin/Generated Code/enum_strings_array.h"
+#define DEST_API_ARRAY "bin/generated_code/api_array.h"
+#define DEST_SYSCALL_ARRAY "bin/generated_code/syscall_array.h"
+#define DEST_ENUM_STRINGS_ARRAY "bin/generated_code/enum_strings_array.h"
 #define DEST_DEPENDENCIES "bin/Dependency Files/api_header.d"
 
 typedef struct Token {