diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 3b08701eeba6888ae43dc0a81de4c4983522caa0..4d80b18ca8f8b7c944f09f23dc9efb12d3a565d4 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -284,19 +284,20 @@ def DowngradeGroups(config_data):
       DowngradeIPolicy(ipolicy)
 
 
-def DowngradeStorageTypes(cluster):
-  # Remove storage types to downgrade to 2.7
-  if "enabled_storage_types" in cluster:
-    logging.warning("Removing cluster storage types; value = %s",
-                    utils.CommaJoin(cluster["enabled_storage_types"]))
-    del cluster["enabled_storage_types"]
+def DowngradeEnabledTemplates(cluster):
+  # Remove enabled disk templates to downgrade to 2.7
+  edt_key = "enabled_disk_templates"
+  if edt_key in cluster:
+    logging.warning("Removing cluster's enabled disk templates; value = %s",
+                    utils.CommaJoin(cluster[edt_key]))
+    del cluster[edt_key]
 
 
 def DowngradeCluster(config_data):
   cluster = config_data.get("cluster", None)
   if cluster is None:
     raise Error("Cannot find cluster")
-  DowngradeStorageTypes(cluster)
+  DowngradeEnabledTemplates(cluster)
   ipolicy = cluster.get("ipolicy", None)
   if ipolicy:
     DowngradeIPolicy(ipolicy)