diff --git a/sugar/graphics/Makefile.am b/sugar/graphics/Makefile.am
index 41e8ce12..af66cfb1 100644
--- a/sugar/graphics/Makefile.am
+++ b/sugar/graphics/Makefile.am
@@ -2,18 +2,17 @@ sugardir = $(pythondir)/sugar/graphics
 sugar_PYTHON =			\
 	__init__.py		\
 	animator.py		\
-	icon.py			\
-	iconbutton.py          	\
 	canvasbutton.py		\
 	canvasicon.py		\
 	canvasentry.py		\
+	canvasroundbox.py	\
 	combobox.py		\
-	frame.py		\
-	notebook.py		\
+	icon.py			\
+	iconbutton.py          	\
 	menuitem.py		\
+	notebook.py		\
 	objectchooser.py	\
 	radiotoolbutton.py	\
-	roundbox.py		\
 	palette.py		\
 	palettegroup.py		\
 	panel.py		\
diff --git a/sugar/graphics/roundbox.py b/sugar/graphics/canvasroundbox.py
similarity index 97%
rename from sugar/graphics/roundbox.py
rename to sugar/graphics/canvasroundbox.py
index 96a40d78..51b9e7d9 100644
--- a/sugar/graphics/roundbox.py
+++ b/sugar/graphics/canvasroundbox.py
@@ -21,7 +21,7 @@ import hippo
 
 from sugar.graphics import style
 
-class RoundBox(hippo.CanvasBox, hippo.CanvasItem):
+class CanvasRoundBox(hippo.CanvasBox, hippo.CanvasItem):
     __gtype_name__ = 'SugarRoundBox'
 
     _BORDER_DEFAULT = style.LINE_WIDTH
diff --git a/sugar/graphics/frame.py b/sugar/graphics/frame.py
deleted file mode 100644
index e7bf6fdc..00000000
--- a/sugar/graphics/frame.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2006-2007 Red Hat, Inc.
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-from sugar.graphics import style
-from sugar.graphics.roundbox import RoundBox
-
-class Frame(RoundBox):
-    __gtype_name__ = 'SugarFrame'
-
-    def __init__(self, **kwargs):
-        RoundBox.__init__(self, **kwargs)
-        self.props.border_color = style.COLOR_BLACK.get_int()