diff --git a/shell/view/frame/Makefile.am b/shell/view/frame/Makefile.am
index 7be99869..02951b90 100644
--- a/shell/view/frame/Makefile.am
+++ b/shell/view/frame/Makefile.am
@@ -1,7 +1,7 @@
 sugardir = $(pkgdatadir)/shell/view/frame
 sugar_PYTHON =				\
 	__init__.py			\
-	ActivitiesBox.py		\
+	activitiestray.py		\
 	activitybutton.py		\
 	clipboardbox.py			\
 	clipboardpanelwindow.py		\
diff --git a/shell/view/frame/ActivitiesBox.py b/shell/view/frame/activitiestray.py
similarity index 99%
rename from shell/view/frame/ActivitiesBox.py
rename to shell/view/frame/activitiestray.py
index ec79f864..94c4ee94 100644
--- a/shell/view/frame/ActivitiesBox.py
+++ b/shell/view/frame/activitiestray.py
@@ -46,7 +46,7 @@ class InviteButton(TrayButton):
     def get_invite(self):
         return self._invite
 
-class ActivitiesBox(hippo.CanvasBox):
+class ActivitiesTray(hippo.CanvasBox):
     def __init__(self, shell):
         hippo.CanvasBox.__init__(self, orientation=hippo.ORIENTATION_HORIZONTAL)
 
diff --git a/shell/view/frame/frame.py b/shell/view/frame/frame.py
index 2784835f..91d8360d 100644
--- a/shell/view/frame/frame.py
+++ b/shell/view/frame/frame.py
@@ -26,7 +26,7 @@ from sugar.graphics import palettegroup
 from sugar.clipboard import clipboardservice
 
 from view.frame.eventarea import EventArea
-from view.frame.ActivitiesBox import ActivitiesBox
+from view.frame.activitiestray import ActivitiesTray
 from view.frame.zoomtoolbar import ZoomToolbar
 from view.frame.overlaybox import OverlayBox
 from view.frame.friendstray import FriendsTray
@@ -219,7 +219,7 @@ class Frame(object):
     def _create_bottom_panel(self):
         panel = self._create_panel(gtk.POS_BOTTOM)
 
-        box = ActivitiesBox(self._shell)
+        box = ActivitiesTray(self._shell)
         panel.append(box, hippo.PACK_EXPAND)
 
         return panel