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..8821d6414 160000
--- a/ccpp/framework
+++ b/ccpp/framework
@@ -1 +1 @@
-Subproject commit ccfefcd0b426e011f94137031d5f7c2a4dda2659
+Subproject commit 8821d641482c9ddb9730eab11c664a9ede49044a
diff --git a/ccpp/suites/suite_FV3_RAP.xml b/ccpp/suites/albatross.xml
similarity index 89%
rename from ccpp/suites/suite_FV3_RAP.xml
rename to ccpp/suites/albatross.xml
index b5a2117f6..e771348a4 100644
--- a/ccpp/suites/suite_FV3_RAP.xml
+++ b/ccpp/suites/albatross.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/alias.json b/ccpp/suites/alias.json
new file mode 100644
index 000000000..76f0c04f6
--- /dev/null
+++ b/ccpp/suites/alias.json
@@ -0,0 +1,43 @@
+{
+    "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",
+    "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": "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": "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",
+    "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_HRRR_gf.xml b/ccpp/suites/auklet.xml
similarity index 89%
rename from ccpp/suites/suite_FV3_HRRR_gf.xml
rename to ccpp/suites/auklet.xml
index 48260ce9f..f7254abd1 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf.xml
+++ b/ccpp/suites/auklet.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HRRR_gf" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HRRR.xml b/ccpp/suites/bald_eagle.xml
similarity index 87%
rename from ccpp/suites/suite_FV3_HRRR.xml
rename to ccpp/suites/bald_eagle.xml
index 2177dc078..b312f7f03 100644
--- a/ccpp/suites/suite_FV3_HRRR.xml
+++ b/ccpp/suites/bald_eagle.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HRRR" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8.xml b/ccpp/suites/bluebird.xml
similarity index 89%
rename from ccpp/suites/suite_FV3_GFS_v17_p8.xml
rename to ccpp/suites/bluebird.xml
index e90d0c42b..7eb111faa 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8.xml
+++ b/ccpp/suites/bluebird.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v17_p8" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml b/ccpp/suites/canary.xml
similarity index 88%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
rename to ccpp/suites/canary.xml
index 57aa71179..3ea38c440 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+++ b/ccpp/suites/canary.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v17_p8_rrtmgp" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy3.xml b/ccpp/suites/chickadee.xml
similarity index 92%
rename from ccpp/suites/suite_RRFSens_phy3.xml
rename to ccpp/suites/chickadee.xml
index da442619d..102eceb02 100644
--- a/ccpp/suites/suite_RRFSens_phy3.xml
+++ b/ccpp/suites/chickadee.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="RRFSens_phy3" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml b/ccpp/suites/condor.xml
similarity index 90%
rename from ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
rename to ccpp/suites/condor.xml
index b63190e65..61fdd7754 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+++ b/ccpp/suites/condor.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v17_coupled_p8_ugwpv1" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
@@ -43,7 +46,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_RRFS_v1nssl.xml b/ccpp/suites/crossbill.xml
similarity index 86%
rename from ccpp/suites/suite_FV3_RRFS_v1nssl.xml
rename to ccpp/suites/crossbill.xml
index e24d2c6f2..9e4569476 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+++ b/ccpp/suites/crossbill.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RRFS_v1nssl"  version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml b/ccpp/suites/crow.xml
similarity index 92%
rename from ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
rename to ccpp/suites/crow.xml
index 922f7f305..8f4aee446 100644
--- a/ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+++ b/ccpp/suites/crow.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15_thompson_mynn_lam3km" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml b/ccpp/suites/dotterel.xml
similarity index 89%
rename from ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
rename to ccpp/suites/dotterel.xml
index 8b495a18f..0b70ca919 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+++ b/ccpp/suites/dotterel.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v17_coupled_p8_sfcocn" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_noah.xml b/ccpp/suites/dove.xml
similarity index 91%
rename from ccpp/suites/suite_FV3_RAP_noah.xml
rename to ccpp/suites/dove.xml
index 80a515356..6ccabb543 100644
--- a/ccpp/suites/suite_FV3_RAP_noah.xml
+++ b/ccpp/suites/dove.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP_noah" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml b/ccpp/suites/egret.xml
similarity index 94%
rename from ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
rename to ccpp/suites/egret.xml
index 3f972d784..28afaf301 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+++ b/ccpp/suites/egret.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v16_csawmg" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_global_nest_v1.xml b/ccpp/suites/falcon.xml
similarity index 93%
rename from ccpp/suites/suite_FV3_global_nest_v1.xml
rename to ccpp/suites/falcon.xml
index 6f55e56f7..ae592ebfc 100644
--- a/ccpp/suites/suite_FV3_global_nest_v1.xml
+++ b/ccpp/suites/falcon.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_global_nest_v1" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml b/ccpp/suites/flamingo.xml
similarity index 92%
rename from ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
rename to ccpp/suites/flamingo.xml
index 0a08ee576..6dadd10e8 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+++ b/ccpp/suites/flamingo.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HAFS_v1_gfdlmp_tedmf" version="1">
+<!--
+DESCRIPTION:
+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> -->
   <group name="fast_physics">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml b/ccpp/suites/flycatcher.xml
similarity index 90%
rename from ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
rename to ccpp/suites/flycatcher.xml
index 0f0022d1c..e3f9b721d 100644
--- a/ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+++ b/ccpp/suites/flycatcher.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HRRR_gf_nogwd" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16_flake.xml b/ccpp/suites/heron.xml
similarity index 92%
rename from ccpp/suites/suite_FV3_GFS_v16_flake.xml
rename to ccpp/suites/heron.xml
index 4f09779a2..f5ff862cc 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_flake.xml
+++ b/ccpp/suites/heron.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v16_flake" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml b/ccpp/suites/hornbill.xml
similarity index 89%
rename from ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
rename to ccpp/suites/hornbill.xml
index fe83ee91d..d0863e777 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+++ b/ccpp/suites/hornbill.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HAFS_v1_thompson_nonsst" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_WoFS_v0.xml b/ccpp/suites/hummingbird.xml
similarity index 88%
rename from ccpp/suites/suite_FV3_WoFS_v0.xml
rename to ccpp/suites/hummingbird.xml
index 140ba9023..c9730f821 100644
--- a/ccpp/suites/suite_FV3_WoFS_v0.xml
+++ b/ccpp/suites/hummingbird.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_WoFS_v0"  version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml b/ccpp/suites/ibis.xml
similarity index 92%
rename from ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
rename to ccpp/suites/ibis.xml
index 509ffea89..b33e84c30 100644
--- a/ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+++ b/ccpp/suites/ibis.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP_unified_ugwp" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/kestrel.xml
similarity index 92%
rename from ccpp/suites/suite_RRFSens_phy4.xml
rename to ccpp/suites/kestrel.xml
index 74a1e8972..36715a34d 100644
--- a/ccpp/suites/suite_RRFSens_phy4.xml
+++ b/ccpp/suites/kestrel.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="RRFSens_phy4" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2.xml b/ccpp/suites/kingfisher.xml
similarity index 90%
rename from ccpp/suites/suite_FV3_GFS_v15p2.xml
rename to ccpp/suites/kingfisher.xml
index c164a1c7e..0e6f9ab5f 100644
--- a/ccpp/suites/suite_FV3_GFS_v15p2.xml
+++ b/ccpp/suites/kingfisher.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v15p2" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml b/ccpp/suites/loon.xml
similarity index 93%
rename from ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
rename to ccpp/suites/loon.xml
index 4de8927b1..0fe9fdc41 100644
--- a/ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+++ b/ccpp/suites/loon.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v16_fv3wam" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml b/ccpp/suites/lorikeet.xml
similarity index 90%
rename from ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
rename to ccpp/suites/lorikeet.xml
index 0e9dc6e5f..72600364a 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+++ b/ccpp/suites/lorikeet.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HAFS_v1_thompson" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml b/ccpp/suites/magpie.xml
similarity index 88%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
rename to ccpp/suites/magpie.xml
index 2a5034035..f8294890d 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+++ b/ccpp/suites/magpie.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v17_p8_ugwpv1" version="1">
+<!--
+DESCRIPTION:
+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="magpie" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">
@@ -43,6 +46,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_RAP_noah_sfcdiff_cires_ugwp.xml b/ccpp/suites/meadowlark.xml
similarity index 89%
rename from ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
rename to ccpp/suites/meadowlark.xml
index 2d6d0377b..6da5f7a6c 100644
--- a/ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+++ b/ccpp/suites/meadowlark.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP_noah_sfcdiff_cires_ugwp" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml b/ccpp/suites/parakeet.xml
similarity index 89%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
rename to ccpp/suites/parakeet.xml
index e9257a7f3..6e1589011 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+++ b/ccpp/suites/parakeet.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v17_p8_c3" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml b/ccpp/suites/pelican.xml
similarity index 84%
rename from ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
rename to ccpp/suites/pelican.xml
index 53007131f..71d255981 100644
--- a/ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+++ b/ccpp/suites/pelican.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v17_coupled_p8" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy5.xml b/ccpp/suites/penguin.xml
similarity index 92%
rename from ccpp/suites/suite_RRFSens_phy5.xml
rename to ccpp/suites/penguin.xml
index 0321e64e9..a4e9641f9 100644
--- a/ccpp/suites/suite_RRFSens_phy5.xml
+++ b/ccpp/suites/penguin.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="RRFSens_phy5" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RRFS_v1beta.xml b/ccpp/suites/pigeon.xml
similarity index 93%
rename from ccpp/suites/suite_FV3_RRFS_v1beta.xml
rename to ccpp/suites/pigeon.xml
index 90165d880..a8624b100 100644
--- a/ccpp/suites/suite_FV3_RRFS_v1beta.xml
+++ b/ccpp/suites/pigeon.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RRFS_v1beta" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy2.xml b/ccpp/suites/ptarmigan.xml
similarity index 92%
rename from ccpp/suites/suite_RRFSens_phy2.xml
rename to ccpp/suites/ptarmigan.xml
index 44cafb249..cfda0c74f 100644
--- a/ccpp/suites/suite_RRFSens_phy2.xml
+++ b/ccpp/suites/ptarmigan.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="RRFSens_phy2" version="1">
+<!--
+DESCRIPTION:
+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> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/puffin.xml
similarity index 93%
rename from ccpp/suites/suite_RRFSens_phy1.xml
rename to ccpp/suites/puffin.xml
index f0de1ebf4..ec236e5f7 100644
--- a/ccpp/suites/suite_RRFSens_phy1.xml
+++ b/ccpp/suites/puffin.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="RRFSens_phy1" version="1">
+<!--
+DESCRIPTION:
+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> -->
   <group name="time_vary">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16.xml b/ccpp/suites/raven.xml
similarity index 90%
rename from ccpp/suites/suite_FV3_GFS_v16.xml
rename to ccpp/suites/raven.xml
index bc5540ce1..495a8f361 100644
--- a/ccpp/suites/suite_FV3_GFS_v16.xml
+++ b/ccpp/suites/raven.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_GFS_v16" version="1">
+<!--
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_flake.xml b/ccpp/suites/sandpiper.xml
similarity index 91%
rename from ccpp/suites/suite_FV3_RAP_flake.xml
rename to ccpp/suites/sandpiper.xml
index 3239355fa..b16c2ccb1 100644
--- a/ccpp/suites/suite_FV3_RAP_flake.xml
+++ b/ccpp/suites/sandpiper.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP_flake" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml b/ccpp/suites/shrike.xml
similarity index 93%
rename from ccpp/suites/suite_FV3_RAP_sfcdiff.xml
rename to ccpp/suites/shrike.xml
index 23bbf1f54..5f334b004 100644
--- a/ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+++ b/ccpp/suites/shrike.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP_sfcdiff" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_clm_lake.xml b/ccpp/suites/snowy_owl.xml
similarity index 85%
rename from ccpp/suites/suite_FV3_RAP_clm_lake.xml
rename to ccpp/suites/snowy_owl.xml
index e7fef4461..dd90697cf 100644
--- a/ccpp/suites/suite_FV3_RAP_clm_lake.xml
+++ b/ccpp/suites/snowy_owl.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP_clm_lake" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_GFS_v16_ras.xml b/ccpp/suites/starling.xml
similarity index 92%
rename from ccpp/suites/suite_FV3_GFS_v16_ras.xml
rename to ccpp/suites/starling.xml
index d27a4887c..42487b3da 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) 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="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 89%
rename from ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
rename to ccpp/suites/tanager.xml
index 3fc78efad..966f9f046 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) 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="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 94%
rename from ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
rename to ccpp/suites/tern.xml
index fb7672ac3..6fbe55f39 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) was used for testing an early prototype of the Global Forecast System (GFS) version 17 release.
+-->
 
-<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 88%
rename from ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
rename to ccpp/suites/toucan.xml
index 70018e7cc..a39282d86 100644
--- a/ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+++ b/ccpp/suites/toucan.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HAFS_v1_thompson_tedmf_gfdlsf" version="1">
+<!--
+DESCRIPTION:
+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">
     <subcycle loop="1">
diff --git a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml b/ccpp/suites/turnstone.xml
similarity index 92%
rename from ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
rename to ccpp/suites/turnstone.xml
index e6294028c..cece7291f 100644
--- a/ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+++ b/ccpp/suites/turnstone.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_RAP_cires_ugwp" version="1">
+<!--
+DESCRIPTION:
+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">
     <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..db6421043 100644
--- a/ccpp/suites/suite_FV3_HRRR_c3.xml
+++ b/ccpp/suites/wren.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<suite name="FV3_HRRR_c3" version="1">
+<!--
+DESCRIPTION:
+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">
     <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