diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index 35ae4290f..03282aa59 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -7584,6 +7584,24 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 20 ;
 	}
+#Altimeter wave height
+'awh' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 37 ;
+	}
+#Altimeter corrected wave height
+'acwh' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 38 ;
+	}
+#Altimeter range relative correction
+'arrc' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 39 ;
+	}
 #2D wave spectra (single)
 'd2fd' = {
 	 discipline = 10 ;
diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def
index 536def5ab..11b9114f1 100644
--- a/definitions/grib2/localConcepts/ecmf/cfVarName.def
+++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def
@@ -16483,24 +16483,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 245 ;
 	}
-#Altimeter wave height
-'awh' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 246 ;
-	}
-#Altimeter corrected wave height
-'acwh' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 247 ;
-	}
-#Altimeter range relative correction
-'arrc' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 248 ;
-	}
 #10 metre wind direction
 'dwi' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def
index 4a9c09277..a19566c16 100644
--- a/definitions/grib2/localConcepts/ecmf/name.def
+++ b/definitions/grib2/localConcepts/ecmf/name.def
@@ -16483,24 +16483,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 245 ;
 	}
-#Altimeter wave height
-'Altimeter wave height' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 246 ;
-	}
-#Altimeter corrected wave height
-'Altimeter corrected wave height' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 247 ;
-	}
-#Altimeter range relative correction
-'Altimeter range relative correction' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 248 ;
-	}
 #10 metre wind direction
 '10 metre wind direction' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def
index fcf493049..612bfb714 100644
--- a/definitions/grib2/localConcepts/ecmf/paramId.def
+++ b/definitions/grib2/localConcepts/ecmf/paramId.def
@@ -16483,24 +16483,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 245 ;
 	}
-#Altimeter wave height
-'140246' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 246 ;
-	}
-#Altimeter corrected wave height
-'140247' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 247 ;
-	}
-#Altimeter range relative correction
-'140248' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 248 ;
-	}
 #10 metre wind direction
 '140249' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def
index a455af471..568d0bc15 100644
--- a/definitions/grib2/localConcepts/ecmf/shortName.def
+++ b/definitions/grib2/localConcepts/ecmf/shortName.def
@@ -16483,24 +16483,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 245 ;
 	}
-#Altimeter wave height
-'awh' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 246 ;
-	}
-#Altimeter corrected wave height
-'acwh' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 247 ;
-	}
-#Altimeter range relative correction
-'arrc' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 248 ;
-	}
 #10 metre wind direction
 'dwi' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def
index f34952a8a..df75cd083 100644
--- a/definitions/grib2/localConcepts/ecmf/units.def
+++ b/definitions/grib2/localConcepts/ecmf/units.def
@@ -16483,24 +16483,6 @@
 	 parameterCategory = 140 ;
 	 parameterNumber = 245 ;
 	}
-#Altimeter wave height
-'m' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 246 ;
-	}
-#Altimeter corrected wave height
-'m' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 247 ;
-	}
-#Altimeter range relative correction
-'~' = {
-	 discipline = 192 ;
-	 parameterCategory = 140 ;
-	 parameterNumber = 248 ;
-	}
 #10 metre wind direction
 'degrees' = {
 	 discipline = 192 ;
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index 64677eaa0..f9bad8198 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -7584,6 +7584,24 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 20 ;
 	}
+#Altimeter wave height
+'Altimeter wave height' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 37 ;
+	}
+#Altimeter corrected wave height
+'Altimeter corrected wave height' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 38 ;
+	}
+#Altimeter range relative correction
+'Altimeter range relative correction' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 39 ;
+	}
 #2D wave spectra (single)
 '2D wave spectra (single)' = {
 	 discipline = 10 ;
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index 48f1a5f41..75545d089 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -7584,6 +7584,24 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 20 ;
 	}
+#Altimeter wave height
+'140246' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 37 ;
+	}
+#Altimeter corrected wave height
+'140247' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 38 ;
+	}
+#Altimeter range relative correction
+'140248' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 39 ;
+	}
 #2D wave spectra (single)
 '140251' = {
 	 discipline = 10 ;
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index 870548688..784635a4c 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -7584,6 +7584,24 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 20 ;
 	}
+#Altimeter wave height
+'awh' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 37 ;
+	}
+#Altimeter corrected wave height
+'acwh' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 38 ;
+	}
+#Altimeter range relative correction
+'arrc' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 39 ;
+	}
 #2D wave spectra (single)
 '2dfd' = {
 	 discipline = 10 ;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index ab0c0229e..bf2ae1f46 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -7584,6 +7584,24 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 20 ;
 	}
+#Altimeter wave height
+'m' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 37 ;
+	}
+#Altimeter corrected wave height
+'m' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 38 ;
+	}
+#Altimeter range relative correction
+'~' = {
+	 discipline = 10 ;
+	 parameterCategory = 0 ;
+	 parameterNumber = 39 ;
+	}
 #2D wave spectra (single)
 'm**2 s radian**-1' = {
 	 discipline = 10 ;