diff --git a/lib/vclib/__init__.py b/lib/vclib/__init__.py
index 0edc5703..1dfbf135 100644
--- a/lib/vclib/__init__.py
+++ b/lib/vclib/__init__.py
@@ -99,7 +99,7 @@ class Repository:
     options is a dictionary of implementation specific options
     """
 
-  def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
     """Return a diff (in GNU diff format) of two file revisions
 
     type is the requested diff type (UNIFIED, CONTEXT, etc)
diff --git a/lib/vclib/bincvs/__init__.py b/lib/vclib/bincvs/__init__.py
index 19d17bb7..c1327de6 100644
--- a/lib/vclib/bincvs/__init__.py
+++ b/lib/vclib/bincvs/__init__.py
@@ -244,7 +244,7 @@ class BinCVSRepository(CVSRepository):
     source = blame.BlameSource(self.rcsfile(path_parts, 1), rev)
     return source, source.revision
 
-  def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
     """see vclib.Repository.rawdiff docstring
 
     Option values recognized by this implementation:
@@ -255,8 +255,8 @@ class BinCVSRepository(CVSRepository):
     if options.get('ignore_keyword_subst', 0):
       args.append('-kk')
 
-    rcsfile = self.rcsfile(path1, 1)
-    if path1 != path2:
+    rcsfile = self.rcsfile(path_parts1, 1)
+    if path_parts1 != path_parts2:
       raise NotImplementedError, "cannot diff across paths in cvs"
     args.extend(['-r' + rev1, '-r' + rev2, rcsfile])
     
diff --git a/lib/vclib/ccvs/__init__.py b/lib/vclib/ccvs/__init__.py
index 8dff2ce1..de7d2137 100644
--- a/lib/vclib/ccvs/__init__.py
+++ b/lib/vclib/ccvs/__init__.py
@@ -105,7 +105,7 @@ class CCVSRepository(CVSRepository):
 
     return filtered_revs
 
-  def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
     """see vclib.Repository.rawdiff docstring
     """
     raise NotImplementedError, \
diff --git a/lib/vclib/svn/__init__.py b/lib/vclib/svn/__init__.py
index eae8801f..9857fdd0 100644
--- a/lib/vclib/svn/__init__.py
+++ b/lib/vclib/svn/__init__.py
@@ -550,14 +550,14 @@ class SubversionRepository(vclib.Repository):
     source = BlameSourceKludge(self.svn_client_path, self.rootpath, path, rev)
     return source, revision
     
-  def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
     """see vclib.Repository.rawdiff docstring
     
     option values returned by this implementation
       diffobj - reference to underlying FileDiff object
     """
-    p1 = self._getpath(path1)
-    p2 = self._getpath(path2)
+    p1 = self._getpath(path_parts1)
+    p2 = self._getpath(path_parts2)
     args = vclib._diff_args(type, options)
 
     # Need to keep a reference to the FileDiff object around long
diff --git a/lib/vclib/svn_ra/__init__.py b/lib/vclib/svn_ra/__init__.py
index eb5dd6cd..391555be 100644
--- a/lib/vclib/svn_ra/__init__.py
+++ b/lib/vclib/svn_ra/__init__.py
@@ -514,14 +514,14 @@ class SubversionRepository(vclib.Repository):
 
     return blame_data, rev
     
-  def rawdiff(self, path1, rev1, path2, rev2, type, options={}):
+  def rawdiff(self, path_parts1, rev1, path_parts2, rev2, type, options={}):
     """see vclib.Repository.rawdiff docstring
     
     option values returned by this implementation
       diffobj - reference to underlying FileDiff object
     """
-    p1 = self._getpath(path1)
-    p2 = self._getpath(path2)
+    p1 = self._getpath(path_parts1)
+    p2 = self._getpath(path_parts2)
     args = vclib._diff_args(type, options)
 
     # Need to keep a reference to the FileDiff object around long