diff --git a/shell/model/Owner.py b/shell/model/Owner.py
index 5443eb97..1a6e3e85 100644
--- a/shell/model/Owner.py
+++ b/shell/model/Owner.py
@@ -6,7 +6,7 @@ import conf
 from sugar import env
 from sugar.p2p import Stream
 from sugar.presence import PresenceService
-from model.Friends import Friends
+from model.Invites import Invites
 
 PRESENCE_SERVICE_TYPE = "_presence_olpc._tcp"
 
@@ -31,10 +31,10 @@ class ShellOwner(object):
 
 		self._pservice = PresenceService.get_instance()
 
-		self._friends = Friends()
+		self._invites = Invites()
 
-	def get_friends(self):
-		return self._friends
+	def get_invites(self):
+		return self._invites
 
 	def announce(self):
 		# Create and announce our presence
diff --git a/shell/model/ShellModel.py b/shell/model/ShellModel.py
index 2bdf08ab..a20ac98d 100644
--- a/shell/model/ShellModel.py
+++ b/shell/model/ShellModel.py
@@ -1,7 +1,7 @@
 import gobject
 
 from sugar.presence import PresenceService
-from model.Invites import Invites
+from model.Friends import Friends
 from model.Owner import ShellOwner
 
 class ShellModel(gobject.GObject):
@@ -25,13 +25,13 @@ class ShellModel(gobject.GObject):
 
 		self._owner = ShellOwner()
 		self._owner.announce()
-		self._invites = Invites()
+		self._friends = Friends()
 
 	def get_friends(self):
-		return self._owner.get_friends()
+		return self._friends
 
 	def get_invites(self):
-		return self._invites
+		return self._owner.get_invites()
 
 	def get_owner(self):
 		return self._owner