diff --git a/ixwebsocket/IXWebSocketMessageQueue.cpp b/ixwebsocket/IXWebSocketMessageQueue.cpp
index 222478d8..62e759bd 100644
--- a/ixwebsocket/IXWebSocketMessageQueue.cpp
+++ b/ixwebsocket/IXWebSocketMessageQueue.cpp
@@ -47,7 +47,7 @@ namespace ix
                 const WebSocketOpenInfo& openInfo,
                 const WebSocketCloseInfo& closeInfo)
             {
-                MessageDataPtr message(new Message());
+                MessagePtr message(new Message());
 
                 message->type      = type;
                 message->str       = str;
@@ -69,9 +69,9 @@ namespace ix
         _onMessageUserCallback = callback;
     }
     
-    WebSocketMessageQueue::MessageDataPtr WebSocketMessageQueue::popMessage()
+    WebSocketMessageQueue::MessagePtr WebSocketMessageQueue::popMessage()
     {
-        MessageDataPtr message;
+        MessagePtr message;
         std::lock_guard<std::mutex> lock(_messagesMutex);
 
         if (!_messages.empty())
@@ -88,7 +88,7 @@ namespace ix
         if (!_onMessageUserCallback)
             return;
 
-        MessageDataPtr message;
+        MessagePtr message;
 
         while (count > 0 && (message = popMessage()))
         {
diff --git a/ixwebsocket/IXWebSocketMessageQueue.h b/ixwebsocket/IXWebSocketMessageQueue.h
index 961f57e2..543189e9 100644
--- a/ixwebsocket/IXWebSocketMessageQueue.h
+++ b/ixwebsocket/IXWebSocketMessageQueue.h
@@ -39,14 +39,14 @@ namespace ix
             WebSocketCloseInfo closeInfo;
         };
 
-        using MessageDataPtr = std::shared_ptr<Message>;
+        using MessagePtr = std::shared_ptr<Message>;
 
-        MessageDataPtr popMessage();
+        MessagePtr popMessage();
 
     private:
         WebSocket* _websocket = nullptr;
         OnMessageCallback _onMessageUserCallback;
         std::mutex _messagesMutex;
-        std::list<MessageDataPtr> _messages;
+        std::list<MessagePtr> _messages;
     };
 }