diff --git a/src/Nazara/Core/Posix/HardwareInfoImpl.cpp b/src/Nazara/Core/Posix/HardwareInfoImpl.cpp
index 54f237ade..64fd0aba1 100644
--- a/src/Nazara/Core/Posix/HardwareInfoImpl.cpp
+++ b/src/Nazara/Core/Posix/HardwareInfoImpl.cpp
@@ -14,14 +14,14 @@ namespace Nz
 	#if (defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)) && !defined(NAZARA_PLATFORM_WEB)
 		// https://en.wikipedia.org/wiki/CPUID
 		asm volatile(
-			#ifdef NAZARA_PLATFORM_x64
+			#ifdef NAZARA_ARCH_x86_64
 			"pushq %%rbx     \n\t" // save %rbx
 			#else
 			"pushl %%ebx     \n\t" // save %ebx
 			#endif
 			"cpuid            \n\t"
 			"movl %%ebx ,%[ebx]  \n\t" // write the result into output var
-			#ifdef NAZARA_PLATFORM_x64
+			#ifdef NAZARA_ARCH_x86_64
 			"popq %%rbx \n\t"
 			#else
 			"popl %%ebx \n\t"
@@ -49,7 +49,7 @@ namespace Nz
 
 	bool HardwareInfoImpl::IsCpuidSupported()
 	{
-	#ifdef NAZARA_PLATFORM_x64
+	#ifdef NAZARA_ARCH_x86_64
 		return true; // cpuid is always supported on x64 arch
 	#elif defined(NAZARA_PLATFORM_WEB)
 		return false;
diff --git a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
index fc3a07d63..c13de0572 100644
--- a/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
+++ b/src/Nazara/Core/Win32/HardwareInfoImpl.cpp
@@ -24,14 +24,14 @@ namespace Nz
 	#elif defined(NAZARA_COMPILER_CLANG) || defined(NAZARA_COMPILER_GCC) || defined(NAZARA_COMPILER_INTEL)
 		// https://en.wikipedia.org/wiki/CPUID
 		asm volatile(
-			#ifdef NAZARA_PLATFORM_x64
+			#ifdef NAZARA_ARCH_x86_64
 			"pushq %%rbx     \n\t" // save %rbx
 			#else
 			"pushl %%ebx     \n\t" // save %ebx
 			#endif
 			"cpuid            \n\t"
 			"movl %%ebx ,%[ebx]  \n\t" // write the result into output var
-			#ifdef NAZARA_PLATFORM_x64
+			#ifdef NAZARA_ARCH_x86_64
 			"popq %%rbx \n\t"
 			#else
 			"popl %%ebx \n\t"
@@ -63,7 +63,7 @@ namespace Nz
 
 	bool HardwareInfoImpl::IsCpuidSupported()
 	{
-	#ifdef NAZARA_PLATFORM_x64
+	#ifdef NAZARA_ARCH_x86_64
 		return true; // cpuid is always supported on x64 arch
 	#else
 		#if defined(NAZARA_COMPILER_MSVC)