@@ -314,34 +314,34 @@
 #else
 # define OF_DIRECT_MEMBERS
 #endif
 
 #ifdef OF_APPLE_RUNTIME
-# if defined(OF_X86_64) || defined(OF_X86) || defined(OF_ARM64) || \
+# if defined(OF_AMD64) || defined(OF_X86) || defined(OF_ARM64) || \
     defined(OF_ARM) || defined(OF_POWERPC)
 #  define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR
 #  define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
 # endif
 #else
 # if defined(OF_ELF)
-#  if defined(OF_X86_64) || defined(OF_X86) || \
+#  if defined(OF_AMD64) || defined(OF_X86) || \
     defined(OF_ARM64) || defined(OF_ARM) || defined(OF_POWERPC) || \
     defined(OF_MIPS) || defined(OF_SPARC64) || defined(OF_SPARC)
 #   define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR
 #   if __OBJFW_RUNTIME_ABI__ >= 800
 #    define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
 #   endif
 #  endif
 # elif defined(OF_MACH_O)
-#  if defined(OF_X86_64)
+#  if defined(OF_AMD64)
 #   define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR
 #   if __OBJFW_RUNTIME_ABI__ >= 800
 #    define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
 #   endif
 #  endif
 # elif defined(OF_WINDOWS)
-#  if defined(OF_X86_64) || defined(OF_X86)
+#  if defined(OF_AMD64) || defined(OF_X86)
 #   define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR
 #   if __OBJFW_RUNTIME_ABI__ >= 800
 #    define OF_HAVE_FORWARDING_TARGET_FOR_SELECTOR_STRET
 #   endif
 #  endif
@@ -448,11 +448,11 @@
 static OF_INLINE uint16_t OF_CONST_FUNC
 OFByteSwap16NonConst(uint16_t i)
 {
 #if defined(OF_HAVE_BUILTIN_BSWAP16)
 	return __builtin_bswap16(i);
-#elif (defined(OF_X86_64) || defined(OF_X86)) && defined(__GNUC__)
+#elif (defined(OF_AMD64) || defined(OF_X86)) && defined(__GNUC__)
 	__asm__ (
 	    "xchgb	%h0, %b0"
 	    : "=Q"(i)
 	    : "0"(i)
 	);
@@ -478,11 +478,11 @@
 static OF_INLINE uint32_t OF_CONST_FUNC
 OFByteSwap32NonConst(uint32_t i)
 {
 #if defined(OF_HAVE_BUILTIN_BSWAP32)
 	return __builtin_bswap32(i);
-#elif (defined(OF_X86_64) || defined(OF_X86)) && defined(__GNUC__)
+#elif (defined(OF_AMD64) || defined(OF_X86)) && defined(__GNUC__)
 	__asm__ (
 	    "bswap	%0"
 	    : "=q"(i)
 	    : "0"(i)
 	);
@@ -510,11 +510,11 @@
 static OF_INLINE uint64_t OF_CONST_FUNC
 OFByteSwap64NonConst(uint64_t i)
 {
 #if defined(OF_HAVE_BUILTIN_BSWAP64)
 	return __builtin_bswap64(i);
-#elif defined(OF_X86_64) && defined(__GNUC__)
+#elif defined(OF_AMD64) && defined(__GNUC__)
 	__asm__ (
 	    "bswap	%0"
 	    : "=r"(i)
 	    : "0"(i)
 	);