diff --git a/shell/BuddyPopup.py b/shell/FriendPopup.py
similarity index 98%
rename from shell/BuddyPopup.py
rename to shell/FriendPopup.py
index c31a6dfe..1d309a6d 100644
--- a/shell/BuddyPopup.py
+++ b/shell/FriendPopup.py
@@ -5,7 +5,7 @@ from sugar.canvas.CanvasView import CanvasView
 from sugar.canvas.CanvasBox import CanvasBox
 from sugar.canvas.IconItem import IconItem
 
-class BuddyPopup(gtk.Window):
+class FriendPopup(gtk.Window):
 	def __init__(self, shell, grid, friend):
 		gtk.Window.__init__(self, gtk.WINDOW_POPUP)
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index f9a62682..4a1d49bc 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -14,6 +14,7 @@ sugar_PYTHON =				\
 	ChatController.py		\
 	ConsoleWindow.py		\
 	FirstTimeDialog.py		\
+	FriendPopup.py			\
 	Friends.py			\
 	Invites.py			\
 	Owner.py			\
diff --git a/shell/home/FriendsGroup.py b/shell/home/FriendsGroup.py
index 92b6d70d..605070ba 100644
--- a/shell/home/FriendsGroup.py
+++ b/shell/home/FriendsGroup.py
@@ -5,7 +5,7 @@ import goocanvas
 from sugar.canvas.IconItem import IconItem
 from home.IconLayout import IconLayout
 from home.MyIcon import MyIcon
-from BuddyPopup import BuddyPopup
+from FriendPopup import FriendPopup
 from sugar.canvas.Grid import Grid
 
 class FriendIcon(IconItem):
@@ -27,7 +27,7 @@ class FriendIcon(IconItem):
 		grid = Grid()
 
 		if not self._popup:
-			self._popup = BuddyPopup(self._shell, grid, icon.get_friend())
+			self._popup = FriendPopup(self._shell, grid, icon.get_friend())
 
 		[grid_x1, grid_y1] = grid.convert_from_screen(x1, y1)
 		[grid_x2, grid_y2] = grid.convert_from_screen(x2, y2)