diff --git a/include/Nazara/Network/AbstractSocket.hpp b/include/Nazara/Network/AbstractSocket.hpp
index 9062fbfa8..caa6bbaaf 100644
--- a/include/Nazara/Network/AbstractSocket.hpp
+++ b/include/Nazara/Network/AbstractSocket.hpp
@@ -41,7 +41,7 @@ namespace Nz
 		protected:
 			AbstractSocket(SocketType type);
 
-			inline void ChangeState(SocketState newState);
+			inline void UpdateState(SocketState newState);
 
 			virtual void OnClose();
 			virtual void OnOpened();
diff --git a/include/Nazara/Network/AbstractSocket.inl b/include/Nazara/Network/AbstractSocket.inl
index ffb33f093..5987afe00 100644
--- a/include/Nazara/Network/AbstractSocket.inl
+++ b/include/Nazara/Network/AbstractSocket.inl
@@ -31,7 +31,7 @@ namespace Nz
 		return m_isBlockingEnabled;
 	}
 
-	inline void AbstractSocket::ChangeState(SocketState newState)
+	inline void AbstractSocket::UpdateState(SocketState newState)
 	{
 		if (m_state != newState)
 		{
diff --git a/src/Nazara/Network/AbstractSocket.cpp b/src/Nazara/Network/AbstractSocket.cpp
index bcbf8c638..bdd1a7d35 100644
--- a/src/Nazara/Network/AbstractSocket.cpp
+++ b/src/Nazara/Network/AbstractSocket.cpp
@@ -71,7 +71,7 @@ namespace Nz
 
 	void AbstractSocket::OnClose()
 	{
-		ChangeState(SocketState_NotConnected);
+		UpdateState(SocketState_NotConnected);
 	}
 
 	void AbstractSocket::OnOpened()
diff --git a/src/Nazara/Network/TcpClient.cpp b/src/Nazara/Network/TcpClient.cpp
index 8a4c2f453..72db8fa5a 100644
--- a/src/Nazara/Network/TcpClient.cpp
+++ b/src/Nazara/Network/TcpClient.cpp
@@ -42,7 +42,7 @@ namespace Nz
 		if (state != SocketState_NotConnected)
 			m_peerAddress = remoteAddress;
 
-		ChangeState(state);
+		UpdateState(state);
 		return state;
 	}
 
@@ -89,7 +89,7 @@ namespace Nz
 				{
 					// Our connection attempt failed
 					m_lastError = error;
-					ChangeState(SocketState_NotConnected);
+					UpdateState(SocketState_NotConnected);
 				}
 
 				break;
@@ -104,10 +104,10 @@ namespace Nz
 				{
 					// Other errors mean a problem while getting the peer address
 					if (error == SocketError_ConnectionClosed)
-						ChangeState(SocketState_NotConnected);
+						UpdateState(SocketState_NotConnected);
 				}
 				else
-					ChangeState(SocketState_Connected); // If we are not connecting and have a peer address, we are connected
+					UpdateState(SocketState_Connected); // If we are not connecting and have a peer address, we are connected
 
 				break;
 			}
@@ -127,7 +127,7 @@ namespace Nz
 			{
 				case SocketError_ConnectionClosed:
 				case SocketError_ConnectionRefused:
-					ChangeState(SocketState_NotConnected);
+					UpdateState(SocketState_NotConnected);
 					break;
 
 				default:
@@ -140,7 +140,7 @@ namespace Nz
 		if (received)
 			*received = read;
 
-		ChangeState(SocketState_Connected);
+		UpdateState(SocketState_Connected);
 		return true;
 	}
 
@@ -168,7 +168,7 @@ namespace Nz
 				{
 					case SocketError_ConnectionClosed:
 					case SocketError_ConnectionRefused:
-						ChangeState(SocketState_NotConnected);
+						UpdateState(SocketState_NotConnected);
 						break;
 
 					default:
@@ -181,7 +181,7 @@ namespace Nz
 			totalByteSent += sentSize;
 		}
 
-		ChangeState(SocketState_Connected);
+		UpdateState(SocketState_Connected);
 		return true;
 	}
 
diff --git a/src/Nazara/Network/TcpServer.cpp b/src/Nazara/Network/TcpServer.cpp
index 2aa42956b..096603b8f 100644
--- a/src/Nazara/Network/TcpServer.cpp
+++ b/src/Nazara/Network/TcpServer.cpp
@@ -43,7 +43,7 @@ namespace Nz
 		if (state == SocketState_Bound)
 			m_boundAddress = SocketImpl::QuerySocketAddress(m_handle);
 
-		ChangeState(state);
+		UpdateState(state);
 		return state;
 	}
 
diff --git a/src/Nazara/Network/UdpSocket.cpp b/src/Nazara/Network/UdpSocket.cpp
index b73afaf20..b73ef8da2 100644
--- a/src/Nazara/Network/UdpSocket.cpp
+++ b/src/Nazara/Network/UdpSocket.cpp
@@ -22,7 +22,7 @@ namespace Nz
 		if (state == SocketState_Bound)
 			m_boundAddress = SocketImpl::QuerySocketAddress(m_handle);
 
-		ChangeState(state);
+		UpdateState(state);
 		return state;
 	}
 
@@ -67,13 +67,13 @@ namespace Nz
 	{
 		m_boundAddress = IpAddress::Invalid;
 
-		ChangeState(SocketState_NotConnected);
+		UpdateState(SocketState_NotConnected);
 	}
 
 	void UdpSocket::OnOpened()
 	{
 		m_boundAddress = IpAddress::Invalid;
 
-		ChangeState(SocketState_NotConnected);
+		UpdateState(SocketState_NotConnected);
 	}
 }
\ No newline at end of file