diff --git a/include/Nazara/Core/Config.hpp b/include/Nazara/Core/Config.hpp
index 87848b052..2ad2513ac 100644
--- a/include/Nazara/Core/Config.hpp
+++ b/include/Nazara/Core/Config.hpp
@@ -72,8 +72,8 @@
 // Number of spinlocks to use with the Windows critical sections (0 to disable)
 #define NAZARA_CORE_WINDOWS_CS_SPINLOCKS 4096
 
-// Optimize the Windows implementation with technologies of Windows vista (and greater) (Break the compatibility with XP)
-#define NAZARA_CORE_WINDOWS_VISTA 0
+// Optimize the Windows implementation with technologies of Windows NT 6.0 (and greater) (Break the compatibility with Windows XP)
+#define NAZARA_CORE_WINDOWS_NT6 0
 
 
 /*
diff --git a/include/Nazara/Prerequesites.hpp b/include/Nazara/Prerequesites.hpp
index c2c83626a..95af712eb 100644
--- a/include/Nazara/Prerequesites.hpp
+++ b/include/Nazara/Prerequesites.hpp
@@ -74,7 +74,7 @@
 	#error Nazara requires a C++11 compliant compiler
 #endif
 
-// Version du moteur
+// Nazara version macro
 #define NAZARA_VERSION_MAJOR 0
 #define NAZARA_VERSION_MINOR 1
 
@@ -97,7 +97,7 @@
 			#define NOMINMAX
 		#endif
 
-		#if NAZARA_CORE_WINDOWS_VISTA
+		#if NAZARA_CORE_WINDOWS_NT6
 			// Version de Windows minimale : Vista
 			#define NAZARA_WINNT 0x0600
 		#else
diff --git a/src/Nazara/Core/Win32/ConditionVariableImpl.cpp b/src/Nazara/Core/Win32/ConditionVariableImpl.cpp
index 002a9656a..a387a7638 100644
--- a/src/Nazara/Core/Win32/ConditionVariableImpl.cpp
+++ b/src/Nazara/Core/Win32/ConditionVariableImpl.cpp
@@ -12,7 +12,7 @@ namespace Nz
 {
 	ConditionVariableImpl::ConditionVariableImpl()
 	{
-		#if NAZARA_CORE_WINDOWS_VISTA
+		#if NAZARA_CORE_WINDOWS_NT6
 		InitializeConditionVariable(&m_cv);
 		#else
 		m_count = 0;
@@ -21,7 +21,7 @@ namespace Nz
 		#endif
 	}
 
-	#if !NAZARA_CORE_WINDOWS_VISTA
+	#if !NAZARA_CORE_WINDOWS_NT6
 	ConditionVariableImpl::~ConditionVariableImpl()
 	{
 		CloseHandle(m_events[BROADCAST]);
@@ -31,7 +31,7 @@ namespace Nz
 
 	void ConditionVariableImpl::Signal()
 	{
-		#if NAZARA_CORE_WINDOWS_VISTA
+		#if NAZARA_CORE_WINDOWS_NT6
 		WakeConditionVariable(&m_cv);
 		#else
 		if (m_count > 0)
@@ -41,7 +41,7 @@ namespace Nz
 
 	void ConditionVariableImpl::SignalAll()
 	{
-		#if NAZARA_CORE_WINDOWS_VISTA
+		#if NAZARA_CORE_WINDOWS_NT6
 		WakeAllConditionVariable(&m_cv);
 		#else
 		if (m_count > 0)
@@ -56,7 +56,7 @@ namespace Nz
 
 	bool ConditionVariableImpl::Wait(MutexImpl* mutex, UInt32 timeout)
 	{
-		#if NAZARA_CORE_WINDOWS_VISTA
+		#if NAZARA_CORE_WINDOWS_NT6
 		return SleepConditionVariableCS(&m_cv, &mutex->m_criticalSection, timeout) == TRUE;
 		#else
 		m_count++;
diff --git a/src/Nazara/Core/Win32/ConditionVariableImpl.hpp b/src/Nazara/Core/Win32/ConditionVariableImpl.hpp
index a1bb70deb..469cf6099 100644
--- a/src/Nazara/Core/Win32/ConditionVariableImpl.hpp
+++ b/src/Nazara/Core/Win32/ConditionVariableImpl.hpp
@@ -21,7 +21,7 @@ namespace Nz
 	{
 		public:
 			ConditionVariableImpl();
-			#if NAZARA_CORE_WINDOWS_VISTA
+			#if NAZARA_CORE_WINDOWS_NT6
 			~ConditionVariableImpl() = default;
 			#else
 			~ConditionVariableImpl();
@@ -34,7 +34,7 @@ namespace Nz
 			bool Wait(MutexImpl* mutex, UInt32 timeout);
 
 		private:
-			#if NAZARA_CORE_WINDOWS_VISTA
+			#if NAZARA_CORE_WINDOWS_NT6
 			CONDITION_VARIABLE m_cv;
 			#else
 			enum
diff --git a/src/Nazara/Network/Win32/IpAddressImpl.cpp b/src/Nazara/Network/Win32/IpAddressImpl.cpp
index 97d7a10e3..2dac156ce 100644
--- a/src/Nazara/Network/Win32/IpAddressImpl.cpp
+++ b/src/Nazara/Network/Win32/IpAddressImpl.cpp
@@ -13,7 +13,7 @@ namespace Nz
 {
 	namespace Detail
 	{
-		#if NAZARA_CORE_WINDOWS_VISTA
+		#if NAZARA_CORE_WINDOWS_NT6
 		using addrinfoImpl = addrinfoW;
 
 		int GetAddressInfo(const String& hostname, const String& service, const addrinfoImpl* hints, addrinfoImpl** results)
@@ -105,7 +105,7 @@ namespace Nz
 		return IpAddress::Invalid;
 	}
 
-	#if NAZARA_CORE_WINDOWS_VISTA
+	#if NAZARA_CORE_WINDOWS_NT6
 	IpAddress IpAddressImpl::FromAddrinfo(const addrinfoW* info)
 	{
 		switch (info->ai_family)
diff --git a/src/Nazara/Network/Win32/IpAddressImpl.hpp b/src/Nazara/Network/Win32/IpAddressImpl.hpp
index 000b407eb..e85dc7411 100644
--- a/src/Nazara/Network/Win32/IpAddressImpl.hpp
+++ b/src/Nazara/Network/Win32/IpAddressImpl.hpp
@@ -22,7 +22,7 @@ namespace Nz
 			~IpAddressImpl() = delete;
 
 			static IpAddress FromAddrinfo(const addrinfo* info);
-			#if NAZARA_CORE_WINDOWS_VISTA
+			#if NAZARA_CORE_WINDOWS_NT6
 			static IpAddress FromAddrinfo(const addrinfoW* info);
 			#endif
 			static IpAddress FromSockAddr(const sockaddr* address);
diff --git a/src/Nazara/Network/Win32/SocketImpl.hpp b/src/Nazara/Network/Win32/SocketImpl.hpp
index ab93085d9..94e2e9a8c 100644
--- a/src/Nazara/Network/Win32/SocketImpl.hpp
+++ b/src/Nazara/Network/Win32/SocketImpl.hpp
@@ -12,7 +12,7 @@
 #include <Nazara/Network/IpAddress.hpp>
 #include <winsock2.h>
 
-#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_CORE_WINDOWS_VISTA
+#define NAZARA_NETWORK_POLL_SUPPORT NAZARA_CORE_WINDOWS_NT6
 
 namespace Nz
 {