@@ -67,11 +67,11 @@
 @property (class, readonly, nullable, nonatomic) OFIRI *userDataIRI;
 @property (class, readonly, nullable, nonatomic) OFIRI *userConfigIRI;
 @property (class, readonly, nullable, nonatomic) OFIRI *temporaryDirectoryIRI;
 @property (class, readonly, nullable, nonatomic) OFString *CPUVendor;
 @property (class, readonly, nullable, nonatomic) OFString *CPUModel;
-# if defined(OF_X86_64) || defined(OF_X86) || defined(DOXYGEN)
+# if defined(OF_AMD64) || defined(OF_X86) || defined(DOXYGEN)
 @property (class, readonly, nonatomic) bool supportsMMX;
 @property (class, readonly, nonatomic) bool supports3DNow;
 @property (class, readonly, nonatomic) bool supportsEnhanced3DNow;
 @property (class, readonly, nonatomic) bool supportsSSE;
 @property (class, readonly, nonatomic) bool supportsSSE2;
@@ -212,33 +212,33 @@
  *
  * @return The model of the CPU
  */
 + (nullable OFString *)CPUModel;
 
-#if defined(OF_X86_64) || defined(OF_X86) || defined(DOXYGEN)
+#if defined(OF_AMD64) || defined(OF_X86) || defined(DOXYGEN)
 /**
  * @brief Returns whether the CPU supports MMX.
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports MMX
  */
 + (bool)supportsMMX;
 
 /**
  * @brief Returns whether the CPU supports 3DNow!.
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports 3DNow!
  */
 + (bool)supports3DNow;
 
 /**
  * @brief Returns whether the CPU supports enhanced 3DNow!.
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports enhanced 3DNow!
  */
 + (bool)supportsEnhanced3DNow;
 
@@ -245,11 +245,11 @@
 /**
  * @brief Returns whether the CPU supports SSE.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports SSE
  */
 + (bool)supportsSSE;
 
@@ -256,11 +256,11 @@
 /**
  * @brief Returns whether the CPU supports SSE2.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports SSE2
  */
 + (bool)supportsSSE2;
 
@@ -267,11 +267,11 @@
 /**
  * @brief Returns whether the CPU supports SSE3.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports SSE3
  */
 + (bool)supportsSSE3;
 
@@ -278,11 +278,11 @@
 /**
  * @brief Returns whether the CPU supports SSSE3.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports SSSE3
  */
 + (bool)supportsSSSE3;
 
@@ -289,11 +289,11 @@
 /**
  * @brief Returns whether the CPU supports SSE4.1.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports SSE4.1
  */
 + (bool)supportsSSE41;
 
@@ -300,11 +300,11 @@
 /**
  * @brief Returns whether the CPU supports SSE4.2.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports SSE4.2
  */
 + (bool)supportsSSE42;
 
@@ -311,11 +311,11 @@
 /**
  * @brief Returns whether the CPU supports AVX.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports AVX
  */
 + (bool)supportsAVX;
 
@@ -322,29 +322,29 @@
 /**
  * @brief Returns whether the CPU supports AVX2.
  *
  * @warning This method only checks CPU support and assumes OS support!
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports AVX2
  */
 + (bool)supportsAVX2;
 
 /**
  * @brief Returns whether the CPU supports AES-NI.
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports AES-NI
  */
 + (bool)supportsAESNI;
 
 /**
  * @brief Returns whether the CPU supports Intel SHA Extensions.
  *
- * @note This method is only available on x86 and x86_64.
+ * @note This method is only available on AMD64 and x86.
  *
  * @return Whether the CPU supports Intel SHA Extensions
  */
 + (bool)supportsSHAExtensions;
 #endif