diff --git a/src/diagnostics/MOM_diagnostics.F90 b/src/diagnostics/MOM_diagnostics.F90
index 4818db697b..40b805f9c7 100644
--- a/src/diagnostics/MOM_diagnostics.F90
+++ b/src/diagnostics/MOM_diagnostics.F90
@@ -1007,14 +1007,15 @@ subroutine MOM_diagnostics_init(MIS, ADp, CDp, Time, G, param_file, diag, CS)
   endif
 
   CS%id_mass_wt = register_diag_field('ocean_model', 'mass_wt', diag%axesT1, Time,   &
-      'The column mass for calculating mass-weighted average properties', 'kg m-2',  &
-      cmor_field_name='masscello', cmor_units='kg m-2',                              &
-      cmor_standard_name='sea_water_mass_per_unit_area',                             &
-      cmor_long_name='Sea Water Mass Per Unit Area')
+      'The column mass for calculating mass-weighted average properties', 'kg m-2')
   CS%id_temp_int = register_diag_field('ocean_model', 'temp_int', diag%axesT1, Time, &
-      'The mass weighted column integrated temperature', 'degC kg m-2')
+      'The mass weighted column integrated temperature', 'degC kg m-2',              &
+      cmor_field_name='tomint', cmor_long_name='sea_water_prognostic_temperature_mass_integrated', &
+      cmor_units='degC kg m-2', cmor_standard_name='Sea Water Prognostic Temperature Mass Integrated')
   CS%id_salt_int = register_diag_field('ocean_model', 'salt_int', diag%axesT1, Time, &
-      'The mass weighted column integrated salinity', 'PSU kg m-2')
+      'The mass weighted column integrated salinity', 'PSU kg m-2',                  &
+      cmor_field_name='somint', cmor_long_name='sea_water_salinity_mass_integrated', &
+      cmor_units='psu kg m-2', cmor_standard_name='Sea Water Salinity Mass Integrated')
   CS%id_col_mass = register_diag_field('ocean_model', 'col_mass', diag%axesT1, Time, &
       'The column integrated in situ density', 'kg m-2')
   CS%id_col_ht = register_diag_field('ocean_model', 'col_height', diag%axesT1, Time, &
diff --git a/src/parameterizations/vertical/MOM_diabatic_driver.F90 b/src/parameterizations/vertical/MOM_diabatic_driver.F90
index 43cee2a162..ed6398be12 100644
--- a/src/parameterizations/vertical/MOM_diabatic_driver.F90
+++ b/src/parameterizations/vertical/MOM_diabatic_driver.F90
@@ -1860,8 +1860,10 @@ subroutine diabatic_driver_init(Time, G, param_file, useALEalgorithm, diag, &
       Time, "The volume flux added to stop the ocean from drying out and becoming negative in depth", &
       "meter second-1")
   if (CS%id_createdH>0) allocate(CS%createdH(isd:ied,jsd:jed))
-  CS%id_MLD_003 = register_diag_field('ocean_model','MLD_003',diag%axesT1,Time, &
-      'Mixed layer depth (delta rho = 0.03)', 'meter', cmor_field_name='mlotst', cmor_long_name='Ocean Mixed Layer Thickness Defined by Sigma T', cmor_units='m', cmor_standard_name='ocean_mixed_layer_thickness_defined_by_sigma_t')
+  CS%id_MLD_003 = register_diag_field('ocean_model','MLD_003',diag%axesT1,Time,        &
+      'Mixed layer depth (delta rho = 0.03)', 'meter', cmor_field_name='mlotst',       &
+      cmor_long_name='Ocean Mixed Layer Thickness Defined by Sigma T', cmor_units='m', &
+      cmor_standard_name='ocean_mixed_layer_thickness_defined_by_sigma_t')
   CS%id_MLD_0125 = register_diag_field('ocean_model','MLD_0125',diag%axesT1,Time, &
       'Mixed layer depth (delta rho = 0.125)', 'meter')
   CS%id_subMLN2  = register_diag_field('ocean_model','subML_N2',diag%axesT1,Time, &