diff --git a/chat/chat.py b/chat/chat.py
index 3f0c2668..20842297 100755
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -19,6 +19,7 @@ except ImportError:
 	from sugar import activity
 	from sugar.sugar_globals import *
 
+import BuddyList
 import richtext
 import xmlrpclib
 import p2p
diff --git a/chat/p2p.py b/chat/p2p.py
index b421a885..25607a61 100644
--- a/chat/p2p.py
+++ b/chat/p2p.py
@@ -57,14 +57,14 @@ class Group:
 	def join(self):
 		self._pannounce = presence.PresenceAnnounce()
 
-		realname = Owner.get_instance().get_realname()
+		rname = Owner.get_instance().get_realname()
 		nick = Owner.get_instance().get_nick()
-				
-		self._buddy_list = BuddyList.BuddyList(realname)
+
+		self._buddy_list = BuddyList.BuddyList(rname)
 		self._buddy_list.start()
 
-		self._pannounce.register_service(realname, self._SERVER_PORT, presence.OLPC_CHAT_SERVICE,
-				name = nick, realname = realname)
+		self._pannounce.register_service(rname, self._SERVER_PORT, presence.OLPC_CHAT_SERVICE,
+				name = nick, realname = rname)
 
 		self._p2p_req_handler = GroupRequestHandler(self)
 		self._p2p_server = network.GlibXMLRPCServer(("", self._SERVER_PORT))