diff --git a/examples/toolbar.py b/examples/toolbar.py
index 6150be36..6a6c143d 100644
--- a/examples/toolbar.py
+++ b/examples/toolbar.py
@@ -1,7 +1,7 @@
 import gtk
 
 from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toolbar import Toolbar, ToolbarButton
+from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
 from sugar.graphics import style
 
 window = gtk.Window()
@@ -9,7 +9,7 @@ window = gtk.Window()
 box = gtk.VBox()
 window.add(box)
 
-toolbar = Toolbar()
+toolbar = ToolbarBox()
 box.pack_start(toolbar, False)
 
 tollbarbutton_1 = ToolbarButton(
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index f20d402b..d94cdbec 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -806,6 +806,10 @@ class Activity(Window, gtk.Container):
     def get_document_path(self, async_cb, async_err_cb):
         async_err_cb(NotImplementedError())
 
+    def set_toolbar_box(self, toolbar_box):
+        # make more consistent using ToolbarBox instead of Toolbox
+        self.set_toolbox(toolbar_box)
+
     # DEPRECATED
     _shared_activity = property(lambda self: self.shared_activity, None)
 
diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py
index ca920aa6..ae4abdf9 100644
--- a/src/sugar/activity/widgets.py
+++ b/src/sugar/activity/widgets.py
@@ -22,7 +22,7 @@ import gettext
 import gconf
 
 from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toolbar import Toolbar, ToolbarButton
+from sugar.graphics.toolbarbox import ToolbarButton
 from sugar.graphics.radiopalette import RadioPalette, RadioMenuButton
 from sugar.graphics.radiotoolbutton import RadioToolButton
 from sugar.graphics.toolbox import Toolbox
diff --git a/src/sugar/graphics/toolbar.py b/src/sugar/graphics/toolbarbox.py
similarity index 99%
rename from src/sugar/graphics/toolbar.py
rename to src/sugar/graphics/toolbarbox.py
index 6e3666e3..3daca703 100644
--- a/src/sugar/graphics/toolbar.py
+++ b/src/sugar/graphics/toolbarbox.py
@@ -109,7 +109,7 @@ class ToolbarButton(ToolButton):
         gtk.ToolButton.do_expose_event(self, event)
         _paint_arrow(self, event, gtk.ARROW_UP)
 
-class Toolbar(gtk.VBox):
+class ToolbarBox(gtk.VBox):
     def __init__(self, padding=style.TOOLBOX_HORIZONTAL_PADDING):
         gtk.VBox.__init__(self)