From b52670ca9d19a10fb5e9ac2e2d0ccf84ed0e0f76 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Fri, 31 May 2024 19:13:07 +0000
Subject: [PATCH 1/9] Update framework hash to version that removes "suite_"
 prefix requirement

---
 .gitmodules    | 4 ++--
 ccpp/framework | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 22c723ac1..7163a75ce 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
   branch = dev/emc
 [submodule "ccpp/framework"]
   path = ccpp/framework
-  url = https://github.com/NCAR/ccpp-framework
-  branch = main
+  url = https://github.com/mkavulich/ccpp-framework
+  branch = feature/suite_names_update
 [submodule "ccpp/physics"]
   path = ccpp/physics
   url = https://github.com/ufs-community/ccpp-physics
diff --git a/ccpp/framework b/ccpp/framework
index ccfefcd0b..9ad2c2063 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit ccfefcd0b426e011f94137031d5f7c2a4dda2659
+Subproject commit 9ad2c2063bf57817b559861a8273e89495982ca9

From 02b4d0405c15de67a1b929a34e6649612eebae80 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 3 Jun 2024 18:08:31 +0000
Subject: [PATCH 2/9] First round of suite name changes: those that have
 corresponding SCM suites

---
 ccpp/suites/{suite_FV3_RAP.xml => albatross.xml}       |  6 +++++-
 ccpp/suites/alias.json                                 | 10 ++++++++++
 ccpp/suites/{suite_FV3_HRRR.xml => bald_eagle.xml}     |  6 +++++-
 ccpp/suites/{suite_FV3_GFS_v17_p8.xml => bluebird.xml} |  6 +++++-
 .../{suite_FV3_RRFS_v1nssl.xml => crossbill.xml}       |  6 +++++-
 .../suites/{suite_FV3_GFS_v15p2.xml => kingfisher.xml} |  6 +++++-
 .../{suite_FV3_GFS_v17_p8_c3.xml => parakeet.xml}      |  6 +++++-
 ccpp/suites/{suite_FV3_RRFS_v1beta.xml => pigeon.xml}  |  6 +++++-
 ccpp/suites/{suite_FV3_GFS_v16.xml => raven.xml}       |  6 +++++-
 9 files changed, 50 insertions(+), 8 deletions(-)
 rename ccpp/suites/{suite_FV3_RAP.xml => albatross.xml} (96%)
 create mode 100644 ccpp/suites/alias.json
 rename ccpp/suites/{suite_FV3_HRRR.xml => bald_eagle.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v17_p8.xml => bluebird.xml} (96%)
 rename ccpp/suites/{suite_FV3_RRFS_v1nssl.xml => crossbill.xml} (95%)
 rename ccpp/suites/{suite_FV3_GFS_v15p2.xml => kingfisher.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v17_p8_c3.xml => parakeet.xml} (96%)
 rename ccpp/suites/{suite_FV3_RRFS_v1beta.xml => pigeon.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v16.xml => raven.xml} (96%)

diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/albatross.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RAP.xml
rename to ccpp/suites/albatross.xml
index b5a2117f6..4df14a335 100644
--- a/ccpp/suites/suite_FV3_RAP.xml
+++ b/ccpp/suites/albatross.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "albatross" (formerly known as FV3_RAP)
+-->
 
-<suite name="FV3_RAP" version="1">
+<suite name="albatross" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json
new file mode 100644
index 000000000..6c0dabb14
--- /dev/null
+++ b/ccpp/suites/alias.json
@@ -0,0 +1,10 @@
+{
+    "FV3_HRRR.xml": "bald_eagle.xml",
+    "FV3_GFS_v16.xml": "raven.xml",
+    "FV3_GFS_v15p2.xml": "kingfisher.xml",
+    "FV3_GFS_v17_p8.xml": "bluebird.xml",
+    "FV3_GFS_v17_p8_c3.xml": "parakeet.xml",
+    "FV3_RAP.xml": "albatross.xml",
+    "FV3_RRFS_v1beta.xml": "pigeon.xml",
+    "FV3_RRFS_v1nssl.xml": "crossbill.xml"
+}
diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/bald_eagle.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HRRR.xml
rename to ccpp/suites/bald_eagle.xml
index 2177dc078..2a94349dc 100644
--- a/ccpp/suites/suite_FV3_HRRR.xml
+++ b/ccpp/suites/bald_eagle.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "bald_eagle" (formerly known as FV3_HRRR)
+-->
 
-<suite name="FV3_HRRR" version="1">
+<suite name="bald_eagle" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8.xml b/ccpp/suites/bluebird.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v17_p8.xml
rename to ccpp/suites/bluebird.xml
index e90d0c42b..586344bac 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8.xml
+++ b/ccpp/suites/bluebird.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "bluebird" (formerly known as FV3_GFS_v17_p8)
+-->
 
-<suite name="FV3_GFS_v17_p8" version="1">
+<suite name="bluebird" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml b/ccpp/suites/crossbill.xml
similarity index 95%
rename from ccpp/suites/suite_FV3_RRFS_v1nssl.xml
rename to ccpp/suites/crossbill.xml
index e24d2c6f2..4e1a87e4b 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+++ b/ccpp/suites/crossbill.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "crossbill" (formerly known as FV3_RRFS_v1nssl)
+-->
 
-<suite name="FV3_RRFS_v1nssl"  version="1">
+<suite name="crossbill"  version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/kingfisher.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v15p2.xml
rename to ccpp/suites/kingfisher.xml
index c164a1c7e..741f0021b 100644
--- a/ccpp/suites/suite_FV3_GFS_v15p2.xml
+++ b/ccpp/suites/kingfisher.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "kingfisher" (formerly known as FV3_GFS_v15p2)
+-->
 
-<suite name="FV3_GFS_v15p2" version="1">
+<suite name="kingfisher" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml b/ccpp/suites/parakeet.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
rename to ccpp/suites/parakeet.xml
index e9257a7f3..c480b3c95 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+++ b/ccpp/suites/parakeet.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "parakeet" (formerly known as FV3_GFS_v17_p8_c3)
+-->
 
-<suite name="FV3_GFS_v17_p8_c3" version="1">
+<suite name="parakeet" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/pigeon.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RRFS_v1beta.xml
rename to ccpp/suites/pigeon.xml
index 90165d880..bf2113d52 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml
+++ b/ccpp/suites/pigeon.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "pigeon" (formerly known as FV3_RRFS_v1beta)
+-->
 
-<suite name="FV3_RRFS_v1beta" version="1">
+<suite name="pigeon" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/raven.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v16.xml
rename to ccpp/suites/raven.xml
index bc5540ce1..f713f6d3c 100644
--- a/ccpp/suites/suite_FV3_GFS_v16.xml
+++ b/ccpp/suites/raven.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "raven" (formerly known as FV3_GFS_v16)
+-->
 
-<suite name="FV3_GFS_v16" version="1">
+<suite name="raven" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">

From 0e984c0b7ceff744a67e75662551526895c39729 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 3 Jun 2024 18:58:19 +0000
Subject: [PATCH 3/9] New rebased framework hash

---
 ccpp/framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccpp/framework b/ccpp/framework
index 9ad2c2063..8821d6414 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit 9ad2c2063bf57817b559861a8273e89495982ca9
+Subproject commit 8821d641482c9ddb9730eab11c664a9ede49044a

From 08529e2d4221059c560137e9a1a1fc4f9e090f3e Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 3 Jun 2024 19:23:29 +0000
Subject: [PATCH 4/9] Forgot one SCM suite: suite_FV3_WoFS_v0.xml ->
 hummingbird.xml

---
 ccpp/suites/alias.json                                 | 3 ++-
 ccpp/suites/{suite_FV3_WoFS_v0.xml => hummingbird.xml} | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
 rename ccpp/suites/{suite_FV3_WoFS_v0.xml => hummingbird.xml} (95%)

diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json
index 6c0dabb14..46915b999 100644
--- a/ccpp/suites/alias.json
+++ b/ccpp/suites/alias.json
@@ -6,5 +6,6 @@
     "FV3_GFS_v17_p8_c3.xml": "parakeet.xml",
     "FV3_RAP.xml": "albatross.xml",
     "FV3_RRFS_v1beta.xml": "pigeon.xml",
-    "FV3_RRFS_v1nssl.xml": "crossbill.xml"
+    "FV3_RRFS_v1nssl.xml": "crossbill.xml",
+    "FV3_WoFS_v0.xml": "hummingbird.xml"
 }
diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/hummingbird.xml
similarity index 95%
rename from ccpp/suites/suite_FV3_WoFS_v0.xml
rename to ccpp/suites/hummingbird.xml
index 140ba9023..d8e85118a 100644
--- a/ccpp/suites/suite_FV3_WoFS_v0.xml
+++ b/ccpp/suites/hummingbird.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "hummingbird" (formerly known as FV3_WoFS_v0)
+-->
 
-<suite name="FV3_WoFS_v0"  version="1">
+<suite name="hummingbird"  version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

From 625ddae7f11660e89abef933580fef8f485465d3 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Tue, 4 Jun 2024 03:44:28 +0000
Subject: [PATCH 5/9] Rename the rest of the suites

---
 ccpp/suites/alias.json                        | 34 ++++++++++++++++++-
 ...3_HAFS_v1_gfdlmp_tedmf.xml => antbird.xml} |  6 +++-
 .../{suite_FV3_HRRR_gf.xml => auklet.xml}     |  6 +++-
 ...e_FV3_GFS_v17_p8_rrtmgp.xml => canary.xml} |  6 +++-
 .../{suite_RRFSens_phy3.xml => chickadee.xml} |  6 +++-
 ...S_v17_coupled_p8_ugwpv1.xml => condor.xml} |  7 ++--
 ..._v15_thompson_mynn_lam3km.xml => crow.xml} |  6 +++-
 ...v17_coupled_p8_sfcocn.xml => dotterel.xml} |  6 +++-
 .../{suite_FV3_RAP_noah.xml => dove.xml}      |  6 +++-
 ...suite_FV3_GFS_v16_csawmg.xml => egret.xml} |  6 +++-
 ...uite_FV3_global_nest_v1.xml => falcon.xml} |  6 +++-
 ...e_FV3_HRRR_gf_nogwd.xml => flycatcher.xml} |  6 +++-
 ...V3_GFS_v17_p8_ugwpv1.xml => goldfinch.xml} |  7 +++-
 ...{suite_FV3_GFS_v16_flake.xml => heron.xml} |  6 +++-
 ...FS_v1_thompson_nonsst.xml => hornbill.xml} |  6 +++-
 ...uite_FV3_RAP_unified_ugwp.xml => ibis.xml} |  6 +++-
 .../{suite_RRFSens_phy4.xml => kestrel.xml}   |  6 +++-
 ...{suite_FV3_GFS_v16_fv3wam.xml => loon.xml} |  6 +++-
 ..._FV3_HAFS_v1_thompson.xml => lorikeet.xml} |  6 +++-
 ..._sfcdiff_cires_ugwp.xml => meadowlark.xml} |  6 +++-
 ...FV3_GFS_v17_coupled_p8.xml => pelican.xml} |  6 +++-
 .../{suite_RRFSens_phy5.xml => penguin.xml}   |  6 +++-
 .../{suite_RRFSens_phy2.xml => ptarmigan.xml} |  6 +++-
 .../{suite_RRFSens_phy1.xml => puffin.xml}    |  6 +++-
 ...{suite_FV3_RAP_flake.xml => sandpiper.xml} |  6 +++-
 .../{suite_FV3_RAP_sfcdiff.xml => shrike.xml} |  6 +++-
 ...ite_FV3_RAP_clm_lake.xml => snowy_owl.xml} |  6 +++-
 ...suite_FV3_GFS_v16_ras.xml => starling.xml} |  6 +++-
 ...v1_gfdlmp_tedmf_nonsst.xml => tanager.xml} |  6 +++-
 ...suite_FV3_GFS_v17_p8_mynn.xml => tern.xml} |  6 +++-
 ...1_thompson_tedmf_gfdlsf.xml => toucan.xml} |  6 +++-
 ...e_FV3_RAP_cires_ugwp.xml => turnstone.xml} |  6 +++-
 .../{suite_FV3_HRRR_c3.xml => wren.xml}       | 10 +++++-
 .../suite_FV3_GFS_v17_coupled_p8_c3.xml       |  0
 34 files changed, 198 insertions(+), 34 deletions(-)
 rename ccpp/suites/{suite_FV3_HAFS_v1_gfdlmp_tedmf.xml => antbird.xml} (96%)
 rename ccpp/suites/{suite_FV3_HRRR_gf.xml => auklet.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v17_p8_rrtmgp.xml => canary.xml} (96%)
 rename ccpp/suites/{suite_RRFSens_phy3.xml => chickadee.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml => condor.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v15_thompson_mynn_lam3km.xml => crow.xml} (95%)
 rename ccpp/suites/{suite_FV3_GFS_v17_coupled_p8_sfcocn.xml => dotterel.xml} (96%)
 rename ccpp/suites/{suite_FV3_RAP_noah.xml => dove.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v16_csawmg.xml => egret.xml} (96%)
 rename ccpp/suites/{suite_FV3_global_nest_v1.xml => falcon.xml} (96%)
 rename ccpp/suites/{suite_FV3_HRRR_gf_nogwd.xml => flycatcher.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v17_p8_ugwpv1.xml => goldfinch.xml} (95%)
 rename ccpp/suites/{suite_FV3_GFS_v16_flake.xml => heron.xml} (96%)
 rename ccpp/suites/{suite_FV3_HAFS_v1_thompson_nonsst.xml => hornbill.xml} (96%)
 rename ccpp/suites/{suite_FV3_RAP_unified_ugwp.xml => ibis.xml} (96%)
 rename ccpp/suites/{suite_RRFSens_phy4.xml => kestrel.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v16_fv3wam.xml => loon.xml} (96%)
 rename ccpp/suites/{suite_FV3_HAFS_v1_thompson.xml => lorikeet.xml} (96%)
 rename ccpp/suites/{suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml => meadowlark.xml} (95%)
 rename ccpp/suites/{suite_FV3_GFS_v17_coupled_p8.xml => pelican.xml} (96%)
 rename ccpp/suites/{suite_RRFSens_phy5.xml => penguin.xml} (96%)
 rename ccpp/suites/{suite_RRFSens_phy2.xml => ptarmigan.xml} (96%)
 rename ccpp/suites/{suite_RRFSens_phy1.xml => puffin.xml} (96%)
 rename ccpp/suites/{suite_FV3_RAP_flake.xml => sandpiper.xml} (96%)
 rename ccpp/suites/{suite_FV3_RAP_sfcdiff.xml => shrike.xml} (96%)
 rename ccpp/suites/{suite_FV3_RAP_clm_lake.xml => snowy_owl.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v16_ras.xml => starling.xml} (96%)
 rename ccpp/suites/{suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml => tanager.xml} (96%)
 rename ccpp/suites/{suite_FV3_GFS_v17_p8_mynn.xml => tern.xml} (96%)
 rename ccpp/suites/{suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml => toucan.xml} (96%)
 rename ccpp/suites/{suite_FV3_RAP_cires_ugwp.xml => turnstone.xml} (96%)
 rename ccpp/suites/{suite_FV3_HRRR_c3.xml => wren.xml} (94%)
 rename ccpp/{suites => suites_not_used}/suite_FV3_GFS_v17_coupled_p8_c3.xml (100%)

diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json
index 46915b999..dfa2b9304 100644
--- a/ccpp/suites/alias.json
+++ b/ccpp/suites/alias.json
@@ -7,5 +7,37 @@
     "FV3_RAP.xml": "albatross.xml",
     "FV3_RRFS_v1beta.xml": "pigeon.xml",
     "FV3_RRFS_v1nssl.xml": "crossbill.xml",
-    "FV3_WoFS_v0.xml": "hummingbird.xml"
+    "FV3_WoFS_v0.xml": "hummingbird.xml",
+    "RRFSens_phy1.xml": "puffin.xml",
+    "RRFSens_phy2.xml": "ptarmigan.xml",
+    "RRFSens_phy3.xml": "chickadee.xml",
+    "RRFSens_phy4.xml": "kestrel.xml",
+    "RRFSens_phy5.xml": "penguin.xml",
+    "FV3_GFS_v15_thompson_mynn_lam3km.xml": "crow.xml",
+    "FV3_GFS_v16_csawmg.xml": "egret.xml",
+    "FV3_GFS_v16_flake.xml": "heron.xml",
+    "FV3_GFS_v16_fv3wam.xml": "loon.xml",
+    "FV3_GFS_v16_ras.xml": "starling.xml",
+    "FV3_GFS_v17_coupled_p8_sfcocn.xml": "dotterel.xml",
+    "FV3_GFS_v17_coupled_p8_ugwpv1.xml": "goldfinch.xml",
+    "FV3_GFS_v17_coupled_p8.xml": "pelican.xml",
+    "FV3_GFS_v17_p8_mynn.xml": "tern.xml",
+    "FV3_GFS_v17_p8_rrtmgp.xml": "canary.xml",
+    "FV3_GFS_v17_p8_ugwpv1.xml": "condor.xml",
+    "FV3_global_nest_v1.xml": "falcon.xml",
+    "FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml": "tanager.xml",
+    "FV3_HAFS_v1_gfdlmp_tedmf.xml": "antbird.xml",
+    "FV3_HAFS_v1_thompson_nonsst.xml": "hornbill.xml",
+    "FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml": "toucan.xml",
+    "FV3_HAFS_v1_thompson.xml": "lorikeet.xml",
+    "FV3_HRRR_c3.xml": "wren.xml",
+    "FV3_HRRR_gf_nogwd.xml": "flycatcher.xml",
+    "FV3_HRRR_gf.xml": "auklet.xml",
+    "FV3_RAP_cires_ugwp.xml": "turnstone.xml",
+    "FV3_RAP_clm_lake.xml": "snowy_owl.xml",
+    "FV3_RAP_flake.xml": "sandpiper.xml",
+    "FV3_RAP_noah_sfcdiff_cires_ugwp.xml": "meadowlark.xml",
+    "FV3_RAP_noah.xml": "dove.xml",
+    "FV3_RAP_sfcdiff.xml": "shrike.xml",
+    "FV3_RAP_unified_ugwp.xml": "ibis.xml"
 }
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml b/ccpp/suites/antbird.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
rename to ccpp/suites/antbird.xml
index 0a08ee576..7f9006b8c 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+++ b/ccpp/suites/antbird.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "antbird" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf)
+-->
 
-<suite name="FV3_HAFS_v1_gfdlmp_tedmf" version="1">
+<suite name="antbird" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HRRR_gf.xml b/ccpp/suites/auklet.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HRRR_gf.xml
rename to ccpp/suites/auklet.xml
index 48260ce9f..63c065c20 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf.xml
+++ b/ccpp/suites/auklet.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "auklet" (formerly known as FV3_HRRR_gf)
+-->
 
-<suite name="FV3_HRRR_gf" version="1">
+<suite name="auklet" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml b/ccpp/suites/canary.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
rename to ccpp/suites/canary.xml
index 57aa71179..ea42723c5 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+++ b/ccpp/suites/canary.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "canary" (formerly known as FV3_GFS_v17_p8_rrtmgp)
+-->
 
-<suite name="FV3_GFS_v17_p8_rrtmgp" version="1">
+<suite name="canary" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/chickadee.xml
similarity index 96%
rename from ccpp/suites/suite_RRFSens_phy3.xml
rename to ccpp/suites/chickadee.xml
index da442619d..ba0af7066 100644
--- a/ccpp/suites/suite_RRFSens_phy3.xml
+++ b/ccpp/suites/chickadee.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "chickadee" (formerly known as RRFSens_phy3)
+-->
 
-<suite name="RRFSens_phy3" version="1">
+<suite name="chickadee" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml b/ccpp/suites/condor.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
rename to ccpp/suites/condor.xml
index b63190e65..cf2f3fc66 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+++ b/ccpp/suites/condor.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "condor" (formerly known as FV3_GFS_v17_p8_ugwpv1)
+-->
 
-<suite name="FV3_GFS_v17_coupled_p8_ugwpv1" version="1">
+<suite name="condor" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -43,7 +47,6 @@
       <scheme>sfc_nst</scheme>
       <scheme>sfc_nst_post</scheme>
       <scheme>noahmpdrv</scheme>
-      <scheme>sfc_cice</scheme>
       <scheme>sfc_sice</scheme>
       <scheme>GFS_surface_loop_control_part2</scheme>
     </subcycle>
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/crow.xml
similarity index 95%
rename from ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
rename to ccpp/suites/crow.xml
index 922f7f305..eb44d00f5 100644
--- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+++ b/ccpp/suites/crow.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "crow" (formerly known as FV3_GFS_v15_thompson_mynn_lam3km)
+-->
 
-<suite name="FV3_GFS_v15_thompson_mynn_lam3km" version="1">
+<suite name="crow" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml b/ccpp/suites/dotterel.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
rename to ccpp/suites/dotterel.xml
index 8b495a18f..05d8d6db1 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+++ b/ccpp/suites/dotterel.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "dotterel" (formerly known as FV3_GFS_v17_coupled_p8_sfcocn)
+-->
 
-<suite name="FV3_GFS_v17_coupled_p8_sfcocn" version="1">
+<suite name="dotterel" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/dove.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RAP_noah.xml
rename to ccpp/suites/dove.xml
index 80a515356..041aa91ba 100644
--- a/ccpp/suites/suite_FV3_RAP_noah.xml
+++ b/ccpp/suites/dove.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "dove" (formerly known as FV3_RAP_noah)
+-->
 
-<suite name="FV3_RAP_noah" version="1">
+<suite name="dove" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml b/ccpp/suites/egret.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
rename to ccpp/suites/egret.xml
index 3f972d784..ccf4678c4 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+++ b/ccpp/suites/egret.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "egret" (formerly known as FV3_GFS_v16_csawmg)
+-->
 
-<suite name="FV3_GFS_v16_csawmg" version="1">
+<suite name="egret" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/falcon.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_global_nest_v1.xml
rename to ccpp/suites/falcon.xml
index 6f55e56f7..5ade6ebad 100644
--- a/ccpp/suites/suite_FV3_global_nest_v1.xml
+++ b/ccpp/suites/falcon.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "falcon" (formerly known as FV3_global_nest_v1)
+-->
 
-<suite name="FV3_global_nest_v1" version="1">
+<suite name="falcon" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/flycatcher.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
rename to ccpp/suites/flycatcher.xml
index 0f0022d1c..dc70ef855 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+++ b/ccpp/suites/flycatcher.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "flycatcher" (formerly known as FV3_HRRR_gf_nogwd)
+-->
 
-<suite name="FV3_HRRR_gf_nogwd" version="1">
+<suite name="flycatcher" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/goldfinch.xml
similarity index 95%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
rename to ccpp/suites/goldfinch.xml
index 2a5034035..906822e5d 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+++ b/ccpp/suites/goldfinch.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "goldfinch" (formerly known as FV3_GFS_v17_coupled_p8_ugwpv1)
+-->
 
-<suite name="FV3_GFS_v17_p8_ugwpv1" version="1">
+<suite name="goldfinch" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -43,6 +47,7 @@
       <scheme>sfc_nst</scheme>
       <scheme>sfc_nst_post</scheme>
       <scheme>noahmpdrv</scheme>
+      <scheme>sfc_cice</scheme>
       <scheme>sfc_sice</scheme>
       <scheme>GFS_surface_loop_control_part2</scheme>
     </subcycle>
diff --git a/ccpp/suites/suite_FV3_GFS_v16_flake.xml b/ccpp/suites/heron.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v16_flake.xml
rename to ccpp/suites/heron.xml
index 4f09779a2..f18ee3de0 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_flake.xml
+++ b/ccpp/suites/heron.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "heron" (formerly known as FV3_GFS_v16_flake)
+-->
 
-<suite name="FV3_GFS_v16_flake" version="1">
+<suite name="heron" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml b/ccpp/suites/hornbill.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
rename to ccpp/suites/hornbill.xml
index fe83ee91d..64923d3d5 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+++ b/ccpp/suites/hornbill.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "hornbill" (formerly known as FV3_HAFS_v1_thompson_nonsst)
+-->
 
-<suite name="FV3_HAFS_v1_thompson_nonsst" version="1">
+<suite name="hornbill" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/ibis.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
rename to ccpp/suites/ibis.xml
index 509ffea89..82cb7b0c3 100644
--- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+++ b/ccpp/suites/ibis.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "ibis" (formerly known as FV3_RAP_unified_ugwp)
+-->
 
-<suite name="FV3_RAP_unified_ugwp" version="1">
+<suite name="ibis" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/kestrel.xml
similarity index 96%
rename from ccpp/suites/suite_RRFSens_phy4.xml
rename to ccpp/suites/kestrel.xml
index 74a1e8972..e0333833f 100644
--- a/ccpp/suites/suite_RRFSens_phy4.xml
+++ b/ccpp/suites/kestrel.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "kestrel" (formerly known as RRFSens_phy4)
+-->
 
-<suite name="RRFSens_phy4" version="1">
+<suite name="kestrel" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml b/ccpp/suites/loon.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
rename to ccpp/suites/loon.xml
index 4de8927b1..1c7e10c4d 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+++ b/ccpp/suites/loon.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "loon" (formerly known as FV3_GFS_v16_fv3wam)
+-->
 
-<suite name="FV3_GFS_v16_fv3wam" version="1">
+<suite name="loon" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml b/ccpp/suites/lorikeet.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
rename to ccpp/suites/lorikeet.xml
index 0e9dc6e5f..cc544fb13 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+++ b/ccpp/suites/lorikeet.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "lorikeet" (formerly known as FV3_HAFS_v1_thompson)
+-->
 
-<suite name="FV3_HAFS_v1_thompson" version="1">
+<suite name="lorikeet" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml b/ccpp/suites/meadowlark.xml
similarity index 95%
rename from ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
rename to ccpp/suites/meadowlark.xml
index 2d6d0377b..33876e027 100644
--- a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+++ b/ccpp/suites/meadowlark.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "meadowlark" (formerly known as FV3_RAP_noah_sfcdiff_cires_ugwp)
+-->
 
-<suite name="FV3_RAP_noah_sfcdiff_cires_ugwp" version="1">
+<suite name="meadowlark" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml b/ccpp/suites/pelican.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
rename to ccpp/suites/pelican.xml
index 53007131f..5f0145f91 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+++ b/ccpp/suites/pelican.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "pelican" (formerly known as FV3_GFS_v17_coupled_p8)
+-->
 
-<suite name="FV3_GFS_v17_coupled_p8" version="1">
+<suite name="pelican" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/penguin.xml
similarity index 96%
rename from ccpp/suites/suite_RRFSens_phy5.xml
rename to ccpp/suites/penguin.xml
index 0321e64e9..7fdcf38eb 100644
--- a/ccpp/suites/suite_RRFSens_phy5.xml
+++ b/ccpp/suites/penguin.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "penguin" (formerly known as RRFSens_phy5)
+-->
 
-<suite name="RRFSens_phy5" version="1">
+<suite name="penguin" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/ptarmigan.xml
similarity index 96%
rename from ccpp/suites/suite_RRFSens_phy2.xml
rename to ccpp/suites/ptarmigan.xml
index 44cafb249..5429dc309 100644
--- a/ccpp/suites/suite_RRFSens_phy2.xml
+++ b/ccpp/suites/ptarmigan.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "ptarmigan" (formerly known as RRFSens_phy2)
+-->
 
-<suite name="RRFSens_phy2" version="1">
+<suite name="ptarmigan" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/puffin.xml
similarity index 96%
rename from ccpp/suites/suite_RRFSens_phy1.xml
rename to ccpp/suites/puffin.xml
index f0de1ebf4..d5d9527be 100644
--- a/ccpp/suites/suite_RRFSens_phy1.xml
+++ b/ccpp/suites/puffin.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "puffin" (formerly known as RRFSens_phy1)
+-->
 
-<suite name="RRFSens_phy1" version="1">
+<suite name="puffin" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/sandpiper.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RAP_flake.xml
rename to ccpp/suites/sandpiper.xml
index 3239355fa..c263dc6a4 100644
--- a/ccpp/suites/suite_FV3_RAP_flake.xml
+++ b/ccpp/suites/sandpiper.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "sandpiper" (formerly known as FV3_RAP_flake)
+-->
 
-<suite name="FV3_RAP_flake" version="1">
+<suite name="sandpiper" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml b/ccpp/suites/shrike.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RAP_sfcdiff.xml
rename to ccpp/suites/shrike.xml
index 23bbf1f54..0931a49fe 100644
--- a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+++ b/ccpp/suites/shrike.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "shrike" (formerly known as FV3_RAP_sfcdiff)
+-->
 
-<suite name="FV3_RAP_sfcdiff" version="1">
+<suite name="shrike" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/snowy_owl.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RAP_clm_lake.xml
rename to ccpp/suites/snowy_owl.xml
index e7fef4461..aab666bb5 100644
--- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml
+++ b/ccpp/suites/snowy_owl.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "snowy_owl" (formerly known as FV3_RAP_clm_lake)
+-->
 
-<suite name="FV3_RAP_clm_lake" version="1">
+<suite name="snowy_owl" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16_ras.xml b/ccpp/suites/starling.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v16_ras.xml
rename to ccpp/suites/starling.xml
index d27a4887c..e13be15b1 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_ras.xml
+++ b/ccpp/suites/starling.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "starling" (formerly known as FV3_GFS_v16_ras)
+-->
 
-<suite name="FV3_GFS_v16_ras" version="1">
+<suite name="starling" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml b/ccpp/suites/tanager.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
rename to ccpp/suites/tanager.xml
index 3fc78efad..b750539a6 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+++ b/ccpp/suites/tanager.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "tanager" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf_nonsst)
+-->
 
-<suite name="FV3_HAFS_v1_gfdlmp_tedmf_nonsst" version="1">
+<suite name="tanager" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml b/ccpp/suites/tern.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
rename to ccpp/suites/tern.xml
index fb7672ac3..c52df6eab 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+++ b/ccpp/suites/tern.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "tern" (formerly known as FV3_GFS_v17_p8_mynn)
+-->
 
-<suite name="FV3_GFS_v17_p8_mynn" version="1">
+<suite name="tern" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml b/ccpp/suites/toucan.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
rename to ccpp/suites/toucan.xml
index 70018e7cc..11e08aa95 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+++ b/ccpp/suites/toucan.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "toucan" (formerly known as FV3_HAFS_v1_thompson_tedmf_gfdlsf)
+-->
 
-<suite name="FV3_HAFS_v1_thompson_tedmf_gfdlsf" version="1">
+<suite name="toucan" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/turnstone.xml
similarity index 96%
rename from ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
rename to ccpp/suites/turnstone.xml
index e6294028c..a592fb627 100644
--- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+++ b/ccpp/suites/turnstone.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "turnstone" (formerly known as FV3_RAP_cires_ugwp)
+-->
 
-<suite name="FV3_RAP_cires_ugwp" version="1">
+<suite name="turnstone" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HRRR_c3.xml b/ccpp/suites/wren.xml
similarity index 94%
rename from ccpp/suites/suite_FV3_HRRR_c3.xml
rename to ccpp/suites/wren.xml
index e3ad50a8a..b8f2f9a0d 100644
--- a/ccpp/suites/suite_FV3_HRRR_c3.xml
+++ b/ccpp/suites/wren.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+DESCRIPTION:
+Suite "wren" (formerly known as FV3_HRRR_c3)
+-->
+<!--
+DESCRIPTION:
+Suite "aracari" (formerly known as wren)
+-->
 
-<suite name="FV3_HRRR_c3" version="1">
+<suite name="aracari" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml b/ccpp/suites_not_used/suite_FV3_GFS_v17_coupled_p8_c3.xml
similarity index 100%
rename from ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
rename to ccpp/suites_not_used/suite_FV3_GFS_v17_coupled_p8_c3.xml

From a6aff77dc07f56c7cec287f8244d7dc149377e10 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Tue, 4 Jun 2024 04:27:58 +0000
Subject: [PATCH 6/9] Fix "wren" suite name

---
 ccpp/suites/wren.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ccpp/suites/wren.xml b/ccpp/suites/wren.xml
index b8f2f9a0d..3605a0d23 100644
--- a/ccpp/suites/wren.xml
+++ b/ccpp/suites/wren.xml
@@ -3,12 +3,8 @@
 DESCRIPTION:
 Suite "wren" (formerly known as FV3_HRRR_c3)
 -->
-<!--
-DESCRIPTION:
-Suite "aracari" (formerly known as wren)
--->
 
-<suite name="aracari" version="1">
+<suite name="wren" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

From f15563e7ddd724307371b5b89c837c4c1ac3777f Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Thu, 6 Jun 2024 03:48:28 +0000
Subject: [PATCH 7/9] Final stages: introducing suite in-linedocumentation,
 finalizing names

 - rename goldfinch.xml -> magpie.xml (equivalent SCM suite)
 - rename antbird.xml -> flamingo.xml (HAFS-A suite deserves a better name)
 - Add documentation lines to SCM and HAFS suites
---
 ccpp/suites/albatross.xml                 | 3 +--
 ccpp/suites/alias.json                    | 4 ++--
 ccpp/suites/bald_eagle.xml                | 3 +--
 ccpp/suites/bluebird.xml                  | 3 +--
 ccpp/suites/crossbill.xml                 | 3 +--
 ccpp/suites/{antbird.xml => flamingo.xml} | 5 ++---
 ccpp/suites/hornbill.xml                  | 3 +--
 ccpp/suites/hummingbird.xml               | 3 +--
 ccpp/suites/kingfisher.xml                | 3 +--
 ccpp/suites/lorikeet.xml                  | 2 +-
 ccpp/suites/{goldfinch.xml => magpie.xml} | 5 ++---
 ccpp/suites/parakeet.xml                  | 2 +-
 ccpp/suites/pigeon.xml                    | 2 +-
 ccpp/suites/raven.xml                     | 2 +-
 ccpp/suites/tanager.xml                   | 2 +-
 ccpp/suites/toucan.xml                    | 3 +--
 16 files changed, 19 insertions(+), 29 deletions(-)
 rename ccpp/suites/{antbird.xml => flamingo.xml} (92%)
 rename ccpp/suites/{goldfinch.xml => magpie.xml} (90%)

diff --git a/ccpp/suites/albatross.xml b/ccpp/suites/albatross.xml
index 4df14a335..e771348a4 100644
--- a/ccpp/suites/albatross.xml
+++ b/ccpp/suites/albatross.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "albatross" (formerly known as FV3_RAP)
+Suite "albatross" (formerly known as FV3_RAP) was originally developed for research and prototyping of early UFS systems. It was meant to emulate the physics of the Rapid Refresh (RAP) model, though it had some differences from the operational implementation (which was not CCPP-based).
 -->
-
 <suite name="albatross" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json
index dfa2b9304..76f0c04f6 100644
--- a/ccpp/suites/alias.json
+++ b/ccpp/suites/alias.json
@@ -19,14 +19,14 @@
     "FV3_GFS_v16_fv3wam.xml": "loon.xml",
     "FV3_GFS_v16_ras.xml": "starling.xml",
     "FV3_GFS_v17_coupled_p8_sfcocn.xml": "dotterel.xml",
-    "FV3_GFS_v17_coupled_p8_ugwpv1.xml": "goldfinch.xml",
+    "FV3_GFS_v17_coupled_p8_ugwpv1.xml": "magpie.xml",
     "FV3_GFS_v17_coupled_p8.xml": "pelican.xml",
     "FV3_GFS_v17_p8_mynn.xml": "tern.xml",
     "FV3_GFS_v17_p8_rrtmgp.xml": "canary.xml",
     "FV3_GFS_v17_p8_ugwpv1.xml": "condor.xml",
     "FV3_global_nest_v1.xml": "falcon.xml",
     "FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml": "tanager.xml",
-    "FV3_HAFS_v1_gfdlmp_tedmf.xml": "antbird.xml",
+    "FV3_HAFS_v1_gfdlmp_tedmf.xml": "flamingo.xml",
     "FV3_HAFS_v1_thompson_nonsst.xml": "hornbill.xml",
     "FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml": "toucan.xml",
     "FV3_HAFS_v1_thompson.xml": "lorikeet.xml",
diff --git a/ccpp/suites/bald_eagle.xml b/ccpp/suites/bald_eagle.xml
index 2a94349dc..b312f7f03 100644
--- a/ccpp/suites/bald_eagle.xml
+++ b/ccpp/suites/bald_eagle.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "bald_eagle" (formerly known as FV3_HRRR)
+Suite "bald_eagle" (formerly known as FV3_HRRR) was originally developed for research and testing for early prototypes of the Rapid Refresh Forecast System (RRFS). It was meant to emulate the physics of the High-Resolution Rapid Refresh (HRRR) model, though it had some differences from the operational implementation (which was not CCPP-based).
 -->
-
 <suite name="bald_eagle" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/bluebird.xml b/ccpp/suites/bluebird.xml
index 586344bac..7eb111faa 100644
--- a/ccpp/suites/bluebird.xml
+++ b/ccpp/suites/bluebird.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "bluebird" (formerly known as FV3_GFS_v17_p8)
+Suite "bluebird" (formerly known as FV3_GFS_v17_p8) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. While it is similar to the physics used for this prototype (P8), it is not identical, and the eventual operational implementation of GFS version 17 will likely be quite different.
 -->
-
 <suite name="bluebird" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/crossbill.xml b/ccpp/suites/crossbill.xml
index 4e1a87e4b..9e4569476 100644
--- a/ccpp/suites/crossbill.xml
+++ b/ccpp/suites/crossbill.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "crossbill" (formerly known as FV3_RRFS_v1nssl)
+Suite "crossbill" (formerly known as FV3_RRFS_v1nssl) was originally developed for research and development of early prototypes of the Rapid Refresh Forecast System (RRFS), specifically including the NSSL 2-moment cloud microphysics scheme when it was added to CCPP (see https://github.com/NOAA-EMC/fv3atm/pull/472 and https://github.com/NCAR/ccpp-physics/pull/761).
 -->
-
 <suite name="crossbill"  version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/antbird.xml b/ccpp/suites/flamingo.xml
similarity index 92%
rename from ccpp/suites/antbird.xml
rename to ccpp/suites/flamingo.xml
index 7f9006b8c..33e07b720 100644
--- a/ccpp/suites/antbird.xml
+++ b/ccpp/suites/flamingo.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "antbird" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf)
+Suite "flamingo" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf) is similar (though not identical) to the physics suite used by the operational HAFS-A configuration. When using GRIB2 input data, use suite "tanager" instead.
 -->
-
-<suite name="antbird" version="1">
+<suite name="flamingo" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
     <subcycle loop="1">
diff --git a/ccpp/suites/hornbill.xml b/ccpp/suites/hornbill.xml
index 64923d3d5..d0863e777 100644
--- a/ccpp/suites/hornbill.xml
+++ b/ccpp/suites/hornbill.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "hornbill" (formerly known as FV3_HAFS_v1_thompson_nonsst)
+Suite "hornbill" (formerly known as FV3_HAFS_v1_thompson_nonsst) is similar (though not identical) to the physics suite used by the operational HAFS-B configuration. Identical to suite "lorikeet", except with a modified near-sea-surface temperature scheme (sfc_ocean) for use with GRIB2 input data.
 -->
-
 <suite name="hornbill" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/hummingbird.xml b/ccpp/suites/hummingbird.xml
index d8e85118a..c9730f821 100644
--- a/ccpp/suites/hummingbird.xml
+++ b/ccpp/suites/hummingbird.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "hummingbird" (formerly known as FV3_WoFS_v0)
+Suite "hummingbird" (formerly known as FV3_WoFS_v0) was used for testing an early prototype of the experimental FV3-based Warn-on-Forecast System (WoFS). Same as suite "crossbill" (formerly known as FV3_RRFS_v1nssl) except with Noah Land Surface Model instead of NoahMP.
 -->
-
 <suite name="hummingbird"  version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/kingfisher.xml b/ccpp/suites/kingfisher.xml
index 741f0021b..0e6f9ab5f 100644
--- a/ccpp/suites/kingfisher.xml
+++ b/ccpp/suites/kingfisher.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "kingfisher" (formerly known as FV3_GFS_v15p2)
+Suite "kingfisher" (formerly known as FV3_GFS_v15p2) was originally developed for research and prototyping of early UFS systems. It was meant to emulate the operational GFS v15.2 physics, though it had some differences from the operational implementation (which was not CCPP-based).
 -->
-
 <suite name="kingfisher" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
diff --git a/ccpp/suites/lorikeet.xml b/ccpp/suites/lorikeet.xml
index cc544fb13..0b7500482 100644
--- a/ccpp/suites/lorikeet.xml
+++ b/ccpp/suites/lorikeet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "lorikeet" (formerly known as FV3_HAFS_v1_thompson)
+Suite "lorikeet" (formerly known as FV3_HAFS_v1_thompson) is similar (though not identical) to the physics suite used by the operational HAFS-B configuration. When using GRIB2 input data, use suite "hornbill" instead.
 -->
 
 <suite name="lorikeet" version="1">
diff --git a/ccpp/suites/goldfinch.xml b/ccpp/suites/magpie.xml
similarity index 90%
rename from ccpp/suites/goldfinch.xml
rename to ccpp/suites/magpie.xml
index 906822e5d..f8294890d 100644
--- a/ccpp/suites/goldfinch.xml
+++ b/ccpp/suites/magpie.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "goldfinch" (formerly known as FV3_GFS_v17_coupled_p8_ugwpv1)
+Suite "magpie" (formerly known as FV3_GFS_v17_coupled_p8_ugwpv1) was originally developed for use by the GFS v17 High-resolution prototype 3 (HR3). While it acccurately represents the physics suite used for this prototype, the eventual implementation of the operational GFS version 17 will likely be different.
 -->
-
-<suite name="goldfinch" version="1">
+<suite name="magpie" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/parakeet.xml b/ccpp/suites/parakeet.xml
index c480b3c95..99ba3cca0 100644
--- a/ccpp/suites/parakeet.xml
+++ b/ccpp/suites/parakeet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "parakeet" (formerly known as FV3_GFS_v17_p8_c3)
+Suite "parakeet" (formerly known as FV3_GFS_v17_p8_c3) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. While it is similar to the physics used for this prototype (P8), it is not identical, and the eventual operational implementation of GFS version 17 will likely be quite different.
 -->
 
 <suite name="parakeet" version="1">
diff --git a/ccpp/suites/pigeon.xml b/ccpp/suites/pigeon.xml
index bf2113d52..a86794690 100644
--- a/ccpp/suites/pigeon.xml
+++ b/ccpp/suites/pigeon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "pigeon" (formerly known as FV3_RRFS_v1beta)
+Suite "pigeon" (formerly known as FV3_RRFS_v1beta) was originally developed for an early prototype of the Rapid Refresh Forecast System (RRFS).
 -->
 
 <suite name="pigeon" version="1">
diff --git a/ccpp/suites/raven.xml b/ccpp/suites/raven.xml
index f713f6d3c..83f509390 100644
--- a/ccpp/suites/raven.xml
+++ b/ccpp/suites/raven.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "raven" (formerly known as FV3_GFS_v16)
+Suite "raven" (formerly known as FV3_GFS_v16) was originally developed for research and prototyping of early UFS systems. It was meant to emulate the operational GFS v16 suite, though it had some differences from the operational implementation (which was not CCPP-based).
 -->
 
 <suite name="raven" version="1">
diff --git a/ccpp/suites/tanager.xml b/ccpp/suites/tanager.xml
index b750539a6..966f9f046 100644
--- a/ccpp/suites/tanager.xml
+++ b/ccpp/suites/tanager.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "tanager" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf_nonsst)
+Suite "tanager" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf_nonsst) is similar (though not identical) to the physics suite used by the operational HAFS-A configuration. Identical to suite "flamingo", except with a modified near-sea-surface temperature scheme (sfc_ocean) for use with GRIB2 input data.
 -->
 
 <suite name="tanager" version="1">
diff --git a/ccpp/suites/toucan.xml b/ccpp/suites/toucan.xml
index 11e08aa95..a39282d86 100644
--- a/ccpp/suites/toucan.xml
+++ b/ccpp/suites/toucan.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "toucan" (formerly known as FV3_HAFS_v1_thompson_tedmf_gfdlsf)
+Suite "toucan" (formerly known as FV3_HAFS_v1_thompson_tedmf_gfdlsf) is similar (though not identical) to the physics suite used by the operational HAFS-B configuration. One specific difference is that this suite uses the GFDL surface layer scheme (similar to that used in the operational HWRF) rather than the GFS surface layer scheme used in HAFS-B.
 -->
-
 <suite name="toucan" version="1">
   <!-- <init></init> -->
   <group name="time_vary">

From 84f602b353b61881d8f667e5f3c94b0b00ff6d29 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Thu, 6 Jun 2024 05:58:28 +0000
Subject: [PATCH 8/9] More suite descriptions, update HAFS suite descriptions
 to better indicate which were used for HAFS operational implementation

---
 ccpp/suites/auklet.xml     | 3 +--
 ccpp/suites/canary.xml     | 3 +--
 ccpp/suites/chickadee.xml  | 3 +--
 ccpp/suites/condor.xml     | 3 +--
 ccpp/suites/crow.xml       | 3 +--
 ccpp/suites/dotterel.xml   | 2 +-
 ccpp/suites/dove.xml       | 2 +-
 ccpp/suites/egret.xml      | 2 +-
 ccpp/suites/falcon.xml     | 3 +--
 ccpp/suites/flamingo.xml   | 2 +-
 ccpp/suites/flycatcher.xml | 3 +--
 ccpp/suites/heron.xml      | 2 +-
 ccpp/suites/ibis.xml       | 3 +--
 ccpp/suites/kestrel.xml    | 4 ++--
 ccpp/suites/lorikeet.xml   | 2 +-
 ccpp/suites/penguin.xml    | 3 ++-
 ccpp/suites/ptarmigan.xml  | 4 ++--
 ccpp/suites/puffin.xml     | 4 ++--
 18 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/ccpp/suites/auklet.xml b/ccpp/suites/auklet.xml
index 63c065c20..f7254abd1 100644
--- a/ccpp/suites/auklet.xml
+++ b/ccpp/suites/auklet.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "auklet" (formerly known as FV3_HRRR_gf)
+Suite "auklet" (formerly known as FV3_HRRR_gf) was used for research and testing for early prototypes of the Rapid Refresh Forecast System (RRFS). Similar to suite "bald_eagle", except with the addition of the Grell-Freitas deep convection scheme and GFS convective cloud diagnostics.
 -->
-
 <suite name="auklet" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/canary.xml b/ccpp/suites/canary.xml
index ea42723c5..3ea38c440 100644
--- a/ccpp/suites/canary.xml
+++ b/ccpp/suites/canary.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "canary" (formerly known as FV3_GFS_v17_p8_rrtmgp)
+Suite "canary" (formerly known as FV3_GFS_v17_p8_rrtmgp) is a suite used for testing an early prototype of the Global Forecast System (GFS) version 17 release ("Prototype 8"). Similar to "bluebird", but uses RRTMGP: a re-written an parallelized version of the older RRTMG radiation schemes (see https://earth-system-radiation.github.io/rte-rrtmgp/).
 -->
-
 <suite name="canary" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/chickadee.xml b/ccpp/suites/chickadee.xml
index ba0af7066..102eceb02 100644
--- a/ccpp/suites/chickadee.xml
+++ b/ccpp/suites/chickadee.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "chickadee" (formerly known as RRFSens_phy3)
+Suite "chickadee" (formerly known as RRFSens_phy3) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (RRFS) multi-physics ensemble.
 -->
-
 <suite name="chickadee" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/condor.xml b/ccpp/suites/condor.xml
index cf2f3fc66..61fdd7754 100644
--- a/ccpp/suites/condor.xml
+++ b/ccpp/suites/condor.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "condor" (formerly known as FV3_GFS_v17_p8_ugwpv1)
+Suite "condor" (formerly known as FV3_GFS_v17_p8_ugwpv1) was used for testing early prototypes of the Global Forecast System (GFS) version 17 release. Identical to suite "bluebird" but with an upgraded version of the unified gravity wave drag physics (v0 -> v1).
 -->
-
 <suite name="condor" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/crow.xml b/ccpp/suites/crow.xml
index eb44d00f5..8f4aee446 100644
--- a/ccpp/suites/crow.xml
+++ b/ccpp/suites/crow.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "crow" (formerly known as FV3_GFS_v15_thompson_mynn_lam3km)
+Suite "crow" (formerly known as FV3_GFS_v15_thompson_mynn_lam3km) is an early physics suite used for research and experiments with early high-resolution (3-km) regional UFS grids.
 -->
-
 <suite name="crow" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/dotterel.xml b/ccpp/suites/dotterel.xml
index 05d8d6db1..5d5d348f3 100644
--- a/ccpp/suites/dotterel.xml
+++ b/ccpp/suites/dotterel.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "dotterel" (formerly known as FV3_GFS_v17_coupled_p8_sfcocn)
+Suite "dotterel" (formerly known as FV3_GFS_v17_coupled_p8_sfcocn) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. Similar to suite "pelican", except with a modified near-sea-surface temperature scheme (sfc_ocean) for use with GRIB2 input data.
 -->
 
 <suite name="dotterel" version="1">
diff --git a/ccpp/suites/dove.xml b/ccpp/suites/dove.xml
index 041aa91ba..0513f44b1 100644
--- a/ccpp/suites/dove.xml
+++ b/ccpp/suites/dove.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "dove" (formerly known as FV3_RAP_noah)
+Suite "dove" (formerly known as FV3_RAP_noah) was originally developed for research and prototyping of early UFS systems. Similar to "albatross", except using the Noah Land Surface Model (instead of RUC LSM) and the GFS surface sea-ice model.
 -->
 
 <suite name="dove" version="1">
diff --git a/ccpp/suites/egret.xml b/ccpp/suites/egret.xml
index ccf4678c4..da8764e86 100644
--- a/ccpp/suites/egret.xml
+++ b/ccpp/suites/egret.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "egret" (formerly known as FV3_GFS_v16_csawmg)
+Suite "egret" (formerly known as FV3_GFS_v16_csawmg) was a suite added for experiments with the Morrison-Gettelman version 3 microphysics.
 -->
 
 <suite name="egret" version="1">
diff --git a/ccpp/suites/falcon.xml b/ccpp/suites/falcon.xml
index 5ade6ebad..ae592ebfc 100644
--- a/ccpp/suites/falcon.xml
+++ b/ccpp/suites/falcon.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "falcon" (formerly known as FV3_global_nest_v1)
+Suite "falcon" (formerly known as FV3_global_nest_v1) is a suite that was developed for forecasting atmospheric rivers for the Water in the West project.
 -->
-
 <suite name="falcon" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/flamingo.xml b/ccpp/suites/flamingo.xml
index 33e07b720..6dadd10e8 100644
--- a/ccpp/suites/flamingo.xml
+++ b/ccpp/suites/flamingo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "flamingo" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf) is similar (though not identical) to the physics suite used by the operational HAFS-A configuration. When using GRIB2 input data, use suite "tanager" instead.
+Suite "flamingo" (formerly known as FV3_HAFS_v1_gfdlmp_tedmf) is the physics suite used by the operational HAFS-A configuration. When using GRIB2 input data, use suite "tanager" instead.
 -->
 <suite name="flamingo" version="1">
   <!-- <init></init> -->
diff --git a/ccpp/suites/flycatcher.xml b/ccpp/suites/flycatcher.xml
index dc70ef855..e3f9b721d 100644
--- a/ccpp/suites/flycatcher.xml
+++ b/ccpp/suites/flycatcher.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "flycatcher" (formerly known as FV3_HRRR_gf_nogwd)
+Suite "flycatcher" (formerly known as FV3_HRRR_gf_nogwd) is a suite developed for a prototype of the Rapid Refresh Forecast System (RRFS) for fire weather prediction. Similar to suite "auklet", except without gravity wave drag parameterization.
 -->
-
 <suite name="flycatcher" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/heron.xml b/ccpp/suites/heron.xml
index f18ee3de0..6a1d24d93 100644
--- a/ccpp/suites/heron.xml
+++ b/ccpp/suites/heron.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "heron" (formerly known as FV3_GFS_v16_flake)
+Suite "heron" (formerly known as FV3_GFS_v16_flake) was added to test the capabilities of the Freshwater Lake (FLake) model (http://www.flake.igb-berlin.de/site/doc) for simulating freshwater lake temperatures.
 -->
 
 <suite name="heron" version="1">
diff --git a/ccpp/suites/ibis.xml b/ccpp/suites/ibis.xml
index 82cb7b0c3..b33e84c30 100644
--- a/ccpp/suites/ibis.xml
+++ b/ccpp/suites/ibis.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "ibis" (formerly known as FV3_RAP_unified_ugwp)
+Suite "ibis" (formerly known as FV3_RAP_unified_ugwp) is similar to "albatross" but using the unified gravity wave drag scheme (version 0) rather than the GSL orographic gravity wave drag scheme.
 -->
-
 <suite name="ibis" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/kestrel.xml b/ccpp/suites/kestrel.xml
index e0333833f..36715a34d 100644
--- a/ccpp/suites/kestrel.xml
+++ b/ccpp/suites/kestrel.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "kestrel" (formerly known as RRFSens_phy4)
+Suite "kestrel" (formerly known as RRFSens_phy4) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (R
+RFS) multi-physics ensemble.
 -->
-
 <suite name="kestrel" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/lorikeet.xml b/ccpp/suites/lorikeet.xml
index 0b7500482..af350ba18 100644
--- a/ccpp/suites/lorikeet.xml
+++ b/ccpp/suites/lorikeet.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "lorikeet" (formerly known as FV3_HAFS_v1_thompson) is similar (though not identical) to the physics suite used by the operational HAFS-B configuration. When using GRIB2 input data, use suite "hornbill" instead.
+Suite "lorikeet" (formerly known as FV3_HAFS_v1_thompson) is similar (though not identical) to the physics suite used by the operational HAFS-B configuration. When using GRIB2 input data, or coupled with an ocean model, use suite "hornbill" instead.
 -->
 
 <suite name="lorikeet" version="1">
diff --git a/ccpp/suites/penguin.xml b/ccpp/suites/penguin.xml
index 7fdcf38eb..b5e16216d 100644
--- a/ccpp/suites/penguin.xml
+++ b/ccpp/suites/penguin.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "penguin" (formerly known as RRFSens_phy5)
+Suite "penguin" (formerly known as RRFSens_phy5) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (R
+RFS) multi-physics ensemble.
 -->
 
 <suite name="penguin" version="1">
diff --git a/ccpp/suites/ptarmigan.xml b/ccpp/suites/ptarmigan.xml
index 5429dc309..19efbc242 100644
--- a/ccpp/suites/ptarmigan.xml
+++ b/ccpp/suites/ptarmigan.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "ptarmigan" (formerly known as RRFSens_phy2)
+Suite "ptarmigan" (formerly known as RRFSens_phy2) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (R
+RFS) multi-physics ensemble.
 -->
-
 <suite name="ptarmigan" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/puffin.xml b/ccpp/suites/puffin.xml
index d5d9527be..a6c188ffb 100644
--- a/ccpp/suites/puffin.xml
+++ b/ccpp/suites/puffin.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "puffin" (formerly known as RRFSens_phy1)
+Suite "puffin" (formerly known as RRFSens_phy1) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (R
+RFS) multi-physics ensemble.
 -->
-
 <suite name="puffin" version="1">
   <!-- <init></init> -->
   <group name="time_vary">

From 0a061e6c31180325309a290cd91a09bc09503806 Mon Sep 17 00:00:00 2001
From: "Michael Kavulich, Jr" <kavulich@ucar.edu>
Date: Mon, 10 Jun 2024 04:33:52 +0000
Subject: [PATCH 9/9] Added descriptions for the rest of the suites, updated a
 few others

---
 ccpp/suites/dotterel.xml   | 1 -
 ccpp/suites/dove.xml       | 1 -
 ccpp/suites/egret.xml      | 1 -
 ccpp/suites/heron.xml      | 1 -
 ccpp/suites/loon.xml       | 3 +--
 ccpp/suites/lorikeet.xml   | 1 -
 ccpp/suites/meadowlark.xml | 3 +--
 ccpp/suites/parakeet.xml   | 1 -
 ccpp/suites/pelican.xml    | 3 +--
 ccpp/suites/penguin.xml    | 4 +---
 ccpp/suites/pigeon.xml     | 1 -
 ccpp/suites/ptarmigan.xml  | 3 +--
 ccpp/suites/puffin.xml     | 3 +--
 ccpp/suites/raven.xml      | 1 -
 ccpp/suites/sandpiper.xml  | 3 +--
 ccpp/suites/shrike.xml     | 3 +--
 ccpp/suites/snowy_owl.xml  | 3 +--
 ccpp/suites/starling.xml   | 2 +-
 ccpp/suites/tern.xml       | 2 +-
 ccpp/suites/turnstone.xml  | 3 +--
 ccpp/suites/wren.xml       | 3 +--
 21 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/ccpp/suites/dotterel.xml b/ccpp/suites/dotterel.xml
index 5d5d348f3..0b70ca919 100644
--- a/ccpp/suites/dotterel.xml
+++ b/ccpp/suites/dotterel.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "dotterel" (formerly known as FV3_GFS_v17_coupled_p8_sfcocn) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. Similar to suite "pelican", except with a modified near-sea-surface temperature scheme (sfc_ocean) for use with GRIB2 input data.
 -->
-
 <suite name="dotterel" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/dove.xml b/ccpp/suites/dove.xml
index 0513f44b1..6ccabb543 100644
--- a/ccpp/suites/dove.xml
+++ b/ccpp/suites/dove.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "dove" (formerly known as FV3_RAP_noah) was originally developed for research and prototyping of early UFS systems. Similar to "albatross", except using the Noah Land Surface Model (instead of RUC LSM) and the GFS surface sea-ice model.
 -->
-
 <suite name="dove" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/egret.xml b/ccpp/suites/egret.xml
index da8764e86..28afaf301 100644
--- a/ccpp/suites/egret.xml
+++ b/ccpp/suites/egret.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "egret" (formerly known as FV3_GFS_v16_csawmg) was a suite added for experiments with the Morrison-Gettelman version 3 microphysics.
 -->
-
 <suite name="egret" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/heron.xml b/ccpp/suites/heron.xml
index 6a1d24d93..f5ff862cc 100644
--- a/ccpp/suites/heron.xml
+++ b/ccpp/suites/heron.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "heron" (formerly known as FV3_GFS_v16_flake) was added to test the capabilities of the Freshwater Lake (FLake) model (http://www.flake.igb-berlin.de/site/doc) for simulating freshwater lake temperatures.
 -->
-
 <suite name="heron" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
diff --git a/ccpp/suites/loon.xml b/ccpp/suites/loon.xml
index 1c7e10c4d..0fe9fdc41 100644
--- a/ccpp/suites/loon.xml
+++ b/ccpp/suites/loon.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "loon" (formerly known as FV3_GFS_v16_fv3wam)
+Suite "loon" (formerly known as FV3_GFS_v16_fv3wam) was originally developed for early prototypes of the FV3-based Whole Atmosphere Model (WAM).
 -->
-
 <suite name="loon" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/lorikeet.xml b/ccpp/suites/lorikeet.xml
index af350ba18..72600364a 100644
--- a/ccpp/suites/lorikeet.xml
+++ b/ccpp/suites/lorikeet.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "lorikeet" (formerly known as FV3_HAFS_v1_thompson) is similar (though not identical) to the physics suite used by the operational HAFS-B configuration. When using GRIB2 input data, or coupled with an ocean model, use suite "hornbill" instead.
 -->
-
 <suite name="lorikeet" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/meadowlark.xml b/ccpp/suites/meadowlark.xml
index 33876e027..6da5f7a6c 100644
--- a/ccpp/suites/meadowlark.xml
+++ b/ccpp/suites/meadowlark.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "meadowlark" (formerly known as FV3_RAP_noah_sfcdiff_cires_ugwp)
+Suite "meadowlark" (formerly known as FV3_RAP_noah_sfcdiff_cires_ugwp) was originally developed for research and prototyping of early UFS systems. Designed to emulate the RAP physics, but with several differences, including the surface scheme, land surface model, and gravity wave parameterizations.
 -->
-
 <suite name="meadowlark" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/parakeet.xml b/ccpp/suites/parakeet.xml
index 99ba3cca0..6e1589011 100644
--- a/ccpp/suites/parakeet.xml
+++ b/ccpp/suites/parakeet.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "parakeet" (formerly known as FV3_GFS_v17_p8_c3) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. While it is similar to the physics used for this prototype (P8), it is not identical, and the eventual operational implementation of GFS version 17 will likely be quite different.
 -->
-
 <suite name="parakeet" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/pelican.xml b/ccpp/suites/pelican.xml
index 5f0145f91..71d255981 100644
--- a/ccpp/suites/pelican.xml
+++ b/ccpp/suites/pelican.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "pelican" (formerly known as FV3_GFS_v17_coupled_p8)
+Suite "pelican" (formerly known as FV3_GFS_v17_coupled_p8) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release. While it is similar to the physics used for this prototype (P8), it is not identical, and the eventual operational implementation of GFS version 17 will likely be quite different. Identical to suite "bluebird", except with the "sfc_cice" physics routine used for coupling with the Community Ice Code (CICE) sea-ice model (https://www.cesm.ucar.edu/models/cice).
 -->
-
 <suite name="pelican" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/penguin.xml b/ccpp/suites/penguin.xml
index b5e16216d..a4e9641f9 100644
--- a/ccpp/suites/penguin.xml
+++ b/ccpp/suites/penguin.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "penguin" (formerly known as RRFSens_phy5) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (R
-RFS) multi-physics ensemble.
+Suite "penguin" (formerly known as RRFSens_phy5) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (RRFS) multi-physics ensemble.
 -->
-
 <suite name="penguin" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/pigeon.xml b/ccpp/suites/pigeon.xml
index a86794690..a8624b100 100644
--- a/ccpp/suites/pigeon.xml
+++ b/ccpp/suites/pigeon.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "pigeon" (formerly known as FV3_RRFS_v1beta) was originally developed for an early prototype of the Rapid Refresh Forecast System (RRFS).
 -->
-
 <suite name="pigeon" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/ptarmigan.xml b/ccpp/suites/ptarmigan.xml
index 19efbc242..cfda0c74f 100644
--- a/ccpp/suites/ptarmigan.xml
+++ b/ccpp/suites/ptarmigan.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "ptarmigan" (formerly known as RRFSens_phy2) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (R
-RFS) multi-physics ensemble.
+Suite "ptarmigan" (formerly known as RRFSens_phy2) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (RRFS) multi-physics ensemble.
 -->
 <suite name="ptarmigan" version="1">
   <!-- <init></init> -->
diff --git a/ccpp/suites/puffin.xml b/ccpp/suites/puffin.xml
index a6c188ffb..ec236e5f7 100644
--- a/ccpp/suites/puffin.xml
+++ b/ccpp/suites/puffin.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "puffin" (formerly known as RRFSens_phy1) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (R
-RFS) multi-physics ensemble.
+Suite "puffin" (formerly known as RRFSens_phy1) is one of the suites used in early prototypes of the Rapid Refresh Forecast System (RRFS) multi-physics ensemble.
 -->
 <suite name="puffin" version="1">
   <!-- <init></init> -->
diff --git a/ccpp/suites/raven.xml b/ccpp/suites/raven.xml
index 83f509390..495a8f361 100644
--- a/ccpp/suites/raven.xml
+++ b/ccpp/suites/raven.xml
@@ -3,7 +3,6 @@
 DESCRIPTION:
 Suite "raven" (formerly known as FV3_GFS_v16) was originally developed for research and prototyping of early UFS systems. It was meant to emulate the operational GFS v16 suite, though it had some differences from the operational implementation (which was not CCPP-based).
 -->
-
 <suite name="raven" version="1">
   <!-- <init></init> -->
   <group name="fast_physics">
diff --git a/ccpp/suites/sandpiper.xml b/ccpp/suites/sandpiper.xml
index c263dc6a4..b16c2ccb1 100644
--- a/ccpp/suites/sandpiper.xml
+++ b/ccpp/suites/sandpiper.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "sandpiper" (formerly known as FV3_RAP_flake)
+Suite "sandpiper" (formerly known as FV3_RAP_flake) is identical to suite "albatross", but with the addition of the Freshwater Lake (FLake) model (http://www.flake.igb-berlin.de/site/doc) for simulating freshwater lake temperatures.
 -->
-
 <suite name="sandpiper" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/shrike.xml b/ccpp/suites/shrike.xml
index 0931a49fe..5f334b004 100644
--- a/ccpp/suites/shrike.xml
+++ b/ccpp/suites/shrike.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "shrike" (formerly known as FV3_RAP_sfcdiff)
+Suite "shrike" (formerly known as FV3_RAP_sfcdiff) is identical to suite "albatross", but with the GFS surface layer scheme rather than the MYNN surface layer scheme.
 -->
-
 <suite name="shrike" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/snowy_owl.xml b/ccpp/suites/snowy_owl.xml
index aab666bb5..dd90697cf 100644
--- a/ccpp/suites/snowy_owl.xml
+++ b/ccpp/suites/snowy_owl.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "snowy_owl" (formerly known as FV3_RAP_clm_lake)
+Suite "snowy_owl" (formerly known as FV3_RAP_clm_lake) was originally developed for research and prototyping of early UFS systems. It was meant to emulate the physics of the Rapid Refresh (RAP) model, though it had some differences from the operational implementation (which was not CCPP-based). This suite is identical to suite "albatross", but with the addition of the Community Land Model (CLM) lake model (as is found in the operational RAP).
 -->
-
 <suite name="snowy_owl" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/starling.xml b/ccpp/suites/starling.xml
index e13be15b1..42487b3da 100644
--- a/ccpp/suites/starling.xml
+++ b/ccpp/suites/starling.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "starling" (formerly known as FV3_GFS_v16_ras)
+Suite "starling" (formerly known as FV3_GFS_v16_ras) is identical to suite "raven", but with the Relaxed Arakawa-Schubert Convection Scheme rather than the scale-aware mass-flux deep convection scheme.
 -->
 
 <suite name="starling" version="1">
diff --git a/ccpp/suites/tern.xml b/ccpp/suites/tern.xml
index c52df6eab..6fbe55f39 100644
--- a/ccpp/suites/tern.xml
+++ b/ccpp/suites/tern.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "tern" (formerly known as FV3_GFS_v17_p8_mynn)
+Suite "tern" (formerly known as FV3_GFS_v17_p8_mynn) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release.
 -->
 
 <suite name="tern" version="1">
diff --git a/ccpp/suites/turnstone.xml b/ccpp/suites/turnstone.xml
index a592fb627..cece7291f 100644
--- a/ccpp/suites/turnstone.xml
+++ b/ccpp/suites/turnstone.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "turnstone" (formerly known as FV3_RAP_cires_ugwp)
+Suite "turnstone" (formerly known as FV3_RAP_cires_ugwp) is similar to "albatross" but using the CIRES Unified Gravity Wave Physics (version 0) rather than the GSL orographic gravity wave drag scheme.
 -->
-
 <suite name="turnstone" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
diff --git a/ccpp/suites/wren.xml b/ccpp/suites/wren.xml
index 3605a0d23..db6421043 100644
--- a/ccpp/suites/wren.xml
+++ b/ccpp/suites/wren.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 DESCRIPTION:
-Suite "wren" (formerly known as FV3_HRRR_c3)
+Suite "wren" (formerly known as FV3_HRRR_c3) is similar to suite "bald_eagle" but with the addition of the C3 Deep Convection scheme.
 -->
-
 <suite name="wren" version="1">
   <!-- <init></init> -->
   <group name="time_vary">