diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index f5290c9a..9381a3f5 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -312,7 +312,7 @@ class Activity(Window, gtk.Container):
         self.shared_activity = None
         self._join_id = None
 
-        if handle.handle_invite:
+        if handle.invited:
             wait_loop = gobject.MainLoop()
             self._client_handler = _ClientHandler(
                     self.get_bundle_id(),
diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py
index 296c223e..46dc346e 100644
--- a/src/sugar/activity/activityfactory.py
+++ b/src/sugar/activity/activityfactory.py
@@ -220,7 +220,7 @@ class ActivityCreationHandler(gobject.GObject):
         (log_path, log_file) = open_log_file(self._bundle)
         command = get_command(self._bundle, self._handle.activity_id,
                               self._handle.object_id, self._handle.uri,
-                              self._handle.handle_invite)
+                              self._handle.invited)
 
         dev_null = file('/dev/null', 'w')
         environment_dir = None
diff --git a/src/sugar/activity/activityhandle.py b/src/sugar/activity/activityhandle.py
index 3297c106..4aeac71f 100644
--- a/src/sugar/activity/activityhandle.py
+++ b/src/sugar/activity/activityhandle.py
@@ -24,7 +24,7 @@ class ActivityHandle(object):
     """Data structure storing simple activity metadata"""
 
     def __init__(self, activity_id=None, object_id=None, uri=None,
-                 handle_invite=False):
+                 invited=False):
         """Initialise the handle from activity_id
 
         activity_id -- unique id for the activity to be
@@ -46,18 +46,18 @@ class ActivityHandle(object):
             activity, rather than a journal object
             (downloads stored on the file system for
             example or web pages)
-        handle_invite -- the activity is being launched for handling an invite
-                         from the network
+        invited -- the activity is being launched for handling an invite
+                   from the network
         """
         self.activity_id = activity_id
         self.object_id = object_id
         self.uri = uri
-        self.handle_invite = handle_invite
+        self.invited = invited
 
     def get_dict(self):
         """Retrieve our settings as a dictionary"""
         result = {'activity_id': self.activity_id,
-                  'handle_invite': self.handle_invite}
+                  'invited': self.invited}
         if self.object_id:
             result['object_id'] = self.object_id
         if self.uri:
@@ -71,5 +71,5 @@ def create_from_dict(handle_dict):
     result = ActivityHandle(handle_dict['activity_id'],
         object_id = handle_dict.get('object_id'),
         uri = handle_dict.get('uri'),
-        handle_invite = handle_dict.get('handle_invite'))
+        invited = handle_dict.get('invited'))
     return result
diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py
index b66b0e86..3a3950d3 100644
--- a/src/sugar/activity/main.py
+++ b/src/sugar/activity/main.py
@@ -75,7 +75,7 @@ def main():
     parser.add_option('-s', '--single-process', dest='single_process',
                       action='store_true',
                       help='start all the instances in the same process')
-    parser.add_option('-i', '--handle-invite', dest='handle_invite',
+    parser.add_option('-i', '--invited', dest='invited',
                       action='store_true',
                       help='the activity is being launched for handling an '
                            'invite from the network')
@@ -126,7 +126,7 @@ def main():
     activity_handle = activityhandle.ActivityHandle(
             activity_id=options.activity_id,
             object_id=options.object_id, uri=options.uri,
-            handle_invite=options.handle_invite)
+            invited=options.invited)
 
     if options.single_process is True:
         sessionbus = dbus.SessionBus()