@@ -43,20 +43,20 @@
 
 DragonFlyBSD
 ------------
 
   * OS Versions: 3.0, 3.3-DEVELOPMENT
-  * Architectures: x86, x86_64
+  * Architectures: AMD64, x86
   * Compilers: GCC 4.4.7
   * Runtimes: ObjFW
 
 
 FreeBSD
 -------
 
   * OS Versions: 9.1-rc3, 10.0
-  * Architectures: x86_64
+  * Architectures: AMD64
   * Compilers: Clang 3.1, Clang 3.3
   * Runtimes: ObjFW
 
 
 Haiku
@@ -88,22 +88,21 @@
 
 
 Linux
 -----
 
-  * Architectures: Alpha, ARMv6, ARMv7, ARM64, Itanium, m68k, MIPS (O32),
-                   MIPS64 (N64), RISC-V 64, PowerPC, S390x, SuperH-4, x86,
-                   x86_64
+  * Architectures: Alpha, AMD64, ARMv6, ARMv7, ARM64, Itanium, m68k, MIPS (O32),
+                   MIPS64 (N64), RISC-V 64, PowerPC, S390x, SuperH-4, x86
   * Compilers: Clang 3.0-10.0, GCC 4.6-10.0
   * Runtimes: ObjFW
 
 
 macOS
 -----
 
   * OS Versions: 10.5, 10.7-10.15, Darling
-  * Architectures: PowerPC, PowerPC64, x86, x86_64
+  * Architectures: AMD64, PowerPC, PowerPC64, x86
   * Compilers: Clang 3.1-10.0, Apple GCC 4.0.1 & 4.2.1
   * Runtimes: Apple, ObjFW
 
 
 MiNT
@@ -127,12 +126,12 @@
 
 NetBSD
 ------
 
   * OS Versions: 5.1-9.0
-  * Architectures: ARM, ARM (big endian, BE8 mode), MIPS (O32), PowerPC, SPARC,
-                   SPARC64, x86, x86_64
+  * Architectures: AMD64, ARM, ARM (big endian, BE8 mode), MIPS (O32), PowerPC,
+                   SPARC, SPARC64, x86
   * Compilers: Clang 3.0-3.2, GCC 4.1.3 & 4.5.3 & 7.4.0
   * Runtimes: ObjFW
 
 
 Nintendo 3DS
@@ -167,11 +166,11 @@
 
 OpenBSD
 -------
 
   * OS Versions: 5.2-6.7
-  * Architectures: MIPS64, PA-RISC, PowerPC, SPARC64, x86_64
+  * Architectures: AMD64, MIPS64, PA-RISC, PowerPC, SPARC64
   * Compilers: GCC 6.3.0, Clang 4.0
   * Runtimes: ObjFW
 
 
 PlayStation Portable
@@ -195,11 +194,11 @@
 
 Solaris
 -------
 
   * OS Versions: OpenIndiana 2015.03
-  * Architectures: x86, x86_64
+  * Architectures: AMD64, x86
   * Compilers: Clang 3.4.2, GCC 4.8.3
   * Runtimes: ObjFW
 
 
 Wii
@@ -226,14 +225,14 @@
 Windows
 -------
 
   * OS Versions: 98 SE, NT 4.0, XP (x86), 7 (x64), 8 (x64), 8.1 (x64), 10, 11,
                  Wine (x86 & x64)
-  * Architectures: x86, x86_64, AArch64
-  * Compilers: GCC 5.3.0 & 6.2.0 from msys2 (x86 & x64),
+  * Architectures: AArch64, AMD64, x86
+  * Compilers: GCC 5.3.0 & 6.2.0 from msys2 (AMD64 & x86),
                Clang 3.9.0 from msys2 (x86),
-               Clang 10.0 from msys2 (x86 & x86_64),
+               Clang 10.0 from msys2 (AMD64 & x86),
                Clang 14.0.4 from msys2 (AArch64)
   * Runtimes: ObjFW
 
 
 Others
@@ -254,16 +253,16 @@
 As forwarding needs hand-written assembly for each combination of CPU
 architecture, executable format and calling convention, it is only available
 for the following platforms (except resolveClassMethod: and
 resolveInstanceMethod:, which are always available):
 
+  * AMD64 (SysV/ELF, Apple/Mach-O, Mach-O, Win64/PE)
   * ARM (EABI/ELF, Apple/Mach-O)
   * ARM64 (ARM64/ELF, Apple/Mach-O)
   * MIPS (O32/ELF, EABI/ELF)
   * PowerPC (SysV/ELF, EABI/ELF, Apple/Mach-O)
   * SPARC (SysV/ELF)
   * SPARC64 (SysV/ELF)
   * x86 (SysV/ELF, Apple/Mach-O, Win32/PE)
-  * x86_64 (SysV/ELF, Apple/Mach-O, Mach-O, Win64/PE)
 
 Apple/Mach-O means both, the Apple ABI and runtime, while Mach-O means the
 ObjFW runtime on Mach-O.