diff --git a/libc/kernel/tools/defaults.py b/libc/kernel/tools/defaults.py
index f6486d7..f235803 100644
--- a/libc/kernel/tools/defaults.py
+++ b/libc/kernel/tools/defaults.py
@@ -7,7 +7,7 @@
 
 # the list of supported architectures
 #
-kernel_archs = [ 'aarch64', 'arm', 'mips', 'x86' ]
+kernel_archs = [ 'arm', 'arm64', 'mips', 'x86' ]
 
 # the list of include directories that belong to the kernel
 # tree. used when looking for sources...
@@ -45,15 +45,15 @@
 # maps an architecture to a set of default macros that would be provided by
 # toolchain preprocessor
 kernel_default_arch_macros = {
-    "aarch64": {},
     "arm": {},
+    "arm64": {},
     "mips": {"CONFIG_32BIT":"1"},
     "x86": {},
     }
 
 kernel_arch_token_replacements = {
-    "aarch64": {},
     "arm": {},
+    "arm64": {},
     "mips": {"off_t":"__kernel_off_t"},
     "x86": {},
     }
@@ -66,13 +66,13 @@
 # this is the set of known static inline functions that we want to keep
 # in the final ARM headers. this is only used to keep optimized byteswapping
 # static functions and stuff like that.
-kernel_known_aarch64_statics = set(
-        [
+kernel_known_arm_statics = set(
+        [ "___arch__swab32",    # asm-arm/byteorder.h
         ]
     )
 
-kernel_known_arm_statics = set(
-        [ "___arch__swab32",    # asm-arm/byteorder.h
+kernel_known_arm64_statics = set(
+        [
         ]
     )
 
@@ -100,8 +100,8 @@
 # we want to keep in the final headers
 #
 kernel_known_statics = {
-        "aarch64" : kernel_known_aarch64_statics,
         "arm" : kernel_known_arm_statics,
+        "arm64" : kernel_known_arm64_statics,
         "mips" : kernel_known_mips_statics,
         "x86" : kernel_known_x86_statics,
     }
diff --git a/libc/kernel/tools/generate_uapi_headers.sh b/libc/kernel/tools/generate_uapi_headers.sh
index de89838..9eeb2a5 100755
--- a/libc/kernel/tools/generate_uapi_headers.sh
+++ b/libc/kernel/tools/generate_uapi_headers.sh
@@ -186,22 +186,16 @@
           "${ANDROID_KERNEL_DIR}/uapi"
 
 for arch in "${ARCH_LIST[@]}"; do
-  if [[ "$arch" == "arm64" ]]; then
-    # The Android headers use aarch64 as the name of the 64 bit arm headers.
-    tgt_arch="asm-aarch64"
-  else
-    tgt_arch="asm-${arch}"
-  fi
   # Copy arch headers.
   copy_hdrs "${KERNEL_DIR}/common/arch/${arch}/include/uapi" \
-            "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}"
+            "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}"
   # Copy the generated arch headers.
   copy_hdrs "${KERNEL_DIR}/common/arch/${arch}/include/generated/uapi" \
-            "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}"
+            "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}"
 
   # Special copy of generated header files from arch/<ARCH>/generated/asm that
   # also exist in uapi/asm-generic.
   copy_if_exists "${KERNEL_DIR}/common/include/uapi/asm-generic" \
                  "${KERNEL_DIR}/common/arch/${arch}/include/generated/asm" \
-                 "${ANDROID_KERNEL_DIR}/uapi/${tgt_arch}/asm"
+                 "${ANDROID_KERNEL_DIR}/uapi/asm-${arch}/asm"
 done
diff --git a/libc/kernel/uapi/asm-aarch64/asm/auxvec.h b/libc/kernel/uapi/asm-arm64/asm/auxvec.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/auxvec.h
rename to libc/kernel/uapi/asm-arm64/asm/auxvec.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/bitsperlong.h b/libc/kernel/uapi/asm-arm64/asm/bitsperlong.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/bitsperlong.h
rename to libc/kernel/uapi/asm-arm64/asm/bitsperlong.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/byteorder.h b/libc/kernel/uapi/asm-arm64/asm/byteorder.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/byteorder.h
rename to libc/kernel/uapi/asm-arm64/asm/byteorder.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/errno.h b/libc/kernel/uapi/asm-arm64/asm/errno.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/errno.h
rename to libc/kernel/uapi/asm-arm64/asm/errno.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/fcntl.h b/libc/kernel/uapi/asm-arm64/asm/fcntl.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/fcntl.h
rename to libc/kernel/uapi/asm-arm64/asm/fcntl.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/hwcap.h b/libc/kernel/uapi/asm-arm64/asm/hwcap.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/hwcap.h
rename to libc/kernel/uapi/asm-arm64/asm/hwcap.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ioctl.h b/libc/kernel/uapi/asm-arm64/asm/ioctl.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ioctl.h
rename to libc/kernel/uapi/asm-arm64/asm/ioctl.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ioctls.h b/libc/kernel/uapi/asm-arm64/asm/ioctls.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ioctls.h
rename to libc/kernel/uapi/asm-arm64/asm/ioctls.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ipcbuf.h b/libc/kernel/uapi/asm-arm64/asm/ipcbuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ipcbuf.h
rename to libc/kernel/uapi/asm-arm64/asm/ipcbuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/kvm_para.h b/libc/kernel/uapi/asm-arm64/asm/kvm_para.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/kvm_para.h
rename to libc/kernel/uapi/asm-arm64/asm/kvm_para.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/mman.h b/libc/kernel/uapi/asm-arm64/asm/mman.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/mman.h
rename to libc/kernel/uapi/asm-arm64/asm/mman.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/msgbuf.h b/libc/kernel/uapi/asm-arm64/asm/msgbuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/msgbuf.h
rename to libc/kernel/uapi/asm-arm64/asm/msgbuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/param.h b/libc/kernel/uapi/asm-arm64/asm/param.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/param.h
rename to libc/kernel/uapi/asm-arm64/asm/param.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/poll.h b/libc/kernel/uapi/asm-arm64/asm/poll.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/poll.h
rename to libc/kernel/uapi/asm-arm64/asm/poll.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/posix_types.h b/libc/kernel/uapi/asm-arm64/asm/posix_types.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/posix_types.h
rename to libc/kernel/uapi/asm-arm64/asm/posix_types.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/ptrace.h b/libc/kernel/uapi/asm-arm64/asm/ptrace.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/ptrace.h
rename to libc/kernel/uapi/asm-arm64/asm/ptrace.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/resource.h b/libc/kernel/uapi/asm-arm64/asm/resource.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/resource.h
rename to libc/kernel/uapi/asm-arm64/asm/resource.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/sembuf.h b/libc/kernel/uapi/asm-arm64/asm/sembuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/sembuf.h
rename to libc/kernel/uapi/asm-arm64/asm/sembuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/setup.h b/libc/kernel/uapi/asm-arm64/asm/setup.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/setup.h
rename to libc/kernel/uapi/asm-arm64/asm/setup.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/shmbuf.h b/libc/kernel/uapi/asm-arm64/asm/shmbuf.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/shmbuf.h
rename to libc/kernel/uapi/asm-arm64/asm/shmbuf.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/sigcontext.h b/libc/kernel/uapi/asm-arm64/asm/sigcontext.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/sigcontext.h
rename to libc/kernel/uapi/asm-arm64/asm/sigcontext.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/siginfo.h b/libc/kernel/uapi/asm-arm64/asm/siginfo.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/siginfo.h
rename to libc/kernel/uapi/asm-arm64/asm/siginfo.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/signal.h b/libc/kernel/uapi/asm-arm64/asm/signal.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/signal.h
rename to libc/kernel/uapi/asm-arm64/asm/signal.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/socket.h b/libc/kernel/uapi/asm-arm64/asm/socket.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/socket.h
rename to libc/kernel/uapi/asm-arm64/asm/socket.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/sockios.h b/libc/kernel/uapi/asm-arm64/asm/sockios.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/sockios.h
rename to libc/kernel/uapi/asm-arm64/asm/sockios.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/stat.h b/libc/kernel/uapi/asm-arm64/asm/stat.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/stat.h
rename to libc/kernel/uapi/asm-arm64/asm/stat.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/statfs.h b/libc/kernel/uapi/asm-arm64/asm/statfs.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/statfs.h
rename to libc/kernel/uapi/asm-arm64/asm/statfs.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/swab.h b/libc/kernel/uapi/asm-arm64/asm/swab.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/swab.h
rename to libc/kernel/uapi/asm-arm64/asm/swab.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/termbits.h b/libc/kernel/uapi/asm-arm64/asm/termbits.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/termbits.h
rename to libc/kernel/uapi/asm-arm64/asm/termbits.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/termios.h b/libc/kernel/uapi/asm-arm64/asm/termios.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/termios.h
rename to libc/kernel/uapi/asm-arm64/asm/termios.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/types.h b/libc/kernel/uapi/asm-arm64/asm/types.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/types.h
rename to libc/kernel/uapi/asm-arm64/asm/types.h
diff --git a/libc/kernel/uapi/asm-aarch64/asm/unistd.h b/libc/kernel/uapi/asm-arm64/asm/unistd.h
similarity index 100%
rename from libc/kernel/uapi/asm-aarch64/asm/unistd.h
rename to libc/kernel/uapi/asm-arm64/asm/unistd.h