diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def
index da7d86d1e..341173e1e 100644
--- a/definitions/grib1/localConcepts/ecmf/name.def
+++ b/definitions/grib1/localConcepts/ecmf/name.def
@@ -3799,13 +3799,13 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
 	}
@@ -14919,18 +14919,18 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
 	}
@@ -14939,68 +14939,68 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
-'Mean surface sensible heat flux' = {
+#Time-mean surface sensible heat flux
+'Time-mean surface sensible heat flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
-'Mean surface latent heat flux' = {
+#Time-mean surface latent heat flux
+'Time-mean surface latent heat flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
-'Mean short-wave heating rate' = {
+#Time-mean short-wave (solar) heating rate
+'Time-mean short-wave (solar) heating rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
-'Mean long-wave heating rate' = {
+#Time-mean long-wave (thermal) heating rate
+'Time-mean long-wave (thermal) heating rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
-'Mean surface downward solar radiation flux' = {
+#Time-mean surface downward short-wave (solar) radiation flux
+'Time-mean surface downward short-wave (solar) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
-'Mean surface downward thermal radiation flux' = {
+#Time-mean surface downward long-wave (thermal) radiation flux
+'Time-mean surface downward long-wave (thermal) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
-'Mean surface net solar radiation flux' = {
+#Time-mean surface net short-wave (solar) radiation flux
+'Time-mean surface net short-wave (solar) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
-'Mean surface net thermal radiation flux' = {
+#Time-mean surface net long-wave (thermal) radiation flux
+'Time-mean surface net long-wave (thermal) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
-'Mean top net solar radiation flux' = {
+#Time-mean top net short-wave (solar) radiation flux
+'Time-mean top net short-wave (solar) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
-'Mean top net thermal radiation flux' = {
+#Time-mean top net long-wave (thermal) radiation flux
+'Time-mean top net long-wave (thermal) radiation flux' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
-'East-West surface stress rate of accumulation' = {
+#Time-mean eastward turbulent surface stress
+'Time-mean eastward turbulent surface stress' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
-'North-South surface stress rate of accumulation' = {
+#Time-mean northward turbulent surface stress
+'Time-mean northward turbulent surface stress' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
 	}
@@ -15024,48 +15024,48 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
-'Top net solar radiation, clear sky' = {
+#Time-mean top net short-wave (solar) radiation flux, clear sky
+'Time-mean top net short-wave (solar) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
-'Top net thermal radiation, clear sky' = {
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
+'Time-mean top net long-wave (thermal) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
-'Surface net solar radiation, clear sky' = {
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
+'Time-mean surface net short-wave (solar) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
-'Surface net thermal radiation, clear sky' = {
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
+'Time-mean surface net long-wave (thermal) radiation flux, clear sky' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
-'Solar insolation rate of accumulation' = {
+#Time-mean short-wave (solar) insolation rate
+'Time-mean short-wave (solar) insolation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
-'Convective snowfall' = {
+#Time-mean convective snowfall rate
+'Time-mean convective snowfall rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
-'Large scale snowfall' = {
+#Time-mean large-scale snowfall rate
+'Time-mean large-scale snowfall rate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
 	}
diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def
index 69a6d33f7..7a6c1ec49 100644
--- a/definitions/grib1/localConcepts/ecmf/paramId.def
+++ b/definitions/grib1/localConcepts/ecmf/paramId.def
@@ -3799,12 +3799,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
@@ -14919,17 +14919,17 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
@@ -14939,67 +14939,67 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 '172146' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 '172147' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 '172153' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 '172154' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 '172169' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 '172175' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 '172176' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 '172177' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 '172178' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 '172179' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 '172180' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 '172181' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
@@ -15024,47 +15024,47 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '172208' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '172209' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '172210' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '172211' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 '172212' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '172239' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '172240' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def
index 671274ba1..c7ace5ced 100644
--- a/definitions/grib1/localConcepts/ecmf/shortName.def
+++ b/definitions/grib1/localConcepts/ecmf/shortName.def
@@ -3799,12 +3799,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
@@ -14919,17 +14919,17 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
@@ -14939,67 +14939,67 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'msshfl' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'mslhfl' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'mswhr' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'mlwhr' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'msdsrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'msdtrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'msnsrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'msntrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'mtnsrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'mtntrf' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'ewssra' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'nsssra' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
@@ -15024,47 +15024,47 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'soira' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '~' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def
index 0d4dd06c8..3fc2cfbee 100644
--- a/definitions/grib1/localConcepts/ecmf/units.def
+++ b/definitions/grib1/localConcepts/ecmf/units.def
@@ -3799,12 +3799,12 @@
 	 table2Version = 171 ;
 	 indicatorOfParameter = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 8 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 9 ;
@@ -14919,17 +14919,17 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 50 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 144 ;
@@ -14939,67 +14939,67 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 145 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 147 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'K s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'K s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 154 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'N m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'N m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 182 ;
@@ -15024,47 +15024,47 @@
 	 table2Version = 172 ;
 	 indicatorOfParameter = 197 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'W m**-2' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 228 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 'm of water equivalent s**-1' = {
 	 table2Version = 172 ;
 	 indicatorOfParameter = 240 ;
diff --git a/definitions/grib2/localConcepts/cerise/name.def b/definitions/grib2/localConcepts/cerise/name.def
index 3d758e137..e2206e835 100644
--- a/definitions/grib2/localConcepts/cerise/name.def
+++ b/definitions/grib2/localConcepts/cerise/name.def
@@ -125,8 +125,8 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -134,8 +134,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -206,8 +206,8 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -215,8 +215,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -224,8 +224,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -233,8 +233,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -242,8 +242,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -251,8 +251,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
diff --git a/definitions/grib2/localConcepts/cerise/paramId.def b/definitions/grib2/localConcepts/cerise/paramId.def
index a3f2a3407..101a4c3f1 100644
--- a/definitions/grib2/localConcepts/cerise/paramId.def
+++ b/definitions/grib2/localConcepts/cerise/paramId.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/cerise/shortName.def b/definitions/grib2/localConcepts/cerise/shortName.def
index 9d88fb46e..e97fb8d55 100644
--- a/definitions/grib2/localConcepts/cerise/shortName.def
+++ b/definitions/grib2/localConcepts/cerise/shortName.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/cerise/units.def b/definitions/grib2/localConcepts/cerise/units.def
index d5215c398..225cdc32c 100644
--- a/definitions/grib2/localConcepts/cerise/units.def
+++ b/definitions/grib2/localConcepts/cerise/units.def
@@ -125,7 +125,7 @@
 	 parameterCategory = 19 ;
 	 parameterNumber = 193 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -134,7 +134,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -206,7 +206,7 @@
 	 parameterNumber = 193 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -215,7 +215,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -224,7 +224,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -233,7 +233,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -242,7 +242,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -251,7 +251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index 6683b9399..d1424e984 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -2525,8 +2525,8 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -2534,8 +2534,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -18662,8 +18662,8 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18671,8 +18671,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18680,8 +18680,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18689,20 +18689,20 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
-'Mean short-wave heating rate' = {
+#Time-mean short-wave (solar) heating rate
+'Time-mean short-wave (solar) heating rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
-'Mean long-wave heating rate' = {
+#Time-mean long-wave (thermal) heating rate
+'Time-mean long-wave (thermal) heating rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18710,8 +18710,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -18719,8 +18719,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -18728,14 +18728,14 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
-'Convective snowfall' = {
+#Time-mean convective snowfall rate
+'Time-mean convective snowfall rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
-'Large scale snowfall' = {
+#Time-mean large-scale snowfall rate
+'Time-mean large-scale snowfall rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 240 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def
index 0a7edcf7a..363749a77 100644
--- a/definitions/grib2/localConcepts/ecmf/name.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def
@@ -1448,128 +1448,128 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
-'Mean large-scale precipitation rate' = {
+#Time-mean large-scale precipitation rate
+'Time-mean large-scale precipitation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
-'Mean convective precipitation rate' = {
+#Time-mean convective precipitation rate
+'Time-mean convective precipitation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
-'Mean surface sensible heat flux' = {
+#Time-mean surface sensible heat flux
+'Time-mean surface sensible heat flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
-'Mean surface latent heat flux' = {
+#Time-mean surface latent heat flux
+'Time-mean surface latent heat flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
-'Mean surface downward solar radiation flux' = {
+#Time-mean surface downward short-wave (solar) radiation flux
+'Time-mean surface downward short-wave (solar) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
-'Mean surface downward thermal radiation flux' = {
+#Time-mean surface downward long-wave (thermal) radiation flux
+'Time-mean surface downward long-wave (thermal) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
-'Mean surface net solar radiation flux' = {
+#Time-mean surface net short-wave (solar) radiation flux
+'Time-mean surface net short-wave (solar) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
-'Mean surface net thermal radiation flux' = {
+#Time-mean surface net long-wave (thermal) radiation flux
+'Time-mean surface net long-wave (thermal) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
-'Mean top net solar radiation flux' = {
+#Time-mean top net short-wave (solar) radiation flux
+'Time-mean top net short-wave (solar) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
-'Mean top net thermal radiation flux' = {
+#Time-mean top net long-wave (thermal) radiation flux
+'Time-mean top net long-wave (thermal) radiation flux' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
-'East-West surface stress rate of accumulation' = {
+#Time-mean eastward turbulent surface stress
+'Time-mean eastward turbulent surface stress' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
-'North-South surface stress rate of accumulation' = {
+#Time-mean northward turbulent surface stress
+'Time-mean northward turbulent surface stress' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
-'Mean runoff rate' = {
+#Time-mean runoff rate
+'Time-mean runoff rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
-'Top net solar radiation, clear sky' = {
+#Time-mean top net short-wave (solar) radiation flux, clear sky
+'Time-mean top net short-wave (solar) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
-'Top net thermal radiation, clear sky' = {
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
+'Time-mean top net long-wave (thermal) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
-'Surface net solar radiation, clear sky' = {
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
+'Time-mean surface net short-wave (solar) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
-'Surface net thermal radiation, clear sky' = {
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
+'Time-mean surface net long-wave (thermal) radiation flux, clear sky' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
-'Solar insolation rate of accumulation' = {
+#Time-mean short-wave (solar) insolation rate
+'Time-mean short-wave (solar) insolation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 228 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index b4d5e1eab..17112c8b5 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -2525,7 +2525,7 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -2534,7 +2534,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18662,7 +18662,7 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18671,7 +18671,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18680,7 +18680,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18689,19 +18689,19 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 '172153' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 '172154' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18710,7 +18710,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18719,7 +18719,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18728,13 +18728,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '172239' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '172240' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
index 4206da68d..8577cae73 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
@@ -1448,127 +1448,127 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 '172142' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 '172143' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 '172146' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 '172147' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 '172169' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 '172175' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 '172176' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 '172177' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 '172178' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 '172179' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 '172180' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 '172181' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 '172205' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '172208' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '172209' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '172210' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '172211' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 '172212' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index 92cd6d219..c629b8d3a 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -2525,7 +2525,7 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -2534,7 +2534,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18662,7 +18662,7 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18671,7 +18671,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18680,7 +18680,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18689,19 +18689,19 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'mswhr' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'mlwhr' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18710,7 +18710,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18719,7 +18719,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18728,13 +18728,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
index 2e9a391ed..cdae31e61 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
@@ -1448,127 +1448,127 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'mlsprt' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'cprate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'msshfl' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'mslhfl' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'msdsrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'msdtrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'msnsrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'msntrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'mtnsrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'mtntrf' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'ewssra' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'nsssra' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'mrort' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 '~' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'soira' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index b699cdebf..8f0f727a2 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -2525,7 +2525,7 @@
 	 parameterCategory = 171 ;
 	 parameterNumber = 122 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -2534,7 +2534,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18662,7 +18662,7 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 45 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18671,7 +18671,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18680,7 +18680,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18689,19 +18689,19 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean short-wave heating rate
+#Time-mean short-wave (solar) heating rate
 'K s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 153 ;
 	}
-#Mean long-wave heating rate
+#Time-mean long-wave (thermal) heating rate
 'K s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18710,7 +18710,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -18719,7 +18719,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -18728,13 +18728,13 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Convective snowfall
+#Time-mean convective snowfall rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 239 ;
 	}
-#Large scale snowfall
+#Time-mean large-scale snowfall rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def
index f2484c10b..cad86d30c 100644
--- a/definitions/grib2/localConcepts/ecmf/units.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def
@@ -1448,127 +1448,127 @@
 	 parameterCategory = 162 ;
 	 parameterNumber = 215 ;
 	}
-#Mean large-scale precipitation rate
+#Time-mean large-scale precipitation rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 142 ;
 	}
-#Mean convective precipitation rate
+#Time-mean convective precipitation rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 143 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 144 ;
 	}
-#Mean surface sensible heat flux
+#Time-mean surface sensible heat flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 146 ;
 	}
-#Mean surface latent heat flux
+#Time-mean surface latent heat flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 147 ;
 	}
-#Mean surface downward solar radiation flux
+#Time-mean surface downward short-wave (solar) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 169 ;
 	}
-#Mean surface downward thermal radiation flux
+#Time-mean surface downward long-wave (thermal) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 175 ;
 	}
-#Mean surface net solar radiation flux
+#Time-mean surface net short-wave (solar) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 176 ;
 	}
-#Mean surface net thermal radiation flux
+#Time-mean surface net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 177 ;
 	}
-#Mean top net solar radiation flux
+#Time-mean top net short-wave (solar) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 178 ;
 	}
-#Mean top net thermal radiation flux
+#Time-mean top net long-wave (thermal) radiation flux
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 179 ;
 	}
-#East-West surface stress rate of accumulation
+#Time-mean eastward turbulent surface stress
 'N m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 180 ;
 	}
-#North-South surface stress rate of accumulation
+#Time-mean northward turbulent surface stress
 'N m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 181 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 182 ;
 	}
-#Mean runoff rate
+#Time-mean runoff rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 205 ;
 	}
-#Top net solar radiation, clear sky
+#Time-mean top net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 208 ;
 	}
-#Top net thermal radiation, clear sky
+#Time-mean top net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 209 ;
 	}
-#Surface net solar radiation, clear sky
+#Time-mean surface net short-wave (solar) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 210 ;
 	}
-#Surface net thermal radiation, clear sky
+#Time-mean surface net long-wave (thermal) radiation flux, clear sky
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 211 ;
 	}
-#Solar insolation rate of accumulation
+#Time-mean short-wave (solar) insolation rate
 'W m**-2' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
 	 parameterNumber = 212 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 discipline = 192 ;
 	 parameterCategory = 172 ;
diff --git a/definitions/grib2/localConcepts/nextgems/name.def b/definitions/grib2/localConcepts/nextgems/name.def
index fb3140ce6..910acba84 100644
--- a/definitions/grib2/localConcepts/nextgems/name.def
+++ b/definitions/grib2/localConcepts/nextgems/name.def
@@ -136,8 +136,8 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean surface runoff rate
-'Mean surface runoff rate' = {
+#Time-mean surface runoff rate
+'Time-mean surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -145,8 +145,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
-'Mean sub-surface runoff rate' = {
+#Time-mean sub-surface runoff rate
+'Time-mean sub-surface runoff rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
 	 parameterCategory = 0 ;
@@ -273,8 +273,8 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
-'Mean total snowfall rate' = {
+#Time-mean total snowfall rate
+'Time-mean total snowfall rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -282,8 +282,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
-'Evaporation' = {
+#Time-mean evaporation rate
+'Time-mean evaporation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
@@ -291,8 +291,8 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
-'Mean total precipitation rate' = {
+#Time-mean total precipitation rate
+'Time-mean total precipitation rate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
 	 parameterCategory = 1 ;
diff --git a/definitions/grib2/localConcepts/nextgems/paramId.def b/definitions/grib2/localConcepts/nextgems/paramId.def
index 3600bdf67..38562aa12 100644
--- a/definitions/grib2/localConcepts/nextgems/paramId.def
+++ b/definitions/grib2/localConcepts/nextgems/paramId.def
@@ -136,7 +136,7 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 '172008' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -145,7 +145,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 '172009' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -273,7 +273,7 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 '172144' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -282,7 +282,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 '172182' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -291,7 +291,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 '172228' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/nextgems/shortName.def b/definitions/grib2/localConcepts/nextgems/shortName.def
index 3564efb10..345004112 100644
--- a/definitions/grib2/localConcepts/nextgems/shortName.def
+++ b/definitions/grib2/localConcepts/nextgems/shortName.def
@@ -136,7 +136,7 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'msror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -145,7 +145,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'mssror' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -273,7 +273,7 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'mtsfr' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -282,7 +282,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'erate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -291,7 +291,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
diff --git a/definitions/grib2/localConcepts/nextgems/units.def b/definitions/grib2/localConcepts/nextgems/units.def
index 408281738..25801ea57 100644
--- a/definitions/grib2/localConcepts/nextgems/units.def
+++ b/definitions/grib2/localConcepts/nextgems/units.def
@@ -136,7 +136,7 @@
 	 typeOfSecondFixedSurface = 255 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Mean surface runoff rate
+#Time-mean surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -145,7 +145,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean sub-surface runoff rate
+#Time-mean sub-surface runoff rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 2 ;
@@ -273,7 +273,7 @@
 	 scaleFactorOfSecondFixedSurface = missing() ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total snowfall rate
+#Time-mean total snowfall rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -282,7 +282,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Evaporation
+#Time-mean evaporation rate
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;
@@ -291,7 +291,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Mean total precipitation rate
+#Time-mean total precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
 	 discipline = 0 ;