Index: vcpx/target.py
===================================================================
--- vcpx/target.py	(revision 443)
+++ vcpx/target.py	(revision 445)
@@ -21,6 +21,6 @@
 Import of the upstream sources from
 
-  Repository: %(repository)s
-  Module:     %(module)s
+  Repository: %(source_repository)s
+  Module:     %(source_module)s
   Revision:   %(revision)s
 """
@@ -316,6 +316,6 @@
         raise "%s should override this method" % self.__class__
 
-    def initializeNewWorkingDir(self, root, repository, module, subdir,
-                                changeset, initial):
+    def initializeNewWorkingDir(self, root, source_repository,
+                                source_module, subdir, changeset, initial):
         """
         Initialize a new working directory, just extracted from
@@ -323,5 +323,6 @@
         """
 
-        self._initializeWorkingDir(root, repository, module, subdir)
+        self._initializeWorkingDir(root, source_repository, source_module,
+                                   subdir)
         revision = changeset.revision
         if initial:
Index: vcpx/tailor.py
===================================================================
--- vcpx/tailor.py	(revision 442)
+++ vcpx/tailor.py	(revision 446)
@@ -88,5 +88,5 @@
             for root in args:
                 if self.options.bootstrap:
-                    if not (fromconfig or self.options.repository):
+                    if not (fromconfig or self.options.source_repository):
                         raise InvocationError('Need a repository to bootstrap '
                                               '%r' % root, '--bootstrap')
@@ -103,6 +103,6 @@
                         self.options.source_kind = info['source_kind']
                         self.options.target_kind = info['target_kind']
-                        self.options.repository = info['upstream_repos']
-                        self.options.module = info['module']
+                        self.options.source_repository = info['upstream_repos']
+                        self.options.source_module = info['module']
                         self.options.subdir = info.get('subdir',
                                                        split(info['module'])[1])
@@ -111,6 +111,6 @@
                     tailored.bootstrap(self.options.source_kind,
                                        self.options.target_kind,
-                                       self.options.repository,
-                                       self.options.module,
+                                       self.options.source_repository,
+                                       self.options.source_module,
                                        self.options.revision,
                                        self.options.subdir)
@@ -152,6 +152,7 @@
             project.source_kind = info['source_kind']
             project.target_kind = info['target_kind']
-            project.module = info['module']
-            project.subdir = info.get('subdir', split(project.module)[1])
+            project.upstream_module = info['module']
+            project.subdir = info.get('subdir',
+                                      split(project.upstream_module)[1])
             project.upstream_repos = info['upstream_repos']
             project.upstream_revision = info['upstream_revision']
@@ -165,5 +166,5 @@
             'source_kind': project.source_kind,
             'target_kind': project.target_kind,
-            'module': project.module,
+            'module': project.upstream_module,
             'subdir': project.subdir,
             'upstream_repos': project.upstream_repos,
@@ -211,5 +212,5 @@
         print >>f, self.source_kind
         print >>f, self.target_kind
-        print >>f, self.module
+        print >>f, self.upstream_module
         print >>f, self.upstream_repos
         print >>f, self.upstream_revision
@@ -234,5 +235,5 @@
         self.source_kind = f.readline()[:-1]
         self.target_kind = f.readline()[:-1]
-        self.module = f.readline()[:-1]
+        self.upstream_module = f.readline()[:-1]
         self.upstream_repos = f.readline()[:-1]
         self.upstream_revision = f.readline()[:-1]
@@ -241,5 +242,5 @@
             self.subdir = subdir[:-1]
         else:
-            self.subdir = split(self.module)[1]
+            self.subdir = split(self.upstream_module)[1]
         f.close()
 
@@ -256,9 +257,9 @@
         # Fix old configs
 
-        if self.source_kind == 'svn' and not '/' in self.module:
+        if self.source_kind == 'svn' and not '/' in self.upstream_module:
             self.logger.warning('OLD config values for SVN')
             print "The project at '%s' contains old values for" % self.root
             print "the upstream repository (%s)" % self.upstream_repos
-            print "and module (%s)." % self.module
+            print "and module (%s)." % self.upstream_module
             print "Please correct them, specifying the exact URL of the"
             print "root of the SVN repository and then the prefix path up"
@@ -282,5 +283,5 @@
             try:
                 self.repository = raw_input('Repository: ')
-                self.module = raw_input('Module/prefix: ')
+                self.upstream_module = raw_input('Module/prefix: ')
             except KeyboardInterrupt:
                 self.logger.warning("Leaving old config values, stopped by user")
@@ -288,5 +289,5 @@
 
     def bootstrap(self, source_kind, target_kind,
-                  repository, module, revision, subdir):
+                  source_repository, source_module, revision, subdir):
         """
         Bootstrap a new tailorized module.
@@ -301,16 +302,16 @@
 
         if source_kind == 'svn':
-            if not (module and module.startswith('/')):
+            if not (source_module and source_module.startswith('/')):
                 raise InvocationError('With SVN the module argument is '
                                       'mandatory and must start with a "/"')
 
-        if repository.endswith('/'):
-            repository = repository[:-1]
-
-        if module and module.endswith('/'):
-            module = module[:-1]
+        if source_repository.endswith('/'):
+            source_repository = source_repository[:-1]
+
+        if source_module and source_module.endswith('/'):
+            source_module = source_module[:-1]
 
         if not subdir:
-            subdir = split(module or repository)[1] or ''
+            subdir = split(source_module or source_repository)[1] or ''
 
         self.logger.info("Bootstrapping '%s'" % (self.root,))
@@ -318,9 +319,9 @@
         dwd = DualWorkingDir(source_kind, target_kind)
         self.logger.info("getting %s revision '%s' of '%s' from '%s'" % (
-            source_kind, revision, module, repository))
+            source_kind, revision, source_module, source_repository))
 
         try:
-            actual = dwd.checkoutUpstreamRevision(self.root, repository,
-                                                  module, revision,
+            actual = dwd.checkoutUpstreamRevision(self.root, source_repository,
+                                                  source_module, revision,
                                                   subdir=subdir,
                                                   logger=self.logger)
@@ -332,9 +333,10 @@
         # in the directory named as the last component of the module's name
 
-        if not module:
-            module = split(repository)[1]
+        if not source_module:
+            source_module = split(repository)[1]
 
         try:
-            dwd.initializeNewWorkingDir(self.root, repository, module, subdir,
+            dwd.initializeNewWorkingDir(self.root, source_repository,
+                                        source_module, subdir,
                                         actual, revision=='INITIAL')
         except:
@@ -344,6 +346,6 @@
         self.source_kind = source_kind
         self.target_kind = target_kind
-        self.upstream_repos = repository
-        self.module = module
+        self.upstream_repos = source_repository
+        self.upstream_module = source_module
         self.subdir = subdir
         self.upstream_revision = actual.revision
@@ -392,9 +394,9 @@
 
         self.logger.info("Updating '%s' from revision '%s'" % (
-            self.module, self.upstream_revision))
+            self.upstream_module, self.upstream_revision))
 
         if self.verbose:
             print "\nUpdating '%s' from revision '%s'" % (
-                self.module, self.upstream_revision)
+                self.upstream_module, self.upstream_revision)
 
         try:
@@ -402,5 +404,5 @@
             changesets = dwd.getUpstreamChangesets(proj,
                                                    self.upstream_repos,
-                                                   self.module,
+                                                   self.upstream_module,
                                                    self.upstream_revision)
         except KeyboardInterrupt:
@@ -419,5 +421,6 @@
             try:
                 last, conflicts = dwd.applyUpstreamChangesets(
-                    proj, self.module, changesets, applyable=self.applyable,
+                    proj, self.upstream_module, changesets,
+                    applyable=self.applyable,
                     applied=self.applied, logger=self.logger,
                     delayed_commit=single_commit)
@@ -511,9 +514,11 @@
                      "with 'darcs' as default.",
                 default="darcs"),
-    make_option("-R", "--repository", dest="repository", metavar="REPOS",
+    make_option("-R", "--repository", "--source-repository",
+                dest="source_repository", metavar="REPOS",
                 help="Specify the upstream repository, from where bootstrap "
                      "will checkout the module.  REPOS syntax depends on "
                      "the source version control kind."),
-    make_option("-m", "--module", dest="module", metavar="MODULE",
+    make_option("-m", "--module", "--source-module", dest="source_module",
+                metavar="MODULE",
                 help="Specify the module to checkout at bootstrap time. "
                      "This has different meanings under the various upstream "
@@ -639,5 +644,5 @@
                         "Project %r cannot be bootstrapped twice" % proj)
 
-                if not options.repository:
+                if not options.source_repository:
                     raise InvocationError('Need a repository to bootstrap %r' %
                                           proj)
@@ -655,6 +660,6 @@
             if options.bootstrap:
                 tailored.bootstrap(options.source_kind, options.target_kind,
-                                   options.repository,
-                                   options.module,
+                                   options.source_repository,
+                                   options.source_module,
                                    options.revision,
                                    options.subdir)
Index: vcpx/session.py
===================================================================
--- vcpx/session.py	(revision 441)
+++ vcpx/session.py	(revision 446)
@@ -53,7 +53,7 @@
         self.args = args
 
-        self.source_repository = options.repository
+        self.source_repository = options.source_repository
         self.source_kind = options.source_kind
-        self.source_module = options.module
+        self.source_module = options.source_module
         self.target_repository = None
         self.target_kind = options.target_kind