diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index a9fb9775327413432468daa1ac4473cd8f4eb730..532b72148c93f91ce50164f75a44f63c27103caa 100644
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -189,7 +189,6 @@ Suite
 	  non-free;
 	};
 
-	OverrideCodeName "lenny-backports";
 	Priority "7";
 	NotAutomatic "yes";
   };
@@ -204,7 +203,6 @@ Suite
 	  non-free;
 	};
 
-	OverrideCodeName "squeeze-backports";
 	Priority "7";
 	NotAutomatic "yes";
   };
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 3581f76046eeea374c224b4bbd5ce1a4689d4a11..b56b90b9bb7e6ae80c9026ab2051b3eb36a9e943 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -195,7 +195,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideCodeName "lenny";
 	Priority "5";
 	ChangeLogBase "dists/stable/";
   };
@@ -211,7 +210,6 @@ Suite
 	CopyChanges "dists/proposed-updates/";
 	CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
 	CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
-	OverrideCodeName "lenny";
 	OverrideSuite "stable";
 	ValidTime 604800; // 7 days
 	Priority "4";
@@ -243,7 +241,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideCodeName "squeeze";
 	ValidTime 604800; // 7 days
 	Priority "5";
   };
@@ -256,7 +253,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideCodeName "squeeze";
 	OverrideSuite "testing";
 	ValidTime 604800; // 7 days
 	Priority "6";
@@ -289,7 +285,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideCodeName "squeeze";
 	OverrideSuite "testing";
 	ValidTime 604800; // 7 days
 	NotAutomatic "yes";
@@ -317,7 +312,6 @@ Suite
 	  contrib;
 	  non-free;
 	};
-	OverrideCodeName "sid";
 	ValidTime 604800; // 7 days
 	Priority "7";
 	VersionChecks
@@ -342,7 +336,6 @@ Suite
 	  non-free;
 	};
 	NotAutomatic "yes";
-	OverrideCodeName "sid";
 	OverrideSuite "unstable";
 	ValidTime 604800; // 7 days
 	Priority "0";
diff --git a/dak/make_overrides.py b/dak/make_overrides.py
index 8b8fd46f61709ed3d078ffe67ae8799b6ac8dc3e..02c7f7c2988843d8f6ffe31364c5e58ca789ac2e 100755
--- a/dak/make_overrides.py
+++ b/dak/make_overrides.py
@@ -120,7 +120,7 @@ def main ():
             continue
 
         sys.stderr.write("Processing %s...\n" % (suite.suite_name))
-        override_suite = cnf["Suite::%s::OverrideCodeName" % (suite_name)]
+        override_suite = suite.overridecodename
 
         for component_name in cnf.SubTree("Component").List():
             component = get_component(component_name, session)