diff --git a/main.py b/main.py
index 774b9038..70ddeffa 100755
--- a/main.py
+++ b/main.py
@@ -36,7 +36,7 @@ from editor import Editor
 from error import ManifestInvalidRevisionError
 from error import NoSuchProjectError
 from error import RepoChangedException
-from manifest import Manifest
+from manifest_xml import XmlManifest
 from pager import RunPager
 
 from subcmds import all as all_commands
@@ -97,7 +97,7 @@ class _Repo(object):
       sys.exit(1)
 
     cmd.repodir = self.repodir
-    cmd.manifest = Manifest(cmd.repodir)
+    cmd.manifest = XmlManifest(cmd.repodir)
     Editor.globalConfig = cmd.manifest.globalConfig
 
     if not isinstance(cmd, MirrorSafeCommand) and cmd.manifest.IsMirror:
diff --git a/manifest.py b/manifest_xml.py
similarity index 99%
rename from manifest.py
rename to manifest_xml.py
index e7a5afba..46976538 100644
--- a/manifest.py
+++ b/manifest_xml.py
@@ -32,7 +32,7 @@ class _Default(object):
   remote = None
 
 
-class Manifest(object):
+class XmlManifest(object):
   """manages the repo configuration file"""
 
   def __init__(self, repodir):
diff --git a/repo b/repo
index 176c5635..13742559 100755
--- a/repo
+++ b/repo
@@ -505,7 +505,7 @@ def _RunSelf(wrapper_path):
   my_git = os.path.join(my_dir, '.git')
 
   if os.path.isfile(my_main) and os.path.isdir(my_git):
-    for name in ['manifest.py',
+    for name in ['git_config.py',
                  'project.py',
                  'subcmds']:
       if not os.path.exists(os.path.join(my_dir, name)):