diff --git a/Metadata-standard-names.md b/Metadata-standard-names.md
index 87bb2c0..b1884f6 100644
--- a/Metadata-standard-names.md
+++ b/Metadata-standard-names.md
@@ -253,6 +253,14 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
* `real(kind=kind_phys)`: units = kg m-2
* `mass_content_of_cloud_liquid_water_in_atmosphere_layer`: Mass content of cloud liquid water in atmosphere layer
* `real(kind=kind_phys)`: units = kg m-2
+* `mass_content_of_rain_in_atmosphere_layer`: Mass content of rain in atmosphere layer
+ * `real(kind=kind_phys)`: units = kg m-2
+* `mass_content_of_snow_in_atmosphere_layer`: Mass content of snow in atmosphere layer
+ * `real(kind=kind_phys)`: units = kg m-2
+* `mass_content_of_graupel_in_atmosphere_layer`: Mass content of graupel in atmosphere layer
+ * `real(kind=kind_phys)`: units = kg m-2
+* `mass_content_of_hail_in_atmosphere_layer`: Mass content of hail in atmosphere layer
+ * `real(kind=kind_phys)`: units = kg m-2
* `nonconvective_cloud_area_fraction_in_atmosphere_layer`: cloud area fraction in atmosphere layer excluding clouds produced by the convective schemes
* `real(kind=kind_phys)`: units = fraction
* `relative_humidity`: Relative humidity
@@ -286,24 +294,58 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
* `real(kind=kind_phys)`: units = kg kg-1
* `water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water`: Ratio of the mass of water vapor to the mass of moist air and hydrometeors
* `real(kind=kind_phys)`: units = kg kg-1
+* `water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_at_top_interfaces`: Ratio of the mass of water vapor to the mass of moist air and hydrometeors at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
* `mole_fraction_of_water_vapor`: Mole fraction of water vapor
* `real(kind=kind_phys)`: units = mol mol-1
* `water_vapor_mixing_ratio_wrt_dry_air`: Ratio of the mass of water vapor to the mass of dry air
* `real(kind=kind_phys)`: units = kg kg-1
+* `water_vapor_mixing_ratio_wrt_dry_air_at_top_interfaces`: Ratio of the mass of water vapor to the mass of dry air at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
* `cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water`: Ratio of the mass of liquid water to the mass of moist air and condensed water
* `real(kind=kind_phys)`: units = kg kg-1
+* `cloud_liquid_water_mixing_ratio_wrt_moist_air_and_condensed_water_at_top_interfaces`: Ratio of the mass of liquid water to the mass of moist air and condensed water at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
* `cloud_liquid_water_mixing_ratio_wrt_moist_air`: Ratio of the mass of liquid water to the mass of moist air
* `real(kind=kind_phys)`: units = kg kg-1
* `cloud_liquid_water_mixing_ratio_wrt_dry_air`: Ratio of the mass of liquid water to the mass of dry air
* `real(kind=kind_phys)`: units = kg kg-1
+* `cloud_liquid_water_mixing_ratio_wrt_dry_air_at_top_interfaces`: Ratio of the mass of liquid water to the mass of dry air at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water`: Ratio of the mass of ice to the mass of moist air and condensed water
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water_at_top_interfaces`: Ratio of the mass of ice to the mass of moist air and condensed water at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
* `cloud_ice_mixing_ratio_wrt_dry_air`: Ratio of the mass of ice to the mass of dry air
* `real(kind=kind_phys)`: units = kg kg-1
+* `cloud_ice_mixing_ratio_wrt_dry_air_at_top_interfaces`: Ratio of the mass of ice to the mass of dry air at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
* `rain_mixing_ratio_wrt_moist_air_and_condensed_water`: ratio of the mass of rain to the mass of moist air and condensed water
* `real(kind=kind_phys)`: units = kg kg-1
+* `rain_mixing_ratio_wrt_moist_air_and_condensed_water_at_top_interfaces`: ratio of the mass of rain to the mass of moist air and condensed water at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
* `rain_mixing_ratio_wrt_moist_air`: ratio of the mass of rain to the mass of moist air
* `real(kind=kind_phys)`: units = kg kg-1
* `rain_mixing_ratio_wrt_dry_air`: ratio of the mass of rain to the mass of dry air
* `real(kind=kind_phys)`: units = kg kg-1
+* `rain_mixing_ratio_wrt_dry_air_at_top_interfaces`: ratio of the mass of rain to the mass of dry air at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `total_water_mixing_ratio_wrt_moist_air_and_condensed_water`: ratio of the mass of water to the mass of moist air and condensed water
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `total_water_mixing_ratio_wrt_moist_air_and_condensed_water_at_top_interfaces`: ratio of the mass of water to the mass of moist air and condensed water at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `total_water_mixing_ratio_wrt_dry_air`: ratio of the mass of water to the mass of dry air
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `total_water_mixing_ratio_wrt_dry_air_at_top_interfaces`: ratio of the mass of water to the mass of dry air at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_assuming_saturation`: saturated water vapor mixing ratio with respect to moist air and condensed water
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_at_top_interfaces_assuming_saturation`: saturated water vapor mixing ratio with respect to moist air and condensed water at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = kg kg-1
+* `derivative_of_ln_water_vapor_partial_pressure_assuming_saturation_wrt_air_temperature`: log derivative of the water vapor partial pressure at saturation with respect to air temperature
+ * `real(kind=kind_phys)`: units = K-1
+* `derivative_of_ln_water_vapor_partial_pressure_assuming_saturation_wrt_air_temperature_at_top_interfaces`: log derivative of the water vapor partial pressure at saturation with respect to air temperature at all interfaces excluding surface
+ * `real(kind=kind_phys)`: units = K-1
* `mole_fraction_of_ozone_in_air`: Mole fraction of ozone in air
* `real(kind=kind_phys)`: units = mol mol-1
* `mole_fraction_of_carbon_dioxide_in_air`: Mole fraction of carbon dioxide in air
diff --git a/StandardNamesRules.rst b/StandardNamesRules.rst
index fc8b72c..40beec2 100644
--- a/StandardNamesRules.rst
+++ b/StandardNamesRules.rst
@@ -85,6 +85,8 @@ CCPP Standard Name Rules
be avoided as there is no consensus on whether it refers to
*mixing_ratio_of_water_vapor_wrt_moist_air* or
*mixing_ratio_of_water_vapor_wrt_moist_air_and_condensed_water*.
+ *total_water* can be used to designate water in every form, i.e. water
+ vapor plus condensed water.
#. Volume mixing ratios should be qualified as *volume_mixing_ratio*.
diff --git a/standard_names.xml b/standard_names.xml
index 0005e70..d02ca39 100644
--- a/standard_names.xml
+++ b/standard_names.xml
@@ -406,6 +406,18 @@
real
+
+ real
+
+
+ real
+
+
+ real
+
+
+ real
+
@@ -467,6 +479,10 @@
long_name="Ratio of the mass of water vapor to the mass of moist air and hydrometeors">
real
+
+ real
+
real
@@ -474,10 +490,18 @@
long_name="Ratio of the mass of water vapor to the mass of dry air">
real
+
+ real
+
real
+
+ real
+
real
@@ -486,14 +510,34 @@
long_name="Ratio of the mass of liquid water to the mass of dry air">
real
+
+ real
+
+
+ real
+
+
+ real
+
real
+
+ real
+
real
+
+ real
+
real
@@ -502,6 +546,42 @@
long_name="ratio of the mass of rain to the mass of dry air">
real
+
+ real
+
+
+ real
+
+
+ real
+
+
+ real
+
+
+ real
+
+
+ real
+
+
+ real
+
+
+ real
+
+
+ real
+
real