Index: code/branches/output/src/modules/gametypes/RaceCheckPoint.cc
===================================================================
--- code/branches/output/src/modules/gametypes/RaceCheckPoint.cc	(revision 8826)
+++ code/branches/output/src/modules/gametypes/RaceCheckPoint.cc	(revision 8829)
@@ -32,5 +32,5 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "network/Host.h"
+#include "chat/ChatManager.h"
 #include "SpaceRace.h"
 
@@ -112,5 +112,5 @@
                             + " seconds to reach the check point " + multi_cast<std::string>(this->bCheckpointIndex_+1);
                 const_cast<GametypeInfo*>(gametype->getGametypeInfo())->sendAnnounceMessage(message);
-                Host::Broadcast(message);
+                ChatManager::message(message);
             }
         }
Index: code/branches/output/src/modules/gametypes/SpaceRace.cc
===================================================================
--- code/branches/output/src/modules/gametypes/SpaceRace.cc	(revision 8826)
+++ code/branches/output/src/modules/gametypes/SpaceRace.cc	(revision 8829)
@@ -30,7 +30,7 @@
 
 #include "core/CoreIncludes.h"
-#include "network/Host.h"
-#include <util/Clock.h>
-#include <util/Math.h>
+#include "chat/ChatManager.h"
+#include "util/Clock.h"
+#include "util/Math.h"
 #include "util/Convert.h"
 
@@ -60,5 +60,5 @@
                         + " before the time limit. You lose!";
             const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-            Host::Broadcast(message);
+            ChatManager::message(message);
         }
         else
@@ -70,5 +70,5 @@
                         + "." + multi_cast<std::string>(ms) + " seconds.";
             const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-            Host::Broadcast(message);
+            ChatManager::message(message);
 /*
             float time = this->clock_.getSecondsPrecise();
@@ -86,5 +86,5 @@
 
         std::string message("The match has started! Reach the check points as quickly as possible!");
-        Host::Broadcast(message);
+        ChatManager::message(message);
     }
 
@@ -99,5 +99,5 @@
                         + " seconds.";
         const_cast<GametypeInfo*>(this->getGametypeInfo())->sendAnnounceMessage(message);
-        Host::Broadcast(message);
+        ChatManager::message(message);
     }
 
Index: code/branches/output/src/modules/overlays/hud/ChatOverlay.cc
===================================================================
--- code/branches/output/src/modules/overlays/hud/ChatOverlay.cc	(revision 8826)
+++ code/branches/output/src/modules/overlays/hud/ChatOverlay.cc	(revision 8829)
@@ -67,16 +67,7 @@
     }
 
-    void ChatOverlay::incomingChat(const std::string& message, unsigned int senderID)
+    void ChatOverlay::incomingChat(const std::string& message, const std::string& /*name*/)
     {
-        std::string text = message;
-
-        if (senderID != NETWORK_PEER_ID_UNKNOWN)
-        {
-            PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
-            if (player)
-                text = player->getName() + ": " + message;
-        }
-
-        this->messages_.push_back(multi_cast<Ogre::DisplayString>(text));
+        this->messages_.push_back(multi_cast<Ogre::DisplayString>(message));
 
         Timer* timer = new Timer();
Index: code/branches/output/src/modules/overlays/hud/ChatOverlay.h
===================================================================
--- code/branches/output/src/modules/overlays/hud/ChatOverlay.h	(revision 8826)
+++ code/branches/output/src/modules/overlays/hud/ChatOverlay.h	(revision 8829)
@@ -35,5 +35,5 @@
 #include <OgreOverlayElement.h>
 
-#include "network/ChatListener.h"
+#include "chat/ChatListener.h"
 #include "overlays/OverlayText.h"
 
@@ -49,5 +49,5 @@
 
         protected:
-            virtual void incomingChat(const std::string& message, unsigned int senderID);
+            virtual void incomingChat(const std::string& message, const std::string& name);
 
             std::list<Ogre::DisplayString> messages_;
