diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def
index 801bd6b5d..6794b74a6 100644
--- a/definitions/grib2/localConcepts/ecmf/cfVarName.def
+++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def
@@ -224,18 +224,6 @@
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 24 ;
 	}
-#Mean temperature at 2 metres in the last 24 hours
-'mean2t24' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours
-'mn2d24' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 56 ;
-	}
 #Observation count
 'obct' = {
 	 discipline = 192 ;
@@ -14443,18 +14431,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 54 ;
 	}
-#Mean 2 metre temperature in the last 24 hours gradient
-'mean2t24grd' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours gradient
-'mn2d24grd' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 56 ;
-	}
 #Downward UV radiation at the surface gradient
 'uvbgrd' = {
 	 discipline = 192 ;
@@ -15727,12 +15703,6 @@
 	 parameterCategory = 130 ;
 	 parameterNumber = 231 ;
 	}
-#Mean vertical velocity
-'mvv' = {
-	 discipline = 192 ;
-	 parameterCategory = 130 ;
-	 parameterNumber = 232 ;
-	}
 #2m temperature anomaly of at least +2K
 't2ag2' = {
 	 discipline = 192 ;
@@ -16631,30 +16601,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 200 ;
 	}
-#Standard deviation wave height
-'sdhs' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 240 ;
-	}
-#Mean of 10 metre wind speed
-'mu10' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 241 ;
-	}
-#Mean wind direction
-'mdwi' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 242 ;
-	}
-#Standard deviation of 10 metre wind speed
-'sdu' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 243 ;
-	}
 #2D wave spectra (multiple)
 'd2sp' = {
 	 discipline = 192 ;
@@ -18848,18 +18794,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 145 ;
 	}
-#Mean surface sensible heat flux
-'msshfl' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 146 ;
-	}
-#Mean surface latent heat flux
-'mslhfl' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 147 ;
-	}
 #Mean short-wave heating rate
 'mswhr' = {
 	 discipline = 192 ;
@@ -18872,54 +18806,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Mean surface downward solar radiation flux
-'msdsrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 169 ;
-	}
-#Mean surface downward thermal radiation flux
-'msdtrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 175 ;
-	}
-#Mean surface net solar radiation flux
-'msnsrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 176 ;
-	}
-#Mean surface net thermal radiation flux
-'msntrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 177 ;
-	}
-#Mean top net solar radiation flux
-'mtnsrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 178 ;
-	}
-#Mean top net thermal radiation flux
-'mtntrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 179 ;
-	}
-#East-West surface stress rate of accumulation
-'ewssra' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 180 ;
-	}
-#North-South surface stress rate of accumulation
-'nsssra' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 181 ;
-	}
 #Evaporation
 'erate' = {
 	 localTablesVersion = 1 ;
@@ -18962,36 +18848,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Top net solar radiation, clear sky
-'p208.172' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'p209.172' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 209 ;
-	}
-#Surface net solar radiation, clear sky
-'p210.172' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 210 ;
-	}
-#Surface net thermal radiation, clear sky
-'p211.172' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 211 ;
-	}
-#Solar insolation rate of accumulation
-'soira' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 212 ;
-	}
 #Mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def
index 4af98e981..c1c9099b5 100644
--- a/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/cfVarName.legacy.def
@@ -1627,3 +1627,147 @@
  parameterCategory = 162 ;
  parameterNumber = 215 ;
 }
+#Mean vertical velocity
+'mvv' = {
+ discipline = 192 ;
+ parameterCategory = 130 ;
+ parameterNumber = 232 ;
+}
+#Mean surface sensible heat flux
+'msshfl' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 146 ;
+}
+#Mean surface latent heat flux
+'mslhfl' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 147 ;
+}
+#Mean temperature at 2 metres in the last 24 hours
+'mean2t24' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre temperature in the last 24 hours gradient
+'mean2t24grd' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours
+'mn2d24' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 56 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours gradient
+'mn2d24grd' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 56 ;
+}
+#Mean surface downward solar radiation flux
+'msdsrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 169 ;
+}
+#Mean surface downward thermal radiation flux
+'msdtrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 175 ;
+}
+#Mean surface net solar radiation flux
+'msnsrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 176 ;
+}
+#Mean surface net thermal radiation flux
+'msntrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 177 ;
+}
+#Mean top net solar radiation flux
+'mtnsrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 178 ;
+}
+#Mean top net thermal radiation flux
+'mtntrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 179 ;
+}
+#East-West surface stress rate of accumulation
+'ewssra' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 180 ;
+}
+#North-South surface stress rate of accumulation
+'nsssra' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 181 ;
+}
+#Standard deviation wave height
+'sdhs' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 240 ;
+}
+#Mean of 10 metre wind speed
+'mu10' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 241 ;
+}
+#Mean wind direction
+'mdwi' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 242 ;
+}
+#Standard deviation of 10 metre wind speed
+'sdu' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 243 ;
+}
+#Top net solar radiation, clear sky
+'p208.172' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 208 ;
+}
+#Top net thermal radiation, clear sky
+'p209.172' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 209 ;
+}
+#Surface net solar radiation, clear sky
+'p210.172' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 210 ;
+}
+#Surface net thermal radiation, clear sky
+'p211.172' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 211 ;
+}
+#Solar insolation rate of accumulation
+'soira' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 212 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index d615c6e98..c5d77647c 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -224,18 +224,6 @@
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 24 ;
 	}
-#Mean temperature at 2 metres in the last 24 hours
-'Mean temperature at 2 metres in the last 24 hours' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours
-'Mean 2 metre dewpoint temperature in the last 24 hours' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 56 ;
-	}
 #Observation count
 'Observation count' = {
 	 discipline = 192 ;
@@ -14443,18 +14431,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 54 ;
 	}
-#Mean 2 metre temperature in the last 24 hours gradient
-'Mean 2 metre temperature in the last 24 hours gradient' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours gradient
-'Mean 2 metre dewpoint temperature in the last 24 hours gradient' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 56 ;
-	}
 #Downward UV radiation at the surface gradient
 'Downward UV radiation at the surface gradient' = {
 	 discipline = 192 ;
@@ -15727,12 +15703,6 @@
 	 parameterCategory = 130 ;
 	 parameterNumber = 231 ;
 	}
-#Mean vertical velocity
-'Mean vertical velocity' = {
-	 discipline = 192 ;
-	 parameterCategory = 130 ;
-	 parameterNumber = 232 ;
-	}
 #2m temperature anomaly of at least +2K
 '2m temperature anomaly of at least +2K' = {
 	 discipline = 192 ;
@@ -16631,30 +16601,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 200 ;
 	}
-#Standard deviation wave height
-'Standard deviation wave height' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 240 ;
-	}
-#Mean of 10 metre wind speed
-'Mean of 10 metre wind speed' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 241 ;
-	}
-#Mean wind direction
-'Mean wind direction' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 242 ;
-	}
-#Standard deviation of 10 metre wind speed
-'Standard deviation of 10 metre wind speed' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 243 ;
-	}
 #2D wave spectra (multiple)
 '2D wave spectra (multiple)' = {
 	 discipline = 192 ;
@@ -18848,18 +18794,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 145 ;
 	}
-#Mean surface sensible heat flux
-'Mean surface sensible heat flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 146 ;
-	}
-#Mean surface latent heat flux
-'Mean surface latent heat flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 147 ;
-	}
 #Mean short-wave heating rate
 'Mean short-wave heating rate' = {
 	 discipline = 192 ;
@@ -18872,54 +18806,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Mean surface downward solar radiation flux
-'Mean surface downward solar radiation flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 169 ;
-	}
-#Mean surface downward thermal radiation flux
-'Mean surface downward thermal radiation flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 175 ;
-	}
-#Mean surface net solar radiation flux
-'Mean surface net solar radiation flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 176 ;
-	}
-#Mean surface net thermal radiation flux
-'Mean surface net thermal radiation flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 177 ;
-	}
-#Mean top net solar radiation flux
-'Mean top net solar radiation flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 178 ;
-	}
-#Mean top net thermal radiation flux
-'Mean top net thermal radiation flux' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 179 ;
-	}
-#East-West surface stress rate of accumulation
-'East-West surface stress rate of accumulation' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 180 ;
-	}
-#North-South surface stress rate of accumulation
-'North-South surface stress rate of accumulation' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 181 ;
-	}
 #Evaporation
 'Evaporation' = {
 	 localTablesVersion = 1 ;
@@ -18962,36 +18848,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Top net solar radiation, clear sky
-'Top net solar radiation, clear sky' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'Top net thermal radiation, clear sky' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 209 ;
-	}
-#Surface net solar radiation, clear sky
-'Surface net solar radiation, clear sky' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 210 ;
-	}
-#Surface net thermal radiation, clear sky
-'Surface net thermal radiation, clear sky' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 211 ;
-	}
-#Solar insolation rate of accumulation
-'Solar insolation rate of accumulation' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 212 ;
-	}
 #Mean total precipitation rate
 'Mean total precipitation rate' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.legacy.def b/definitions/grib2/localConcepts/ecmf/name.legacy.def
index 42f558b37..7a451911c 100644
--- a/definitions/grib2/localConcepts/ecmf/name.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/name.legacy.def
@@ -1627,3 +1627,147 @@
  parameterCategory = 162 ;
  parameterNumber = 215 ;
 }
+#Mean vertical velocity
+'Mean vertical velocity' = {
+ discipline = 192 ;
+ parameterCategory = 130 ;
+ parameterNumber = 232 ;
+}
+#Mean surface sensible heat flux
+'Mean surface sensible heat flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 146 ;
+}
+#Mean surface latent heat flux
+'Mean surface latent heat flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 147 ;
+}
+#Mean temperature at 2 metres in the last 24 hours
+'Mean temperature at 2 metres in the last 24 hours' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre temperature in the last 24 hours gradient
+'Mean 2 metre temperature in the last 24 hours gradient' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours
+'Mean 2 metre dewpoint temperature in the last 24 hours' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 56 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours gradient
+'Mean 2 metre dewpoint temperature in the last 24 hours gradient' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 56 ;
+}
+#Mean surface downward solar radiation flux
+'Mean surface downward solar radiation flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 169 ;
+}
+#Mean surface downward thermal radiation flux
+'Mean surface downward thermal radiation flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 175 ;
+}
+#Mean surface net solar radiation flux
+'Mean surface net solar radiation flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 176 ;
+}
+#Mean surface net thermal radiation flux
+'Mean surface net thermal radiation flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 177 ;
+}
+#Mean top net solar radiation flux
+'Mean top net solar radiation flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 178 ;
+}
+#Mean top net thermal radiation flux
+'Mean top net thermal radiation flux' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 179 ;
+}
+#East-West surface stress rate of accumulation
+'East-West surface stress rate of accumulation' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 180 ;
+}
+#North-South surface stress rate of accumulation
+'North-South surface stress rate of accumulation' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 181 ;
+}
+#Standard deviation wave height
+'Standard deviation wave height' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 240 ;
+}
+#Mean of 10 metre wind speed
+'Mean of 10 metre wind speed' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 241 ;
+}
+#Mean wind direction
+'Mean wind direction' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 242 ;
+}
+#Standard deviation of 10 metre wind speed
+'Standard deviation of 10 metre wind speed' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 243 ;
+}
+#Top net solar radiation, clear sky
+'Top net solar radiation, clear sky' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 208 ;
+}
+#Top net thermal radiation, clear sky
+'Top net thermal radiation, clear sky' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 209 ;
+}
+#Surface net solar radiation, clear sky
+'Surface net solar radiation, clear sky' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 210 ;
+}
+#Surface net thermal radiation, clear sky
+'Surface net thermal radiation, clear sky' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 211 ;
+}
+#Solar insolation rate of accumulation
+'Solar insolation rate of accumulation' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 212 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index 46c8cd040..12fe43ab4 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -224,18 +224,6 @@
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 24 ;
 	}
-#Mean temperature at 2 metres in the last 24 hours
-'55' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours
-'56' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 56 ;
-	}
 #Observation count
 '62' = {
 	 discipline = 192 ;
@@ -14443,18 +14431,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 54 ;
 	}
-#Mean 2 metre temperature in the last 24 hours gradient
-'129055' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours gradient
-'129056' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 56 ;
-	}
 #Downward UV radiation at the surface gradient
 '129057' = {
 	 discipline = 192 ;
@@ -15727,12 +15703,6 @@
 	 parameterCategory = 130 ;
 	 parameterNumber = 231 ;
 	}
-#Mean vertical velocity
-'130232' = {
-	 discipline = 192 ;
-	 parameterCategory = 130 ;
-	 parameterNumber = 232 ;
-	}
 #2m temperature anomaly of at least +2K
 '131001' = {
 	 discipline = 192 ;
@@ -16631,30 +16601,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 200 ;
 	}
-#Standard deviation wave height
-'140240' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 240 ;
-	}
-#Mean of 10 metre wind speed
-'140241' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 241 ;
-	}
-#Mean wind direction
-'140242' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 242 ;
-	}
-#Standard deviation of 10 metre wind speed
-'140243' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 243 ;
-	}
 #2D wave spectra (multiple)
 '140250' = {
 	 discipline = 192 ;
@@ -18848,18 +18794,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 145 ;
 	}
-#Mean surface sensible heat flux
-'172146' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 146 ;
-	}
-#Mean surface latent heat flux
-'172147' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 147 ;
-	}
 #Mean short-wave heating rate
 '172153' = {
 	 discipline = 192 ;
@@ -18872,54 +18806,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Mean surface downward solar radiation flux
-'172169' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 169 ;
-	}
-#Mean surface downward thermal radiation flux
-'172175' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 175 ;
-	}
-#Mean surface net solar radiation flux
-'172176' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 176 ;
-	}
-#Mean surface net thermal radiation flux
-'172177' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 177 ;
-	}
-#Mean top net solar radiation flux
-'172178' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 178 ;
-	}
-#Mean top net thermal radiation flux
-'172179' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 179 ;
-	}
-#East-West surface stress rate of accumulation
-'172180' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 180 ;
-	}
-#North-South surface stress rate of accumulation
-'172181' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 181 ;
-	}
 #Evaporation
 '172182' = {
 	 localTablesVersion = 1 ;
@@ -18962,36 +18848,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Top net solar radiation, clear sky
-'172208' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'172209' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 209 ;
-	}
-#Surface net solar radiation, clear sky
-'172210' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 210 ;
-	}
-#Surface net thermal radiation, clear sky
-'172211' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 211 ;
-	}
-#Solar insolation rate of accumulation
-'172212' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 212 ;
-	}
 #Mean total precipitation rate
 '172228' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
index 082896fc5..4413e87b9 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.legacy.def
@@ -1627,3 +1627,147 @@
  parameterCategory = 162 ;
  parameterNumber = 215 ;
 }
+#Mean vertical velocity
+'130232' = {
+ discipline = 192 ;
+ parameterCategory = 130 ;
+ parameterNumber = 232 ;
+}
+#Mean surface sensible heat flux
+'172146' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 146 ;
+}
+#Mean surface latent heat flux
+'172147' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 147 ;
+}
+#Mean temperature at 2 metres in the last 24 hours
+'55' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre temperature in the last 24 hours gradient
+'129055' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours
+'56' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 56 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours gradient
+'129056' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 56 ;
+}
+#Mean surface downward solar radiation flux
+'172169' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 169 ;
+}
+#Mean surface downward thermal radiation flux
+'172175' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 175 ;
+}
+#Mean surface net solar radiation flux
+'172176' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 176 ;
+}
+#Mean surface net thermal radiation flux
+'172177' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 177 ;
+}
+#Mean top net solar radiation flux
+'172178' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 178 ;
+}
+#Mean top net thermal radiation flux
+'172179' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 179 ;
+}
+#East-West surface stress rate of accumulation
+'172180' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 180 ;
+}
+#North-South surface stress rate of accumulation
+'172181' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 181 ;
+}
+#Standard deviation wave height
+'140240' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 240 ;
+}
+#Mean of 10 metre wind speed
+'140241' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 241 ;
+}
+#Mean wind direction
+'140242' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 242 ;
+}
+#Standard deviation of 10 metre wind speed
+'140243' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 243 ;
+}
+#Top net solar radiation, clear sky
+'172208' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 208 ;
+}
+#Top net thermal radiation, clear sky
+'172209' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 209 ;
+}
+#Surface net solar radiation, clear sky
+'172210' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 210 ;
+}
+#Surface net thermal radiation, clear sky
+'172211' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 211 ;
+}
+#Solar insolation rate of accumulation
+'172212' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 212 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index 563048c1b..b476da6d8 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -224,18 +224,6 @@
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 24 ;
 	}
-#Mean temperature at 2 metres in the last 24 hours
-'mean2t24' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours
-'mn2d24' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 56 ;
-	}
 #Observation count
 'obct' = {
 	 discipline = 192 ;
@@ -14443,18 +14431,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 54 ;
 	}
-#Mean 2 metre temperature in the last 24 hours gradient
-'mean2t24grd' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours gradient
-'mn2d24grd' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 56 ;
-	}
 #Downward UV radiation at the surface gradient
 'uvbgrd' = {
 	 discipline = 192 ;
@@ -15727,12 +15703,6 @@
 	 parameterCategory = 130 ;
 	 parameterNumber = 231 ;
 	}
-#Mean vertical velocity
-'mvv' = {
-	 discipline = 192 ;
-	 parameterCategory = 130 ;
-	 parameterNumber = 232 ;
-	}
 #2m temperature anomaly of at least +2K
 '2tag2' = {
 	 discipline = 192 ;
@@ -16631,30 +16601,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 200 ;
 	}
-#Standard deviation wave height
-'sdhs' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 240 ;
-	}
-#Mean of 10 metre wind speed
-'mu10' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 241 ;
-	}
-#Mean wind direction
-'mdwi' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 242 ;
-	}
-#Standard deviation of 10 metre wind speed
-'sdu' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 243 ;
-	}
 #2D wave spectra (multiple)
 '2dsp' = {
 	 discipline = 192 ;
@@ -18848,18 +18794,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 145 ;
 	}
-#Mean surface sensible heat flux
-'msshfl' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 146 ;
-	}
-#Mean surface latent heat flux
-'mslhfl' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 147 ;
-	}
 #Mean short-wave heating rate
 'mswhr' = {
 	 discipline = 192 ;
@@ -18872,54 +18806,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Mean surface downward solar radiation flux
-'msdsrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 169 ;
-	}
-#Mean surface downward thermal radiation flux
-'msdtrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 175 ;
-	}
-#Mean surface net solar radiation flux
-'msnsrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 176 ;
-	}
-#Mean surface net thermal radiation flux
-'msntrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 177 ;
-	}
-#Mean top net solar radiation flux
-'mtnsrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 178 ;
-	}
-#Mean top net thermal radiation flux
-'mtntrf' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 179 ;
-	}
-#East-West surface stress rate of accumulation
-'ewssra' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 180 ;
-	}
-#North-South surface stress rate of accumulation
-'nsssra' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 181 ;
-	}
 #Evaporation
 'erate' = {
 	 localTablesVersion = 1 ;
@@ -18962,36 +18848,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Top net solar radiation, clear sky
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 209 ;
-	}
-#Surface net solar radiation, clear sky
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 210 ;
-	}
-#Surface net thermal radiation, clear sky
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 211 ;
-	}
-#Solar insolation rate of accumulation
-'soira' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 212 ;
-	}
 #Mean total precipitation rate
 'tprate' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
index a09f11b7f..1a5608823 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.legacy.def
@@ -1627,3 +1627,147 @@
  parameterCategory = 162 ;
  parameterNumber = 215 ;
 }
+#Mean vertical velocity
+'mvv' = {
+ discipline = 192 ;
+ parameterCategory = 130 ;
+ parameterNumber = 232 ;
+}
+#Mean surface sensible heat flux
+'msshfl' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 146 ;
+}
+#Mean surface latent heat flux
+'mslhfl' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 147 ;
+}
+#Mean temperature at 2 metres in the last 24 hours
+'mean2t24' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre temperature in the last 24 hours gradient
+'mean2t24grd' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours
+'mn2d24' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 56 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours gradient
+'mn2d24grd' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 56 ;
+}
+#Mean surface downward solar radiation flux
+'msdsrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 169 ;
+}
+#Mean surface downward thermal radiation flux
+'msdtrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 175 ;
+}
+#Mean surface net solar radiation flux
+'msnsrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 176 ;
+}
+#Mean surface net thermal radiation flux
+'msntrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 177 ;
+}
+#Mean top net solar radiation flux
+'mtnsrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 178 ;
+}
+#Mean top net thermal radiation flux
+'mtntrf' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 179 ;
+}
+#East-West surface stress rate of accumulation
+'ewssra' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 180 ;
+}
+#North-South surface stress rate of accumulation
+'nsssra' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 181 ;
+}
+#Standard deviation wave height
+'sdhs' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 240 ;
+}
+#Mean of 10 metre wind speed
+'mu10' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 241 ;
+}
+#Mean wind direction
+'mdwi' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 242 ;
+}
+#Standard deviation of 10 metre wind speed
+'sdu' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 243 ;
+}
+#Top net solar radiation, clear sky
+'~' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 208 ;
+}
+#Top net thermal radiation, clear sky
+'~' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 209 ;
+}
+#Surface net solar radiation, clear sky
+'~' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 210 ;
+}
+#Surface net thermal radiation, clear sky
+'~' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 211 ;
+}
+#Solar insolation rate of accumulation
+'soira' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 212 ;
+}
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index 6adc93e89..1629e52b0 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -224,18 +224,6 @@
 	 typeOfStatisticalProcessing = 3 ;
 	 lengthOfTimeRange = 24 ;
 	}
-#Mean temperature at 2 metres in the last 24 hours
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 128 ;
-	 parameterNumber = 56 ;
-	}
 #Observation count
 '~' = {
 	 discipline = 192 ;
@@ -14443,18 +14431,6 @@
 	 parameterCategory = 129 ;
 	 parameterNumber = 54 ;
 	}
-#Mean 2 metre temperature in the last 24 hours gradient
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 55 ;
-	}
-#Mean 2 metre dewpoint temperature in the last 24 hours gradient
-'K' = {
-	 discipline = 192 ;
-	 parameterCategory = 129 ;
-	 parameterNumber = 56 ;
-	}
 #Downward UV radiation at the surface gradient
 'J m**-2' = {
 	 discipline = 192 ;
@@ -15727,12 +15703,6 @@
 	 parameterCategory = 130 ;
 	 parameterNumber = 231 ;
 	}
-#Mean vertical velocity
-'Pa s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 130 ;
-	 parameterNumber = 232 ;
-	}
 #2m temperature anomaly of at least +2K
 '%' = {
 	 discipline = 192 ;
@@ -16631,30 +16601,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 200 ;
 	}
-#Standard deviation wave height
-'m' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 240 ;
-	}
-#Mean of 10 metre wind speed
-'m s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 241 ;
-	}
-#Mean wind direction
-'degrees' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 242 ;
-	}
-#Standard deviation of 10 metre wind speed
-'m s**-1' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 243 ;
-	}
 #2D wave spectra (multiple)
 'm**2 s radian**-1' = {
 	 discipline = 192 ;
@@ -18848,18 +18794,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 145 ;
 	}
-#Mean surface sensible heat flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 146 ;
-	}
-#Mean surface latent heat flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 147 ;
-	}
 #Mean short-wave heating rate
 'K s**-1' = {
 	 discipline = 192 ;
@@ -18872,54 +18806,6 @@
 	 parameterCategory = 172 ;
 	 parameterNumber = 154 ;
 	}
-#Mean surface downward solar radiation flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 169 ;
-	}
-#Mean surface downward thermal radiation flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 175 ;
-	}
-#Mean surface net solar radiation flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 176 ;
-	}
-#Mean surface net thermal radiation flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 177 ;
-	}
-#Mean top net solar radiation flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 178 ;
-	}
-#Mean top net thermal radiation flux
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 179 ;
-	}
-#East-West surface stress rate of accumulation
-'N m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 180 ;
-	}
-#North-South surface stress rate of accumulation
-'N m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 181 ;
-	}
 #Evaporation
 'm of water equivalent s**-1' = {
 	 localTablesVersion = 1 ;
@@ -18962,36 +18848,6 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 0 ;
 	}
-#Top net solar radiation, clear sky
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 208 ;
-	}
-#Top net thermal radiation, clear sky
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 209 ;
-	}
-#Surface net solar radiation, clear sky
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 210 ;
-	}
-#Surface net thermal radiation, clear sky
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 211 ;
-	}
-#Solar insolation rate of accumulation
-'W m**-2' = {
-	 discipline = 192 ;
-	 parameterCategory = 172 ;
-	 parameterNumber = 212 ;
-	}
 #Mean total precipitation rate
 'm s**-1' = {
 	 localTablesVersion = 1 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.legacy.def b/definitions/grib2/localConcepts/ecmf/units.legacy.def
index 6094190f0..b6a28f51b 100644
--- a/definitions/grib2/localConcepts/ecmf/units.legacy.def
+++ b/definitions/grib2/localConcepts/ecmf/units.legacy.def
@@ -1627,3 +1627,147 @@
  parameterCategory = 162 ;
  parameterNumber = 215 ;
 }
+#Mean vertical velocity
+'Pa s**-1' = {
+ discipline = 192 ;
+ parameterCategory = 130 ;
+ parameterNumber = 232 ;
+}
+#Mean surface sensible heat flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 146 ;
+}
+#Mean surface latent heat flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 147 ;
+}
+#Mean temperature at 2 metres in the last 24 hours
+'K' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre temperature in the last 24 hours gradient
+'K' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 55 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours
+'K' = {
+ discipline = 192 ;
+ parameterCategory = 128 ;
+ parameterNumber = 56 ;
+}
+#Mean 2 metre dewpoint temperature in the last 24 hours gradient
+'K' = {
+ discipline = 192 ;
+ parameterCategory = 129 ;
+ parameterNumber = 56 ;
+}
+#Mean surface downward solar radiation flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 169 ;
+}
+#Mean surface downward thermal radiation flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 175 ;
+}
+#Mean surface net solar radiation flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 176 ;
+}
+#Mean surface net thermal radiation flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 177 ;
+}
+#Mean top net solar radiation flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 178 ;
+}
+#Mean top net thermal radiation flux
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 179 ;
+}
+#East-West surface stress rate of accumulation
+'N m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 180 ;
+}
+#North-South surface stress rate of accumulation
+'N m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 181 ;
+}
+#Standard deviation wave height
+'m' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 240 ;
+}
+#Mean of 10 metre wind speed
+'m s**-1' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 241 ;
+}
+#Mean wind direction
+'degrees' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 242 ;
+}
+#Standard deviation of 10 metre wind speed
+'m s**-1' = {
+ discipline = 192 ;
+ parameterCategory = 140 ;
+ parameterNumber = 243 ;
+}
+#Top net solar radiation, clear sky
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 208 ;
+}
+#Top net thermal radiation, clear sky
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 209 ;
+}
+#Surface net solar radiation, clear sky
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 210 ;
+}
+#Surface net thermal radiation, clear sky
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 211 ;
+}
+#Solar insolation rate of accumulation
+'W m**-2' = {
+ discipline = 192 ;
+ parameterCategory = 172 ;
+ parameterNumber = 212 ;
+}