diff --git a/shell/model/BuddyInfo.py b/shell/model/BuddyModel.py
similarity index 96%
rename from shell/model/BuddyInfo.py
rename to shell/model/BuddyModel.py
index 68f0a445..b6a65dc4 100644
--- a/shell/model/BuddyInfo.py
+++ b/shell/model/BuddyModel.py
@@ -1,7 +1,7 @@
 from sugar.presence import PresenceService
 from sugar.canvas.IconColor import IconColor
 
-class BuddyInfo:
+class BuddyModel:
 	def __init__(self, buddy=None):
 		if buddy:
 			self.set_name(buddy.get_name())
diff --git a/shell/model/Friends.py b/shell/model/Friends.py
index a11acc06..b90f9d93 100644
--- a/shell/model/Friends.py
+++ b/shell/model/Friends.py
@@ -3,7 +3,7 @@ from ConfigParser import ConfigParser
 
 import gobject
 
-from model.BuddyInfo import BuddyInfo
+from model.BuddyModel import BuddyModel
 from sugar import env
 
 class Friends(gobject.GObject):
@@ -31,7 +31,7 @@ class Friends(gobject.GObject):
 
 	def make_friend(self, buddy):
 		if not self.has_buddy(buddy):	
-			self.add_friend(BuddyInfo(buddy))
+			self.add_friend(BuddyModel(buddy))
 			self.save()
 
 	def remove(self, buddy_info):
@@ -47,7 +47,7 @@ class Friends(gobject.GObject):
 
 		if cp.read([self._path]):
 			for name in cp.sections():
-				buddy = BuddyInfo()
+				buddy = BuddyModel()
 				buddy.set_name(name)
 				buddy.set_color(cp.get(name, 'color'))
 				self.add_friend(buddy)
diff --git a/shell/model/Makefile.am b/shell/model/Makefile.am
index ce246686..322e732d 100644
--- a/shell/model/Makefile.am
+++ b/shell/model/Makefile.am
@@ -1,7 +1,7 @@
 sugardir = $(pkgdatadir)/shell/model
 sugar_PYTHON =			\
 	__init__.py		\
-	BuddyInfo.py		\
+	BuddyModel.py		\
 	Friends.py		\
 	Invites.py		\
 	Owner.py		\
diff --git a/shell/view/frame/RightPanel.py b/shell/view/frame/RightPanel.py
index 144c50e3..d74d6ab4 100644
--- a/shell/view/frame/RightPanel.py
+++ b/shell/view/frame/RightPanel.py
@@ -5,7 +5,7 @@ from sugar.canvas.IconColor import IconColor
 from sugar.canvas.CanvasBox import CanvasBox
 from sugar.presence import PresenceService
 from view.BuddyIcon import BuddyIcon
-from model.BuddyInfo import BuddyInfo
+from model.BuddyModel import BuddyModel
 from view.frame.MenuStrategy import MenuStrategy
 
 class RightPanel(CanvasBox):
@@ -25,7 +25,7 @@ class RightPanel(CanvasBox):
 		shell.connect('activity-changed', self.__activity_changed_cb)
 
 	def add(self, buddy):
-		icon = BuddyIcon(self._shell, self._menu_shell, BuddyInfo(buddy))
+		icon = BuddyIcon(self._shell, self._menu_shell, BuddyModel(buddy))
 		icon.set_menu_strategy(MenuStrategy())
 		self.set_constraints(icon, 3, 3)
 		self.add_child(icon)