diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index 7b50ec52f3..63ec63faba 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -416,7 +416,7 @@
 	  <nthrds_cpl>1</nthrds_cpl>
 	</nthrds>
       </pes>
-      <pes pesize="any" compset="_CAM\d0%(CC|CV|CF|WC)">
+      <pes pesize="any" compset="_CAM\d0%(CT|CV|CF|WC)">
 	<comment>none</comment>
 	<ntasks>
 	  <ntasks_atm>-8</ntasks_atm>
@@ -435,7 +435,7 @@
 	  <nthrds_cpl>1</nthrds_cpl>
 	</nthrds>
       </pes>
-      <pes pesize="any" compset="_CAM70%MT%CC">
+      <pes pesize="any" compset="_CAM70%MT%CT">
 	<comment>none</comment>
 	<ntasks>
 	  <ntasks_atm>-8</ntasks_atm>
@@ -512,7 +512,7 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
-      <pes pesize="any" compset="_CAM.*%(CC|WC|CV|CF)">
+      <pes pesize="any" compset="_CAM.*%(CT|WC|CV|CF)">
         <comment>none</comment>
         <ntasks>
           <ntasks_atm>-50</ntasks_atm>
@@ -833,7 +833,7 @@
 	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
-      <pes pesize="any" compset="_CAM\d0%(CC|CV|CF|WC|WX)">
+      <pes pesize="any" compset="_CAM\d0%(CT|CV|CF|WC|WX)">
 	<comment>none</comment>
 	<ntasks>
 	  <ntasks_atm>-4</ntasks_atm>
@@ -1389,7 +1389,7 @@
   </grid>
   <grid name="a%0.9x1.25">
      <mach name="cheyenne">
-      <pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
+      <pes pesize="any" compset="_(CAM50|CAM60)%(CT|CV|CF|WC)">
 	<comment>none</comment>
 	<ntasks>
 	  <ntasks_atm>384</ntasks_atm>
@@ -1418,7 +1418,7 @@
       </pes>
     </mach>
     <mach name="derecho">
-      <pes pesize="any" compset="_(CAM50|CAM60)%(CC|CV|CF|WC)">
+      <pes pesize="any" compset="_(CAM50|CAM60)%(CT|CV|CF|WC)">
 	<comment>none</comment>
 	<ntasks>
 	  <ntasks_atm>-8</ntasks_atm>
@@ -1476,7 +1476,7 @@
       </pes>
     </mach>
     <mach name="cheyenne">
-      <pes pesize="any" compset="_CAM60%(CC|WC)">
+      <pes pesize="any" compset="_CAM60%(CT|WC)">
 	<comment>none</comment>
 	<ntasks>
 	  <ntasks_atm>768</ntasks_atm>
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ca3a39c57d..1528bacc56 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,80 @@
 ===============================================================
 
+Tag name: cam6_4_041
+Originator(s): fvitt
+Date: 16 Oct 2024
+One-line Summary: Adjustments to chemistry compset names
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1164
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+ Adjust chemistry compset names to adopt the new naming conventions (Issue #1158).
+
+Describe any changes made to build system: N/A
+
+Describe any changes made to the namelist: N/A
+
+List any changes to the defaults for the boundary datasets: N/A
+
+Describe any substantial timing or memory changes: N/A
+
+Code reviewed by: cacraigucar
+
+List all files eliminated: N/A
+
+List all files added and what they do: N/A
+
+List all existing files that have been modified, and describe the changes:
+M       cime_config/config_component.xml
+M       cime_config/config_compsets.xml
+ - %CCTSn replaced with %CTnS for the new chemitry compset naming convention
+   where n is the tropospheric chemistry version number
+ - xml reg exp adjustments for new HISTC_ and HISTE_ compset name prefixes
+
+M       cime_config/config_pes.xml
+ - changes to the xml reg exp's for the new chemistry compset names
+
+M       cime_config/testdefs/testlist_cam.xml
+ - changes for new compset names
+ - a fix for ne30 FCHIST test (ne30-->ne30pg3)
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam:
+  FAIL ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s
+  DIFF SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d
+ - pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856
+
+  PEND ERP_Ln9_P24x3.f45_f45_mg37.QPWmaC6.derecho_intel.cam-outfrq9s_mee_fluxes
+  PEND ERS_Ld3.f10_f10_mg37.F1850.derecho_intel.cam-outfrq1d_14dec_ghg_cam7
+  PEND ERS_Ln9_P36x1.mpasa480_mpasa480.F2000climo.derecho_intel.cam-outfrq9s_mpasa480
+  PEND SMS_Lm13.f10_f10_mg37.F2000climo.derecho_intel.cam-outfrq1m
+ - pre-existing failures due to resource limits due to being switched to run in the 'develop' queue rather than 'main'
+
+  PEND SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie
+  PEND SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s
+ - pre-existing failures due to build-namelist error requiring CLM/CTSM external update.
+
+  DIFF ERP_Ld3.ne30pg3_ne30pg3_mg17.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa
+  DIFF SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mg17.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust
+ - new compset short names
+
+derecho/nvhpc/aux_cam: All PASS
+
+izumi/nag/aux_cam:
+  FAIL DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae
+ - pre-existing failure -- issue #670
+
+izumi/gnu/aux_cam: All PASS
+
+Summarize any changes to answers: bit-for-bit unchanged
+
+===============================================================
+===============================================================
+
 Tag name: cam6_4_040
 Originator(s): nusbaume
 Date: Oct 2, 2024