diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index b536a270d..8b226882f 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -8498,7 +8498,7 @@
 	 typeOfSecondFixedSurface = 168 ;
 	}
 #Y-component of sea water velocity
-'vo' = {
+'voy' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 26 ;
@@ -8506,7 +8506,7 @@
 	 typeOfSecondFixedSurface = 168 ;
 	}
 #X-component of sea water velocity
-'uo' = {
+'uox' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 25 ;
@@ -9629,7 +9629,7 @@
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean Y-component of sea water velocity
-'avg_vo' = {
+'avg_voy' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 26 ;
@@ -9638,7 +9638,7 @@
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean X-component of sea water velocity
-'avg_uo' = {
+'avg_uox' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 25 ;
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index 80baac219..f65e57daf 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -8498,7 +8498,7 @@
 	 typeOfSecondFixedSurface = 168 ;
 	}
 #Y-component of sea water velocity
-'vo' = {
+'voy' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 26 ;
@@ -8506,7 +8506,7 @@
 	 typeOfSecondFixedSurface = 168 ;
 	}
 #X-component of sea water velocity
-'uo' = {
+'uox' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 25 ;
@@ -9629,7 +9629,7 @@
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean Y-component of sea water velocity
-'avg_vo' = {
+'avg_voy' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 26 ;
@@ -9638,7 +9638,7 @@
 	 typeOfStatisticalProcessing = 0 ;
 	}
 #Time-mean X-component of sea water velocity
-'avg_uo' = {
+'avg_uox' = {
 	 discipline = 10 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 25 ;