Index: /trunk/packages/invirt-dev/invirt-build-conf
===================================================================
--- /trunk/packages/invirt-dev/invirt-build-conf	(revision 2592)
+++ /trunk/packages/invirt-dev/invirt-build-conf	(revision 2593)
@@ -38,6 +38,6 @@
     build_handler = '/usr/sbin/invirt-submit-build'
 
-    for pocket in config.git.pockets:
-        acl = authz.expandAdmin(getattr(config.git.pockets, pocket).acl, None)
+    for pocket in config.build.pockets:
+        acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl, None)
 
         acl_fd, acl_name = tempfile.mkstemp()
Index: /trunk/packages/invirt-dev/invirtibuilder
===================================================================
--- /trunk/packages/invirt-dev/invirtibuilder	(revision 2592)
+++ /trunk/packages/invirt-dev/invirtibuilder	(revision 2593)
@@ -21,5 +21,5 @@
 
 where pocket is one of the pockets globally configured in
-git.pockets. For instance, the pockets in XVM are "prod" and "dev".
+build.pockets. For instance, the pockets in XVM are "prod" and "dev".
 
 principal is the Kerberos principal that requested the build.
@@ -138,11 +138,11 @@
     legitimacy of my reasoning.
     """
-    if config.git.pockets[pocket].get('allow_backtracking', False):
+    if config.build.pockets[pocket].get('allow_backtracking', False):
         env = dict(os.environ)
         branch = b.pocketToGit(pocket)
         version = b.getVersion(package, ref)
 
-        env['GIT_COMMITTER_NAME'] = config.git.tagger.name
-        env['GIT_COMMITTER_EMAIL'] = config.git.tagger.email
+        env['GIT_COMMITTER_NAME'] = config.build.tagger.name
+        env['GIT_COMMITTER_EMAIL'] = config.build.tagger.email
         tag_msg = ('Tag %s of %s\n\n'
                    'Requested by %s' % (version.full_version,
Index: /trunk/packages/invirt-dev/python/invirt/builder.py
===================================================================
--- /trunk/packages/invirt-dev/python/invirt/builder.py	(revision 2592)
+++ /trunk/packages/invirt-dev/python/invirt/builder.py	(revision 2593)
@@ -32,10 +32,10 @@
 def pocketToGit(pocket):
     """Map a pocket in the configuration to a git branch."""
-    return getattr(getattr(config.git.pockets, pocket), 'git', pocket)
+    return getattr(getattr(config.build.pockets, pocket), 'git', pocket)
 
 
 def pocketToApt(pocket):
     """Map a pocket in the configuration to an apt repo pocket."""
-    return getattr(getattr(config.git.pockets, pocket), 'apt', pocket)
+    return getattr(getattr(config.build.pockets, pocket), 'apt', pocket)
 
 
@@ -89,5 +89,5 @@
     new_version = getVersion(package, commit)
 
-    for p in config.git.pockets:
+    for p in config.build.pockets:
         if p == pocket:
             continue
@@ -106,5 +106,5 @@
                                    (new_version, package, p, current_commit))
 
-    if config.git.pockets[pocket].get('allow_backtracking', False):
+    if config.build.pockets[pocket].get('allow_backtracking', False):
         branch = pocketToGit(pocket)
         current_version = getVersion(package, branch)
Index: /trunk/packages/invirt-dev/repository-config/distributions.mako
===================================================================
--- /trunk/packages/invirt-dev/repository-config/distributions.mako	(revision 2592)
+++ /trunk/packages/invirt-dev/repository-config/distributions.mako	(revision 2593)
@@ -3,5 +3,5 @@
 from invirt import builder as b
 %>\
-% for pocket in cfg.git.pockets:
+% for pocket in cfg.build.pockets:
 CodeName: ${b.pocketToApt(pocket)}
 Components: main invirt-system
Index: /trunk/packages/xvm-prodconfig/master.yaml
===================================================================
--- /trunk/packages/xvm-prodconfig/master.yaml	(revision 2592)
+++ /trunk/packages/xvm-prodconfig/master.yaml	(revision 2593)
@@ -22,4 +22,17 @@
   - cell: dev.mit.edu
     auth: no
+
+build:
+ pockets:
+  prod:
+   acl: *adminacl
+   apt: stable
+  dev:
+   acl: system:xvm-dev
+   apt: unstable
+   allow_backtracking: yes
+ tagger:
+  name: Invirt Build Server
+  email: invirt@mit.edu
 
 console:
@@ -54,17 +67,4 @@
  zone_files:
   - /etc/invirt/zone
-
-git:
- pockets:
-  prod:
-   acl: *adminacl
-   apt: stable
-  dev:
-   acl: system:xvm-dev
-   apt: unstable
-   allow_backtracking: yes
- tagger:
-  name: Invirt Build Server
-  email: invirt@mit.edu
 
 hosts: # hosts on which VMs run