diff --git a/examples/radiopalette.py b/examples/radiopalette.py
index 3117aece..5aa817c0 100644
--- a/examples/radiopalette.py
+++ b/examples/radiopalette.py
@@ -1,10 +1,10 @@
 import gtk
 
-from sugar.graphics.radiopalette import RadioPalette, RadioMenuButton, \
+from sugar3.graphics.radiopalette import RadioPalette, RadioMenuButton, \
                                         RadioToolsButton
-from sugar.graphics.radiotoolbutton import RadioToolButton
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics import style
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics import style
 
 window = gtk.Window()
 
diff --git a/examples/toolbar.py b/examples/toolbar.py
index c0718d32..bd6afef4 100644
--- a/examples/toolbar.py
+++ b/examples/toolbar.py
@@ -1,8 +1,8 @@
 import gtk
 
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.toolbarbox import ToolbarBox, ToolbarButton
-from sugar.graphics import style
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.toolbarbox import ToolbarBox, ToolbarButton
+from sugar3.graphics import style
 
 window = gtk.Window()
 
diff --git a/src/sugar3/activity/__init__.py b/src/sugar3/activity/__init__.py
index b69646c6..6fba9620 100644
--- a/src/sugar3/activity/__init__.py
+++ b/src/sugar3/activity/__init__.py
@@ -20,24 +20,24 @@
 Each activity within the OLPC environment must provide two
 dbus services.  The first, patterned after the
 
-    sugar.activity.activityfactory.ActivityFactory
+    sugar3.activity.activityfactory.ActivityFactory
 
 class is responsible for providing a "create" method which
 takes a small dictionary with values corresponding to a
 
-    sugar.activity.activityhandle.ActivityHandle
+    sugar3.activity.activityhandle.ActivityHandle
 
 describing an individual instance of the activity.
 
 Each activity so registered is described by a
 
-    sugar.activity.bundle.Bundle
+    sugar3.activity.bundle.Bundle
 
 instance, which parses a specially formatted activity.info
 file (stored in the activity directory's ./activity
 subdirectory).  The
 
-    sugar.activity.bundlebuilder
+    sugar3.activity.bundlebuilder
 
 module provides facilities for the standard setup.py module
 which produces and registers bundles from activity source
@@ -47,7 +47,7 @@ Once instantiated by the ActivityFactory's create method,
 each activity must provide an introspection API patterned
 after the
 
-    sugar.activity.activityservice.ActivityService
+    sugar3.activity.activityservice.ActivityService
 
 class.  This class allows for querying the ID of the root
 window, requesting sharing across the network, and basic
diff --git a/src/sugar3/activity/activity.py b/src/sugar3/activity/activity.py
index 6548b616..b7f054d0 100644
--- a/src/sugar3/activity/activity.py
+++ b/src/sugar3/activity/activity.py
@@ -13,7 +13,7 @@ which class to start.
 For example the most minimal Activity:
 
 
-   from sugar.activity import activity
+   from sugar3.activity import activity
 
    class ReadActivity(activity.Activity):
         pass
@@ -71,20 +71,20 @@ from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT
 from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM
 
 from sugar import util
-from sugar.presence import presenceservice
-from sugar.activity.activityservice import ActivityService
-from sugar.activity.namingalert import NamingAlert
-from sugar.graphics import style
-from sugar.graphics.window import Window
-from sugar.graphics.alert import Alert
-from sugar.graphics.icon import Icon
-from sugar.datastore import datastore
-from sugar.session import XSMPClient
+from sugar3.presence import presenceservice
+from sugar3.activity.activityservice import ActivityService
+from sugar3.activity.namingalert import NamingAlert
+from sugar3.graphics import style
+from sugar3.graphics.window import Window
+from sugar3.graphics.alert import Alert
+from sugar3.graphics.icon import Icon
+from sugar3.datastore import datastore
+from sugar3.session import XSMPClient
 from sugar import wm
 
 # support deprecated imports
-from sugar.activity.widgets import ActivityToolbar, EditToolbar
-from sugar.activity.widgets import ActivityToolbox
+from sugar3.activity.widgets import ActivityToolbar, EditToolbar
+from sugar3.activity.widgets import ActivityToolbox
 
 
 _ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
@@ -196,7 +196,7 @@ class Activity(Window, gtk.Container):
 
            Usually, you will also need the standard EditToolbar. This is the
            one which has the standard copy and paste buttons. You need to
-           derive your own EditToolbar class from sugar.EditToolbar:
+           derive your own EditToolbar class from sugar3.EditToolbar:
                 class EditToolbar(activity.EditToolbar):
                     ...
 
@@ -231,7 +231,7 @@ class Activity(Window, gtk.Container):
     def __init__(self, handle, create_jobject=True):
         """Initialise the Activity
 
-        handle -- sugar.activity.activityhandle.ActivityHandle
+        handle -- sugar3.activity.activityhandle.ActivityHandle
             instance providing the activity id and access to the
             presence service which *may* provide sharing for this
             application
@@ -729,7 +729,7 @@ class Activity(Window, gtk.Container):
     def get_shared_activity(self):
         """Returns an instance of the shared Activity or None
 
-        The shared activity is of type sugar.presence.activity.Activity
+        The shared activity is of type sugar3.presence.activity.Activity
         """
         return self._shared_activity
 
diff --git a/src/sugar3/activity/activityfactory.py b/src/sugar3/activity/activityfactory.py
index a206d159..9e861d1e 100644
--- a/src/sugar3/activity/activityfactory.py
+++ b/src/sugar3/activity/activityfactory.py
@@ -28,10 +28,10 @@ import uuid
 import dbus
 import gobject
 
-from sugar.activity.activityhandle import ActivityHandle
+from sugar3.activity.activityhandle import ActivityHandle
 from sugar import util
 from sugar import env
-from sugar.datastore import datastore
+from sugar3.datastore import datastore
 
 from errno import EEXIST, ENOSPC
 
@@ -167,7 +167,7 @@ class ActivityCreationHandler(gobject.GObject):
             the activity to be created and the sharing
             service that may or may not be connected with it
 
-            sugar.activity.activityhandle.ActivityHandle instance
+            sugar3.activity.activityhandle.ActivityHandle instance
 
         calls the "create" method on the service for this
         particular activity type and registers the
diff --git a/src/sugar3/activity/activityservice.py b/src/sugar3/activity/activityservice.py
index 3fafe8ae..738e602e 100644
--- a/src/sugar3/activity/activityservice.py
+++ b/src/sugar3/activity/activityservice.py
@@ -39,7 +39,7 @@ class ActivityService(dbus.service.Object):
     def __init__(self, activity):
         """Initialise the service for the given activity
 
-        activity -- sugar.activity.activity.Activity instance
+        activity -- sugar3.activity.activity.Activity instance
 
         Creates dbus services that use the instance's activity_id
         as discriminants among all active services
diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py
index 65105abe..08e58212 100644
--- a/src/sugar3/activity/bundlebuilder.py
+++ b/src/sugar3/activity/bundlebuilder.py
@@ -33,7 +33,7 @@ import logging
 from fnmatch import fnmatch
 
 from sugar import env
-from sugar.bundle.activitybundle import ActivityBundle
+from sugar3.bundle.activitybundle import ActivityBundle
 
 
 IGNORE_DIRS = ['dist', '.git']
diff --git a/src/sugar3/activity/main.py b/src/sugar3/activity/main.py
index d2a93026..fa84f02f 100644
--- a/src/sugar3/activity/main.py
+++ b/src/sugar3/activity/main.py
@@ -26,10 +26,10 @@ import dbus.service
 import dbus.glib
 
 import sugar
-from sugar.activity import activityhandle
-from sugar.activity import i18n
-from sugar.bundle.activitybundle import ActivityBundle
-from sugar.graphics import style
+from sugar3.activity import activityhandle
+from sugar3.activity import i18n
+from sugar3.bundle.activitybundle import ActivityBundle
+from sugar3.graphics import style
 from sugar import logger
 
 
@@ -111,7 +111,7 @@ def main():
     locale_path = i18n.get_locale_path(bundle.get_bundle_id())
 
     gettext.bindtextdomain(bundle.get_bundle_id(), locale_path)
-    gettext.bindtextdomain('sugar-toolkit', sugar.locale_path)
+    gettext.bindtextdomain('sugar-toolkit', sugar3.locale_path)
     gettext.textdomain(bundle.get_bundle_id())
 
     splitted_module = args[0].rsplit('.', 1)
diff --git a/src/sugar3/activity/namingalert.py b/src/sugar3/activity/namingalert.py
index 078c27a1..f1f59096 100644
--- a/src/sugar3/activity/namingalert.py
+++ b/src/sugar3/activity/namingalert.py
@@ -23,13 +23,13 @@ import gtk
 import gobject
 import gconf
 
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
-from sugar.graphics.xocolor import XoColor
-from sugar.graphics.icon import get_icon_file_name
-from sugar.graphics.toolbutton import ToolButton
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.xocolor import XoColor
+from sugar3.graphics.icon import get_icon_file_name
+from sugar3.graphics.toolbutton import ToolButton
 
-from sugar.bundle.activitybundle import ActivityBundle
+from sugar3.bundle.activitybundle import ActivityBundle
 
 
 _ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
diff --git a/src/sugar3/activity/widgets.py b/src/sugar3/activity/widgets.py
index e5c40635..b3ccf914 100644
--- a/src/sugar3/activity/widgets.py
+++ b/src/sugar3/activity/widgets.py
@@ -20,14 +20,14 @@ import gettext
 import gconf
 import logging
 
-from sugar.graphics.toolbutton import ToolButton
-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
-from sugar.graphics.xocolor import XoColor
-from sugar.graphics.icon import Icon
-from sugar.bundle.activitybundle import ActivityBundle
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.toolbarbox import ToolbarButton
+from sugar3.graphics.radiopalette import RadioPalette, RadioMenuButton
+from sugar3.graphics.radiotoolbutton import RadioToolButton
+from sugar3.graphics.toolbox import Toolbox
+from sugar3.graphics.xocolor import XoColor
+from sugar3.graphics.icon import Icon
+from sugar3.bundle.activitybundle import ActivityBundle
 
 
 _ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
@@ -40,7 +40,7 @@ def _create_activity_icon(metadata):
         client = gconf.client_get_default()
         color = XoColor(client.get_string('/desktop/sugar/user/color'))
 
-    from sugar.activity.activity import get_bundle_path
+    from sugar3.activity.activity import get_bundle_path
     bundle = ActivityBundle(get_bundle_path())
     icon = Icon(file=bundle.get_icon(), xo_color=color)
 
diff --git a/src/sugar3/bundle/activitybundle.py b/src/sugar3/bundle/activitybundle.py
index 542fa00d..8285c6c2 100644
--- a/src/sugar3/bundle/activitybundle.py
+++ b/src/sugar3/bundle/activitybundle.py
@@ -30,10 +30,10 @@ import warnings
 
 from sugar import env
 from sugar import util
-from sugar.bundle.bundle import Bundle, \
+from sugar3.bundle.bundle import Bundle, \
     MalformedBundleException, NotInstalledException
-from sugar.bundle.bundleversion import NormalizedVersion
-from sugar.bundle.bundleversion import InvalidVersionError
+from sugar3.bundle.bundleversion import NormalizedVersion
+from sugar3.bundle.bundleversion import InvalidVersionError
 
 
 class ActivityBundle(Bundle):
diff --git a/src/sugar3/bundle/contentbundle.py b/src/sugar3/bundle/contentbundle.py
index e4f6eb16..6ee74b58 100644
--- a/src/sugar3/bundle/contentbundle.py
+++ b/src/sugar3/bundle/contentbundle.py
@@ -26,11 +26,11 @@ import os
 import urllib
 
 from sugar import env
-from sugar.bundle.bundle import Bundle, NotInstalledException, \
+from sugar3.bundle.bundle import Bundle, NotInstalledException, \
     MalformedBundleException
 
-from sugar.bundle.bundleversion import NormalizedVersion
-from sugar.bundle.bundleversion import InvalidVersionError
+from sugar3.bundle.bundleversion import NormalizedVersion
+from sugar3.bundle.bundleversion import InvalidVersionError
 
 
 class ContentBundle(Bundle):
diff --git a/src/sugar3/graphics/alert.py b/src/sugar3/graphics/alert.py
index b5aa0c0d..3d88d2ff 100644
--- a/src/sugar3/graphics/alert.py
+++ b/src/sugar3/graphics/alert.py
@@ -13,14 +13,14 @@ Examples
 create a simple alert message.
 
 .. code-block:: python
-  from sugar.graphics.alert import Alert
+  from sugar3.graphics.alert import Alert
   ...
        # Create a new simple alert
         alert = Alert()
         # Populate the title and text body of the alert.
         alert.props.title=_('Title of Alert Goes Here')
         alert.props.msg = _('Text message of alert goes here')
-        # Call the add_alert() method (inherited via the sugar.graphics.Window
+        # Call the add_alert() method (inherited via the sugar3.graphics.Window
         # superclass of Activity) to add this alert to the activity window.
         self.add_alert(alert)
         alert.show()
@@ -52,8 +52,8 @@ import gobject
 import pango
 import math
 
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
 
 
 _ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
@@ -252,7 +252,7 @@ class ConfirmationAlert(Alert):
     --------
 
     .. code-block:: python
-      from sugar.graphics.alert import ConfirmationAlert
+      from sugar3.graphics.alert import ConfirmationAlert
       ...
         #### Method: _alert_confirmation, create a Confirmation alert (with ok
                      and cancel buttons standard)
@@ -304,7 +304,7 @@ class ErrorAlert(Alert):
     --------
 
     .. code-block:: python
-      from sugar.graphics.alert import ErrorAlert
+      from sugar3.graphics.alert import ErrorAlert
       ...
         #### Method: _alert_error, create a Error alert (with ok
                      button standard)
@@ -388,7 +388,7 @@ class TimeoutAlert(Alert):
     --------
 
     .. code-block:: python
-      from sugar.graphics.alert import TimeoutAlert
+      from sugar3.graphics.alert import TimeoutAlert
       ...
         #### Method: _alert_timeout, create a Timeout alert (with ok and cancel
                      buttons standard)
@@ -452,7 +452,7 @@ class NotifyAlert(Alert):
     --------
 
     .. code-block:: python
-      from sugar.graphics.alert import NotifyAlert
+      from sugar3.graphics.alert import NotifyAlert
       ...
         #### Method: _alert_notify, create a Notify alert (with only an 'OK'
                      button)
diff --git a/src/sugar3/graphics/canvastextview.py b/src/sugar3/graphics/canvastextview.py
index 853af9f9..168d8fb2 100644
--- a/src/sugar3/graphics/canvastextview.py
+++ b/src/sugar3/graphics/canvastextview.py
@@ -18,7 +18,7 @@
 import gtk
 import hippo
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 
 class CanvasTextView(hippo.CanvasWidget):
diff --git a/src/sugar3/graphics/colorbutton.py b/src/sugar3/graphics/colorbutton.py
index 1fed96d7..84fda5a7 100644
--- a/src/sugar3/graphics/colorbutton.py
+++ b/src/sugar3/graphics/colorbutton.py
@@ -22,9 +22,9 @@ import gobject
 import struct
 import logging
 
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
-from sugar.graphics.palette import Palette, ToolInvoker, WidgetInvoker
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.palette import Palette, ToolInvoker, WidgetInvoker
 
 
 _ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
@@ -40,7 +40,7 @@ class _ColorButton(gtk.Button):
     but does not have any alpha support.
     Instead of a color selector dialog it will pop up a Sugar palette.
 
-    As a preview an sugar.graphics.Icon is used. The fill color will be set to
+    As a preview an sugar3.graphics.Icon is used. The fill color will be set to
     the current color, and the stroke color is set to the font color.
     """
 
@@ -232,7 +232,7 @@ class _ColorButton(gtk.Button):
 
 class _ColorPalette(Palette):
     """This is a color picker palette. It will usually be used indirectly
-    trough a sugar.graphics.ColorButton.
+    trough a sugar3.graphics.ColorButton.
     """
     _RED = 0
     _GREEN = 1
diff --git a/src/sugar3/graphics/icon.py b/src/sugar3/graphics/icon.py
index 62a79f60..6b58c1ea 100644
--- a/src/sugar3/graphics/icon.py
+++ b/src/sugar3/graphics/icon.py
@@ -30,8 +30,8 @@ import gtk
 import hippo
 import cairo
 
-from sugar.graphics.xocolor import XoColor
-from sugar.util import LRU
+from sugar3.graphics.xocolor import XoColor
+from sugar3.util import LRU
 
 
 _BADGE_SIZE = 0.45
@@ -325,7 +325,7 @@ class Icon(gtk.Image):
     def __init__(self, **kwargs):
         self._buffer = _IconBuffer()
         # HACK: need to keep a reference to the path so it doesn't get garbage
-        # collected while it's still used if it's a sugar.util.TempFilePath.
+        # collected while it's still used if it's a sugar3.util.TempFilePath.
         # See #1175
         self._file = None
         self._alpha = 1.0
@@ -558,7 +558,7 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
     __gtype_name__ = 'CanvasIcon'
 
     def __init__(self, **kwargs):
-        from sugar.graphics.palette import CanvasInvoker
+        from sugar3.graphics.palette import CanvasInvoker
 
         self._buffer = _IconBuffer()
         self._palette_invoker = CanvasInvoker()
@@ -980,7 +980,7 @@ class CanvasIcon(hippo.CanvasBox, hippo.CanvasItem):
         type=object, setter=set_palette_invoker, getter=get_palette_invoker)
 
     def set_tooltip(self, text):
-        from sugar.graphics.palette import Palette
+        from sugar3.graphics.palette import Palette
 
         self.set_palette(Palette(text))
 
@@ -994,7 +994,7 @@ class CellRendererIcon(gtk.GenericCellRenderer):
     }
 
     def __init__(self, tree_view):
-        from sugar.graphics.palette import CellRendererInvoker
+        from sugar3.graphics.palette import CellRendererInvoker
 
         self._buffer = _IconBuffer()
         self._buffer.cache = True
diff --git a/src/sugar3/graphics/iconentry.py b/src/sugar3/graphics/iconentry.py
index c652331e..65c0fce7 100644
--- a/src/sugar3/graphics/iconentry.py
+++ b/src/sugar3/graphics/iconentry.py
@@ -17,8 +17,8 @@
 
 import gtk
 
-from sugar.graphics import style
-from sugar.graphics.icon import _SVGLoader
+from sugar3.graphics import style
+from sugar3.graphics.icon import _SVGLoader
 
 ICON_ENTRY_PRIMARY = gtk.ENTRY_ICON_PRIMARY
 ICON_ENTRY_SECONDARY = gtk.ENTRY_ICON_SECONDARY
diff --git a/src/sugar3/graphics/menuitem.py b/src/sugar3/graphics/menuitem.py
index 655f7cc7..8cfff7eb 100644
--- a/src/sugar3/graphics/menuitem.py
+++ b/src/sugar3/graphics/menuitem.py
@@ -25,7 +25,7 @@ import gobject
 import pango
 import gtk
 
-from sugar.graphics.icon import Icon
+from sugar3.graphics.icon import Icon
 
 
 class MenuItem(gtk.ImageMenuItem):
diff --git a/src/sugar3/graphics/objectchooser.py b/src/sugar3/graphics/objectchooser.py
index af9142da..68d2a117 100644
--- a/src/sugar3/graphics/objectchooser.py
+++ b/src/sugar3/graphics/objectchooser.py
@@ -25,7 +25,7 @@ import gobject
 import gtk
 import dbus
 
-from sugar.datastore import datastore
+from sugar3.datastore import datastore
 
 
 J_DBUS_SERVICE = 'org.laptop.Journal'
diff --git a/src/sugar3/graphics/palette.py b/src/sugar3/graphics/palette.py
index 46f167b2..465a8fcb 100644
--- a/src/sugar3/graphics/palette.py
+++ b/src/sugar3/graphics/palette.py
@@ -25,16 +25,16 @@ import gtk
 import gobject
 import pango
 
-from sugar.graphics import palettegroup
-from sugar.graphics import animator
-from sugar.graphics import style
-from sugar.graphics.icon import Icon
-from sugar.graphics.palettewindow import PaletteWindow
+from sugar3.graphics import palettegroup
+from sugar3.graphics import animator
+from sugar3.graphics import style
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.palettewindow import PaletteWindow
 from sugar import _sugarext
 
 # DEPRECATED
 # Import these for backwards compatibility
-from sugar.graphics.palettewindow import MouseSpeedDetector, Invoker, \
+from sugar3.graphics.palettewindow import MouseSpeedDetector, Invoker, \
         WidgetInvoker, CanvasInvoker, ToolInvoker, CellRendererInvoker
 
 
diff --git a/src/sugar3/graphics/palettewindow.py b/src/sugar3/graphics/palettewindow.py
index 5281e54e..36344539 100644
--- a/src/sugar3/graphics/palettewindow.py
+++ b/src/sugar3/graphics/palettewindow.py
@@ -27,9 +27,9 @@ import gtk
 import gobject
 import hippo
 
-from sugar.graphics import palettegroup
-from sugar.graphics import animator
-from sugar.graphics import style
+from sugar3.graphics import palettegroup
+from sugar3.graphics import animator
+from sugar3.graphics import style
 
 
 def _calculate_gap(a, b):
diff --git a/src/sugar3/graphics/radiopalette.py b/src/sugar3/graphics/radiopalette.py
index 81991655..85229dfd 100644
--- a/src/sugar3/graphics/radiopalette.py
+++ b/src/sugar3/graphics/radiopalette.py
@@ -17,8 +17,8 @@
 
 import gtk
 
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.palette import Palette
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.palette import Palette
 
 
 class RadioMenuButton(ToolButton):
diff --git a/src/sugar3/graphics/radiotoolbutton.py b/src/sugar3/graphics/radiotoolbutton.py
index b5fabf26..3b025781 100644
--- a/src/sugar3/graphics/radiotoolbutton.py
+++ b/src/sugar3/graphics/radiotoolbutton.py
@@ -23,9 +23,9 @@ STABLE.
 import gtk
 import gobject
 
-from sugar.graphics.icon import Icon
-from sugar.graphics.palette import Palette, ToolInvoker
-from sugar.graphics import toolbutton
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.palette import Palette, ToolInvoker
+from sugar3.graphics import toolbutton
 
 
 class RadioToolButton(gtk.RadioToolButton):
diff --git a/src/sugar3/graphics/roundbox.py b/src/sugar3/graphics/roundbox.py
index 75141f04..e1e2b805 100644
--- a/src/sugar3/graphics/roundbox.py
+++ b/src/sugar3/graphics/roundbox.py
@@ -23,7 +23,7 @@ import math
 
 import hippo
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 
 class CanvasRoundBox(hippo.CanvasBox, hippo.CanvasItem):
diff --git a/src/sugar3/graphics/toggletoolbutton.py b/src/sugar3/graphics/toggletoolbutton.py
index 012c2b0c..ea33c9d6 100644
--- a/src/sugar3/graphics/toggletoolbutton.py
+++ b/src/sugar3/graphics/toggletoolbutton.py
@@ -22,8 +22,8 @@ STABLE.
 import gobject
 import gtk
 
-from sugar.graphics.icon import Icon
-from sugar.graphics.palette import Palette, ToolInvoker
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.palette import Palette, ToolInvoker
 
 
 class ToggleToolButton(gtk.ToggleToolButton):
diff --git a/src/sugar3/graphics/toolbarbox.py b/src/sugar3/graphics/toolbarbox.py
index 60e030e2..e47dcf47 100644
--- a/src/sugar3/graphics/toolbarbox.py
+++ b/src/sugar3/graphics/toolbarbox.py
@@ -18,10 +18,10 @@
 import gtk
 import gobject
 
-from sugar.graphics import style
-from sugar.graphics.palette import PaletteWindow, ToolInvoker
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics import palettegroup
+from sugar3.graphics import style
+from sugar3.graphics.palette import PaletteWindow, ToolInvoker
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics import palettegroup
 
 
 class ToolbarButton(ToolButton):
diff --git a/src/sugar3/graphics/toolbox.py b/src/sugar3/graphics/toolbox.py
index 9790a49d..865a9f10 100644
--- a/src/sugar3/graphics/toolbox.py
+++ b/src/sugar3/graphics/toolbox.py
@@ -22,7 +22,7 @@ STABLE.
 import gtk
 import gobject
 
-from sugar.graphics import style
+from sugar3.graphics import style
 
 
 class Toolbox(gtk.VBox):
diff --git a/src/sugar3/graphics/toolbutton.py b/src/sugar3/graphics/toolbutton.py
index 25833b66..249de9df 100644
--- a/src/sugar3/graphics/toolbutton.py
+++ b/src/sugar3/graphics/toolbutton.py
@@ -25,8 +25,8 @@ import logging
 import gtk
 import gobject
 
-from sugar.graphics.icon import Icon
-from sugar.graphics.palette import Palette, ToolInvoker
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.palette import Palette, ToolInvoker
 
 
 def _add_accelerator(tool_button):
diff --git a/src/sugar3/graphics/toolcombobox.py b/src/sugar3/graphics/toolcombobox.py
index 1b2fdb0a..8d161f5b 100644
--- a/src/sugar3/graphics/toolcombobox.py
+++ b/src/sugar3/graphics/toolcombobox.py
@@ -22,8 +22,8 @@ STABLE.
 import gtk
 import gobject
 
-from sugar.graphics.combobox import ComboBox
-from sugar.graphics import style
+from sugar3.graphics.combobox import ComboBox
+from sugar3.graphics import style
 
 
 class ToolComboBox(gtk.ToolItem):
diff --git a/src/sugar3/graphics/tray.py b/src/sugar3/graphics/tray.py
index fb98d89a..a6fb08d2 100644
--- a/src/sugar3/graphics/tray.py
+++ b/src/sugar3/graphics/tray.py
@@ -22,10 +22,10 @@ STABLE.
 import gobject
 import gtk
 
-from sugar.graphics import style
-from sugar.graphics.palette import ToolInvoker
-from sugar.graphics.toolbutton import ToolButton
-from sugar.graphics.icon import Icon
+from sugar3.graphics import style
+from sugar3.graphics.palette import ToolInvoker
+from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.icon import Icon
 
 
 _PREVIOUS_PAGE = 0
diff --git a/src/sugar3/graphics/window.py b/src/sugar3/graphics/window.py
index dbac4647..ee9ce248 100644
--- a/src/sugar3/graphics/window.py
+++ b/src/sugar3/graphics/window.py
@@ -24,8 +24,8 @@ import gobject
 import gtk
 import warnings
 
-from sugar.graphics.icon import Icon
-from sugar.graphics import palettegroup
+from sugar3.graphics.icon import Icon
+from sugar3.graphics import palettegroup
 
 
 _UNFULLSCREEN_BUTTON_VISIBILITY_TIMEOUT = 2
diff --git a/src/sugar3/presence/activity.py b/src/sugar3/presence/activity.py
index 750a73c0..bd8220c5 100644
--- a/src/sugar3/presence/activity.py
+++ b/src/sugar3/presence/activity.py
@@ -39,12 +39,12 @@ from telepathy.constants import CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES, \
                                 HANDLE_TYPE_CONTACT, \
                                 PROPERTY_FLAG_WRITE
 
-from sugar.presence.buddy import Buddy
+from sugar3.presence.buddy import Buddy
 
 CONN_INTERFACE_ACTIVITY_PROPERTIES = 'org.laptop.Telepathy.ActivityProperties'
 CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
 
-_logger = logging.getLogger('sugar.presence.activity')
+_logger = logging.getLogger('sugar3.presence.activity')
 
 
 class Activity(gobject.GObject):
diff --git a/src/sugar3/presence/buddy.py b/src/sugar3/presence/buddy.py
index eaba3e33..d69de4b9 100644
--- a/src/sugar3/presence/buddy.py
+++ b/src/sugar3/presence/buddy.py
@@ -31,12 +31,12 @@ from telepathy.interfaces import CONNECTION, \
                                  CONNECTION_INTERFACE_CONTACTS
 from telepathy.constants import HANDLE_TYPE_CONTACT
 
-from sugar.presence.connectionmanager import get_connection_manager
+from sugar3.presence.connectionmanager import get_connection_manager
 
 ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
 CONN_INTERFACE_BUDDY_INFO = 'org.laptop.Telepathy.BuddyInfo'
 
-_logger = logging.getLogger('sugar.presence.buddy')
+_logger = logging.getLogger('sugar3.presence.buddy')
 
 
 class BaseBuddy(gobject.GObject):
diff --git a/src/sugar3/presence/connectionmanager.py b/src/sugar3/presence/connectionmanager.py
index 502b7a8a..d3fd1c41 100644
--- a/src/sugar3/presence/connectionmanager.py
+++ b/src/sugar3/presence/connectionmanager.py
@@ -16,7 +16,7 @@
 # Boston, MA 02111-1307, USA.
 
 """
-UNSTABLE. It should really be internal to the sugar.presence package.
+UNSTABLE. It should really be internal to the sugar3.presence package.
 """
 
 from functools import partial
diff --git a/src/sugar3/presence/presenceservice.py b/src/sugar3/presence/presenceservice.py
index b6c581ee..ab997c58 100644
--- a/src/sugar3/presence/presenceservice.py
+++ b/src/sugar3/presence/presenceservice.py
@@ -28,9 +28,9 @@ import dbus.exceptions
 import dbus.glib
 from dbus import PROPERTIES_IFACE
 
-from sugar.presence.buddy import Buddy, Owner
-from sugar.presence.activity import Activity
-from sugar.presence.connectionmanager import get_connection_manager
+from sugar3.presence.buddy import Buddy, Owner
+from sugar3.presence.activity import Activity
+from sugar3.presence.connectionmanager import get_connection_manager
 
 from telepathy.interfaces import ACCOUNT, \
                                  ACCOUNT_MANAGER, \
@@ -38,7 +38,7 @@ from telepathy.interfaces import ACCOUNT, \
 from telepathy.constants import HANDLE_TYPE_CONTACT
 
 
-_logger = logging.getLogger('sugar.presence.presenceservice')
+_logger = logging.getLogger('sugar3.presence.presenceservice')
 
 ACCOUNT_MANAGER_SERVICE = 'org.freedesktop.Telepathy.AccountManager'
 ACCOUNT_MANAGER_PATH = '/org/freedesktop/Telepathy/AccountManager'
diff --git a/src/sugar3/presence/sugartubeconn.py b/src/sugar3/presence/sugartubeconn.py
index 954ef670..b32fe743 100644
--- a/src/sugar3/presence/sugartubeconn.py
+++ b/src/sugar3/presence/sugartubeconn.py
@@ -22,8 +22,8 @@ STABLE.
 from telepathy.constants import (
     CHANNEL_GROUP_FLAG_CHANNEL_SPECIFIC_HANDLES)
 
-from sugar.presence.tubeconn import TubeConnection
-from sugar.presence import presenceservice
+from sugar3.presence.tubeconn import TubeConnection
+from sugar3.presence import presenceservice
 
 
 class SugarTubeConnection(TubeConnection):
@@ -42,7 +42,7 @@ class SugarTubeConnection(TubeConnection):
         """Retrieve a Buddy object given a telepathy handle.
 
         cs_handle: A channel-specific CONTACT type handle.
-        returns: sugar.presence Buddy object or None
+        returns: sugar3.presence Buddy object or None
         """
         pservice = presenceservice.get_instance()
         if self.self_handle == cs_handle:
diff --git a/src/sugar3/profile.py b/src/sugar3/profile.py
index c1dffd79..f1708048 100644
--- a/src/sugar3/profile.py
+++ b/src/sugar3/profile.py
@@ -27,7 +27,7 @@ from ConfigParser import ConfigParser
 
 from sugar import env
 from sugar import util
-from sugar.graphics.xocolor import XoColor
+from sugar3.graphics.xocolor import XoColor
 
 
 _profile = None
diff --git a/tests/graphics/common.py b/tests/graphics/common.py
index 80852617..103a81d1 100644
--- a/tests/graphics/common.py
+++ b/tests/graphics/common.py
@@ -17,7 +17,7 @@
 
 import gtk
 
-from sugar.graphics.toolbutton import ToolButton
+from sugar3.graphics.toolbutton import ToolButton
 
 
 class Test(gtk.VBox):
diff --git a/tests/graphics/hipposcalability.py b/tests/graphics/hipposcalability.py
index efea57e0..df57101f 100644
--- a/tests/graphics/hipposcalability.py
+++ b/tests/graphics/hipposcalability.py
@@ -2,8 +2,8 @@ import hippo
 import gtk
 import gobject
 
-from sugar.graphics.icon import CanvasIcon
-from sugar.graphics.roundbox import CanvasRoundBox
+from sugar3.graphics.icon import CanvasIcon
+from sugar3.graphics.roundbox import CanvasRoundBox
 
 import common
 
diff --git a/tests/graphics/iconcache.py b/tests/graphics/iconcache.py
index b3a84430..9508f6b7 100644
--- a/tests/graphics/iconcache.py
+++ b/tests/graphics/iconcache.py
@@ -16,13 +16,13 @@
 # Boston, MA 02111-1307, USA.
 
 """
-Test the sugar.graphics.icon.* cache.
+Test the sugar3.graphics.icon.* cache.
 """
 
 import gtk
 
-from sugar.graphics.icon import Icon
-from sugar.graphics.xocolor import XoColor
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.xocolor import XoColor
 
 import common
 
diff --git a/tests/graphics/iconwidget.py b/tests/graphics/iconwidget.py
index a425c17e..d4626ffb 100644
--- a/tests/graphics/iconwidget.py
+++ b/tests/graphics/iconwidget.py
@@ -16,13 +16,13 @@
 # Boston, MA 02111-1307, USA.
 
 """
-Test the sugar.graphics.icon.Icon widget.
+Test the sugar3.graphics.icon.Icon widget.
 """
 
 import gtk
 
-from sugar.graphics.icon import Icon
-from sugar.graphics.xocolor import XoColor
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.xocolor import XoColor
 
 import common
 
diff --git a/tests/graphics/ticket2855.py b/tests/graphics/ticket2855.py
index 4d9d9d4a..96c4a665 100644
--- a/tests/graphics/ticket2855.py
+++ b/tests/graphics/ticket2855.py
@@ -23,8 +23,8 @@ controls. Ticket #2855.
 
 import gtk
 
-from sugar.graphics.palette import Palette
-from sugar.graphics.icon import Icon
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.icon import Icon
 
 import common
 
diff --git a/tests/graphics/ticket2999.py b/tests/graphics/ticket2999.py
index caf7adf9..5ebae31c 100644
--- a/tests/graphics/ticket2999.py
+++ b/tests/graphics/ticket2999.py
@@ -21,8 +21,8 @@ Spec in ticket #2999.
 
 import gtk
 
-from sugar.graphics.palette import Palette
-from sugar.graphics.icon import Icon
+from sugar3.graphics.palette import Palette
+from sugar3.graphics.icon import Icon
 
 import common
 
diff --git a/tests/graphics/ticket3000.py b/tests/graphics/ticket3000.py
index f2fdfd95..afecb4a0 100644
--- a/tests/graphics/ticket3000.py
+++ b/tests/graphics/ticket3000.py
@@ -21,7 +21,7 @@ Spec in ticket #3000.
 
 import gtk
 
-from sugar.graphics.toolbutton import ToolButton
+from sugar3.graphics.toolbutton import ToolButton
 
 import common
 
diff --git a/tests/graphics/toolbarpalettes.py b/tests/graphics/toolbarpalettes.py
index 3a694556..1fd079a4 100644
--- a/tests/graphics/toolbarpalettes.py
+++ b/tests/graphics/toolbarpalettes.py
@@ -21,8 +21,8 @@ Test palette positioning for toolbar and tray.
 
 import gtk
 
-from sugar.graphics.tray import HTray, TrayButton
-from sugar.graphics.toolbutton import ToolButton
+from sugar3.graphics.tray import HTray, TrayButton
+from sugar3.graphics.toolbutton import ToolButton
 
 import common
 
diff --git a/tests/graphics/tray.py b/tests/graphics/tray.py
index 99d48912..9b2d15a1 100644
--- a/tests/graphics/tray.py
+++ b/tests/graphics/tray.py
@@ -16,13 +16,13 @@
 # Boston, MA 02111-1307, USA.
 
 """
-Test the sugar.graphics.icon.Icon widget.
+Test the sugar3.graphics.icon.Icon widget.
 """
 
 import gtk
 
-from sugar.graphics.tray import HTray, VTray
-from sugar.graphics.tray import TrayButton, TrayIcon
+from sugar3.graphics.tray import HTray, VTray
+from sugar3.graphics.tray import TrayButton, TrayIcon
 
 import common