From 9d40294f6b4f04d4c5920b051c57c63838279d34 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 11 Nov 2019 12:18:28 +0000
Subject: [PATCH 01/38] ECC-1006: Checks for LD 12 and 16

---
 definitions/grib1/local.98.12.def         |  2 +-
 definitions/grib1/local.98.16.def         |  2 +-
 src/grib_accessor_class_g1forecastmonth.c | 21 ++++++++++++++-------
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/definitions/grib1/local.98.12.def b/definitions/grib1/local.98.12.def
index 8616df2ac..d78d0e4cb 100644
--- a/definitions/grib1/local.98.12.def
+++ b/definitions/grib1/local.98.12.def
@@ -45,7 +45,7 @@ transient forecastTime=forecastMonth - 1;
 transient typeOfTimeIncrement = 3;
 
 # Old GRIBS do not have forecast forecastMonth set. It is computed from verifyingMonth
-meta marsForecastMonth g1forecastmonth(verifyingMonth,dataDate,day,hour,forecastMonth) : read_only;
+meta marsForecastMonth g1forecastmonth(verifyingMonth,dataDate,day,hour,forecastMonth,zero) : read_only;
 
 alias origin = centre;
 alias number = perturbationNumber;
diff --git a/definitions/grib1/local.98.16.def b/definitions/grib1/local.98.16.def
index 6fe55525c..fccb2612c 100644
--- a/definitions/grib1/local.98.16.def
+++ b/definitions/grib1/local.98.16.def
@@ -45,7 +45,7 @@ transient forecastTime=forecastMonth - 1;
 transient typeOfTimeIncrement = 3;
 
 # Old GRIBS do not have forecast forecastMonth set. It is computed from verifyingMonth
-meta marsForecastMonth g1forecastmonth(verifyingMonth,dataDate,day,hour,forecastMonth) : read_only;
+meta marsForecastMonth g1forecastmonth(verifyingMonth,dataDate,day,hour,forecastMonth,one) : read_only;
 
 alias origin = centre;
 alias number = perturbationNumber;
diff --git a/src/grib_accessor_class_g1forecastmonth.c b/src/grib_accessor_class_g1forecastmonth.c
index 2046ae084..db1a0241c 100644
--- a/src/grib_accessor_class_g1forecastmonth.c
+++ b/src/grib_accessor_class_g1forecastmonth.c
@@ -23,6 +23,7 @@
    MEMBERS=const char* day
    MEMBERS=const char* hour
    MEMBERS=const char* fcmonth
+   MEMBERS=const char* check
    END_CLASS_DEF
 
  */
@@ -53,6 +54,7 @@ typedef struct grib_accessor_g1forecastmonth {
 	const char* day;
 	const char* hour;
 	const char* fcmonth;
+	const char* check;
 } grib_accessor_g1forecastmonth;
 
 extern grib_accessor_class* grib_accessor_class_long;
@@ -149,6 +151,7 @@ static void init(grib_accessor* a,const long l, grib_arguments* c)
     self->day                      = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
     self->hour                     = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
     self->fcmonth                  = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
+    self->check                    = grib_arguments_get_name(grib_handle_of_accessor(a),c,n++);
 }
 
 static void dump(grib_accessor* a, grib_dumper* dumper)
@@ -174,6 +177,7 @@ static int unpack_long(grib_accessor* a, long* val, size_t *len)
 
     long fcmonth = 0;
     long gribForecastMonth = 0;
+    long check = 0;
 
     if ((ret=grib_get_long_internal(grib_handle_of_accessor(a),
             self->verification_yearmonth,&verification_yearmonth))!=GRIB_SUCCESS)
@@ -186,6 +190,8 @@ static int unpack_long(grib_accessor* a, long* val, size_t *len)
         return ret;
     if ((ret=grib_get_long_internal(grib_handle_of_accessor(a), self->fcmonth,&gribForecastMonth))!=GRIB_SUCCESS)
         return ret;
+    if ((ret=grib_get_long_internal(grib_handle_of_accessor(a), self->check, &check))!=GRIB_SUCCESS)
+        return ret;
 
     base_yearmonth = base_date / 100;
 
@@ -199,13 +205,14 @@ static int unpack_long(grib_accessor* a, long* val, size_t *len)
         fcmonth++;
 
     if(gribForecastMonth != 0 && gribForecastMonth!=fcmonth) {
-        *val = gribForecastMonth;
-        return GRIB_SUCCESS;
-        /*
-        grib_context_log(a->context,GRIB_LOG_FATAL,"%s=%ld (%s-%s)=%ld",self->fcmonth,
-                gribForecastMonth,self->base_date,self->verification_yearmonth,fcmonth);
-        Assert(gribForecastMonth == fcmonth);
-        */
+        if (check) {
+            grib_context_log(a->context,GRIB_LOG_FATAL,"%s=%ld (%s-%s)=%ld",self->fcmonth,
+                             gribForecastMonth,self->base_date,self->verification_yearmonth,fcmonth);
+            Assert(gribForecastMonth == fcmonth);
+        } else {
+            *val = gribForecastMonth;
+            return GRIB_SUCCESS;
+        }
     }
 
     *val = fcmonth;

From cfaf65fcc965bb5567050f0e586e1453f94312c3 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Sun, 17 Nov 2019 17:23:10 +0000
Subject: [PATCH 02/38] ECC-1021: Add test for renamed key

---
 tests/bufr_wmo_tables.sh | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/tests/bufr_wmo_tables.sh b/tests/bufr_wmo_tables.sh
index 00ce9a05d..531ec8de9 100755
--- a/tests/bufr_wmo_tables.sh
+++ b/tests/bufr_wmo_tables.sh
@@ -54,4 +54,17 @@ do
   fi
 done
 
+# In version 33 and higher, scanLevelQualityFlags (=033075) is renamed
+# This BUFR uses 033075
+input=${data_dir}/bufr/crit_202.bufr
+${tools_dir}/bufr_get -s masterTablesVersionNumber=$latest_wmo_version,unpack=1 \
+                      -p scanLevelDataValidityQualityFlags \
+                      $input
+# This BUFR uses 033080 which remains unchanged
+input=${data_dir}/bufr/atms_201.bufr
+${tools_dir}/bufr_get -s masterTablesVersionNumber=$latest_wmo_version,unpack=1 \
+                      -p scanLevelQualityFlags \
+                      $input
+
+
 rm -f $fTmp

From 2fd761d7618677d42f4b4018e06d89f95372749a Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 18 Nov 2019 12:24:37 +0000
Subject: [PATCH 03/38] ECC-991: Feature is still experimental

---
 src/eccodes.h  | 3 ++-
 src/grib_api.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/eccodes.h b/src/eccodes.h
index ba084947d..630697e9e 100644
--- a/src/eccodes.h
+++ b/src/eccodes.h
@@ -1262,7 +1262,8 @@ codes_handle *codes_grib_util_set_spec(codes_handle *h,
     size_t data_values_count,
     int *err);
 
-/* Build an array of headers from input BUFR file.
+/* EXPERIMENTAL FEATURE
+ * Build an array of headers from input BUFR file.
  * result = array of 'codes_bufr_header' structs with 'num_messages' elements.
  *          This array should be freed by the caller.
  * num_messages = number of messages found in the input file.
diff --git a/src/grib_api.h b/src/grib_api.h
index 9243fc6c1..62a7e1f5d 100644
--- a/src/grib_api.h
+++ b/src/grib_api.h
@@ -1561,6 +1561,7 @@ grib_handle *grib_util_set_spec2(grib_handle *h,
 int parse_keyval_string(const char *grib_tool, char *arg, int values_required, int default_type, grib_values values[], int *count);
 grib_handle *grib_new_from_file(grib_context *c, FILE *f, int headers_only, int *error);
 
+/* EXPERIMENTAL */
 typedef struct codes_bufr_header {
     unsigned long message_offset;
     unsigned long message_size;

From 4d858df125bbb6da88ef5f2e430ce15f0835313f Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 18 Nov 2019 14:39:41 +0000
Subject: [PATCH 04/38] ECC-991: Include bad BUFR messages but set their
 message_size=0

---
 src/bufr_util.c               | 7 +++++--
 tests/bufr_extract_headers.sh | 8 ++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index d81aa5ea4..106666c2d 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -565,12 +565,13 @@ static int count_bufr_messages(grib_context* c, FILE* f, int* n)
         if (!mesg) {
             if (err == GRIB_END_OF_FILE || err == GRIB_PREMATURE_END_OF_FILE) {
                 done = 1; /* reached the end */
+                break;
             }
         }
         if (mesg && !err) {
             grib_context_free(c,mesg);
-            (*n)++;
         }
+        (*n)++;
     }
     rewind(f);
     if (err==GRIB_END_OF_FILE) err=GRIB_SUCCESS;
@@ -611,9 +612,10 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
     }
     i = 0;
     while (err != GRIB_END_OF_FILE) {
+        if (i >= *num_messages) break;
         mesg = wmo_read_bufr_from_file_malloc(fp, 0, &size, &offset, &err);
         if (mesg != NULL && err == 0) {
-            int err2 = bufr_decode_header(c, mesg, offset, size, &(*result)[i++]);
+            int err2 = bufr_decode_header(c, mesg, offset, size, &(*result)[i]);
             if (err2) {
                 fclose(fp);
                 return err2;
@@ -626,6 +628,7 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
                 grib_context_log(c, GRIB_LOG_ERROR, "codes_bufr_extract_headers_malloc: Unable to read BUFR message");
             }
         }
+        ++i;
     }
 
     fclose(fp);
diff --git a/tests/bufr_extract_headers.sh b/tests/bufr_extract_headers.sh
index b97a8c2d5..ddd79978d 100755
--- a/tests/bufr_extract_headers.sh
+++ b/tests/bufr_extract_headers.sh
@@ -27,6 +27,14 @@ for bf in ${bufr_files}; do
     diff -w $temp1 $temp2
 done
 
+
+# Multi-message BUFR
+input=${data_dir}/bufr/aeolus_wmo_26.bufr
+$EXEC ${test_dir}/bufr_extract_headers  edition,totalLength,message_offset  $input > $temp1
+${tools_dir}/bufr_get -p offset,edition,totalLength $input > $temp2
+diff -w $temp1 $temp2
+
+
 # BUFRs with localLatitude1, localLongitude1, localLongitude2 etc
 bufr_files="
 aaen_55.bufr

From 54ba4cf72d6e01dfd28bd0c9e4bcdf95d9ab899b Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 18 Nov 2019 15:40:14 +0000
Subject: [PATCH 05/38] ECC-991: Strict mode added

---
 src/bufr_util.c              | 17 ++++++++++++++---
 src/eccodes.h                |  3 ++-
 src/grib_api_prototypes.h    |  2 +-
 tests/bufr_extract_headers.c |  3 ++-
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index 106666c2d..251d460a3 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -548,7 +548,7 @@ static int bufr_decode_header(grib_context* c, const void* message, off_t offset
     return err;
 }
 
-static int count_bufr_messages(grib_context* c, FILE* f, int* n)
+static int count_bufr_messages(grib_context* c, FILE* f, int* n, int strict_mode)
 {
     int err=0;
     void* mesg=NULL;
@@ -567,6 +567,7 @@ static int count_bufr_messages(grib_context* c, FILE* f, int* n)
                 done = 1; /* reached the end */
                 break;
             }
+            if (strict_mode) return GRIB_DECODING_ERROR;
         }
         if (mesg && !err) {
             grib_context_free(c,mesg);
@@ -578,7 +579,7 @@ static int count_bufr_messages(grib_context* c, FILE* f, int* n)
     return err;
 }
 
-int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, codes_bufr_header** result, int* num_messages)
+int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, codes_bufr_header** result, int* num_messages, int strict_mode)
 {
     int err = 0, i = 0;
     FILE* fp = NULL;
@@ -593,7 +594,7 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
         perror(filename);
         return GRIB_IO_PROBLEM;
     }
-    err = count_bufr_messages(c, fp, num_messages);
+    err = count_bufr_messages(c, fp, num_messages, strict_mode);
     if (err) {
         grib_context_log(c, GRIB_LOG_ERROR, "codes_bufr_extract_headers_malloc: Unable to count BUFR messages in file \"%s\"", filename);
         fclose(fp);
@@ -622,10 +623,20 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
             }
             grib_context_free(c, mesg);
         }
+        if (mesg && err) {
+            if (strict_mode) {
+                fclose(fp);
+                return GRIB_DECODING_ERROR;
+            }
+        }
         if (!mesg) {
             if (err != GRIB_END_OF_FILE && err != GRIB_PREMATURE_END_OF_FILE) {
                 /* An error occurred */
                 grib_context_log(c, GRIB_LOG_ERROR, "codes_bufr_extract_headers_malloc: Unable to read BUFR message");
+                if (strict_mode) {
+                    fclose(fp);
+                    return GRIB_DECODING_ERROR;
+                }
             }
         }
         ++i;
diff --git a/src/eccodes.h b/src/eccodes.h
index 630697e9e..f8c352917 100644
--- a/src/eccodes.h
+++ b/src/eccodes.h
@@ -1267,9 +1267,10 @@ codes_handle *codes_grib_util_set_spec(codes_handle *h,
  * result = array of 'codes_bufr_header' structs with 'num_messages' elements.
  *          This array should be freed by the caller.
  * num_messages = number of messages found in the input file.
+ * strict = If 1 means fail if any message is invalid.
  * returns 0 if OK, integer value on error.
  */
-int codes_bufr_extract_headers_malloc(codes_context* c, const char* filename, codes_bufr_header** result, int* num_messages);
+int codes_bufr_extract_headers_malloc(codes_context* c, const char* filename, codes_bufr_header** result, int* num_messages, int strict_mode);
 
 /* --------------------------------------- */
 #ifdef __cplusplus
diff --git a/src/grib_api_prototypes.h b/src/grib_api_prototypes.h
index 4455a2c10..4da34d75b 100644
--- a/src/grib_api_prototypes.h
+++ b/src/grib_api_prototypes.h
@@ -1485,7 +1485,7 @@ size_t sum_of_pl_array(const long* pl, size_t plsize);
 int compute_bufr_key_rank(grib_handle *h, grib_string_list *keys, const char *key);
 char **codes_bufr_copy_data_return_copied_keys(grib_handle *hin, grib_handle *hout, size_t *nkeys, int *err);
 int codes_bufr_copy_data(grib_handle *hin, grib_handle *hout);
-int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, codes_bufr_header** result, int* num_messages);
+int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, codes_bufr_header** result, int* num_messages, int strict_mode);
 
 
 /* string_util.c */
diff --git a/tests/bufr_extract_headers.c b/tests/bufr_extract_headers.c
index aad4637bf..f92946015 100644
--- a/tests/bufr_extract_headers.c
+++ b/tests/bufr_extract_headers.c
@@ -39,13 +39,14 @@ int main(int argc, char* argv[])
     int num_messages = 0;
     codes_bufr_header* header_array = NULL;
     codes_context* c = codes_context_get_default();
+    const int strict_mode = 1;
 
     if (argc != 3) return 1;
 
     keys = argv[1]; /* comma-separated like bufr_ls/bufr_get */
     filename = argv[2];
 
-    err = codes_bufr_extract_headers_malloc(c, filename, &header_array, &num_messages);
+    err = codes_bufr_extract_headers_malloc(c, filename, &header_array, &num_messages, strict_mode);
     if (err) {
         printf("ERROR: %s\n",grib_get_error_message(err));
         return 1;

From 2eaef6a4f7e992712bff639af442377e7fe50799 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 18 Nov 2019 18:20:12 +0000
Subject: [PATCH 06/38] ECC-991: New function to return string value of header
 key

---
 src/bufr_util.c               |  75 ++++++++++++++++++++++++
 src/eccodes.h                 |   1 +
 src/grib_api.h                |   4 +-
 src/grib_api_prototypes.h     |   1 +
 tests/bufr_extract_headers.c  | 104 ++++++----------------------------
 tests/bufr_extract_headers.sh |  11 +++-
 6 files changed, 105 insertions(+), 91 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index 251d460a3..1568fe449 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -645,3 +645,78 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
     fclose(fp);
     return GRIB_SUCCESS;
 }
+
+int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *val, size_t *len)
+{
+    static const char* NOT_FOUND = "not_found";
+    int isEcmwfLocal = 0;
+    Assert(bh);
+    Assert(key);
+
+    isEcmwfLocal = (bh->ecmwfLocalSectionPresent == 1 && bh->bufrHeaderCentre == 98);
+
+    if      (strcmp(key, "message_offset")==0) *len = sprintf(val, "%lu", bh->message_offset);
+    else if (strcmp(key, "offset")==0) *len = sprintf(val, "%lu", bh->message_offset);
+    else if (strcmp(key, "message_size")==0) *len = sprintf(val, "%lu", bh->message_size);
+    else if (strcmp(key, "totalLength")==0) *len = sprintf(val, "%lu", bh->message_size);
+    else if (strcmp(key, "edition")==0) *len = sprintf(val, "%ld", bh->edition);
+    else if (strcmp(key, "masterTableNumber")==0) *len = sprintf(val, "%ld", bh->masterTableNumber);
+    else if (strcmp(key, "bufrHeaderSubCentre")==0) *len = sprintf(val, "%ld", bh->bufrHeaderSubCentre);
+    else if (strcmp(key, "bufrHeaderCentre")==0) *len = sprintf(val, "%ld", bh->bufrHeaderCentre);
+    else if (strcmp(key, "updateSequenceNumber")==0) *len = sprintf(val, "%ld", bh->updateSequenceNumber);
+    else if (strcmp(key, "dataCategory")==0) *len = sprintf(val, "%ld", bh->dataCategory);
+    else if (strcmp(key, "dataSubCategory")==0) *len = sprintf(val, "%ld", bh->dataSubCategory);
+    else if (strcmp(key, "masterTablesVersionNumber")==0) *len = sprintf(val, "%ld", bh->masterTablesVersionNumber);
+    else if (strcmp(key, "localTablesVersionNumber")==0) *len = sprintf(val, "%ld", bh->localTablesVersionNumber);
+    else if (strcmp(key, "typicalYear")==0) *len = sprintf(val, "%ld", bh->typicalYear);
+    else if (strcmp(key, "typicalMonth")==0) *len = sprintf(val, "%ld", bh->typicalMonth);
+    else if (strcmp(key, "typicalDay")==0) *len = sprintf(val, "%ld", bh->typicalDay);
+    else if (strcmp(key, "typicalHour")==0) *len = sprintf(val, "%ld", bh->typicalHour);
+    else if (strcmp(key, "typicalMinute")==0) *len = sprintf(val, "%ld", bh->typicalMinute);
+    else if (strcmp(key, "typicalSecond")==0) *len = sprintf(val, "%ld", bh->typicalSecond);
+    else if (strcmp(key, "typicalDate")==0) *len = sprintf(val, "%06ld", bh->typicalDate);
+    else if (strcmp(key, "typicalTime")==0) *len = sprintf(val, "%06ld", bh->typicalTime);
+    else if (strcmp(key, "internationalDataSubCategory")==0) *len = sprintf(val, "%ld", bh->internationalDataSubCategory);
+    else if (strcmp(key, "localSectionPresent")==0) *len = sprintf(val, "%ld", bh->ecmwfLocalSectionPresent);
+
+    /* Local ECMWF keys. Can be absent so must return NOT_FOUND */
+    else if (strcmp(key, "rdbType")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbType); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "oldSubtype")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->oldSubtype); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "ident")==0) {
+        if (!isEcmwfLocal || bh->ident == NULL || strlen(bh->ident)==0) *len = sprintf(val, NOT_FOUND);
+        else *len = sprintf(val, "%s", bh->ident);
+    }
+    else if (strcmp(key, "localYear")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localYear); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localMonth")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMonth); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localDay")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localDay); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localHour")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localHour); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMinute); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localSecond); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeDay")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeDay); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeHour); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeMinute); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeSecond); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeDay")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeDay); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeHour); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeMinute); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeSecond); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "isSatellite")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->isSatellite); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude1")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude1); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude1")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude1); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude2")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude2); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude2")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude2); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "qualityControl")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->qualityControl); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "newSubtype")==0)     { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->newSubtype); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "daLoop")==0)         { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->daLoop); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localNumberOfObservations")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localNumberOfObservations); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "satelliteID")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->satelliteID); else *len = sprintf(val, NOT_FOUND); }
+
+    else if (strcmp(key, "numberOfSubsets")==0) *len = sprintf(val, "%lu", bh->numberOfSubsets);
+    else if (strcmp(key, "observedData")==0) *len = sprintf(val, "%ld", bh->observedData);
+    else if (strcmp(key, "compressedData")==0) *len = sprintf(val, "%ld", bh->compressedData);
+    else return GRIB_NOT_FOUND;
+
+    return GRIB_SUCCESS;
+}
diff --git a/src/eccodes.h b/src/eccodes.h
index f8c352917..4626593bd 100644
--- a/src/eccodes.h
+++ b/src/eccodes.h
@@ -1271,6 +1271,7 @@ codes_handle *codes_grib_util_set_spec(codes_handle *h,
  * returns 0 if OK, integer value on error.
  */
 int codes_bufr_extract_headers_malloc(codes_context* c, const char* filename, codes_bufr_header** result, int* num_messages, int strict_mode);
+int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *val, size_t *len);
 
 /* --------------------------------------- */
 #ifdef __cplusplus
diff --git a/src/grib_api.h b/src/grib_api.h
index 62a7e1f5d..a4bd58f0f 100644
--- a/src/grib_api.h
+++ b/src/grib_api.h
@@ -1585,8 +1585,8 @@ typedef struct codes_bufr_header {
     long typicalHour;
     long typicalMinute;
     long typicalSecond;
-    long typicalDate; // computed key
-    long typicalTime; // computed key
+    long typicalDate; /* computed key */
+    long typicalTime; /* computed key */
 
     long internationalDataSubCategory; /*BUFR4-specific*/
 
diff --git a/src/grib_api_prototypes.h b/src/grib_api_prototypes.h
index 4da34d75b..6e9fff368 100644
--- a/src/grib_api_prototypes.h
+++ b/src/grib_api_prototypes.h
@@ -1486,6 +1486,7 @@ int compute_bufr_key_rank(grib_handle *h, grib_string_list *keys, const char *ke
 char **codes_bufr_copy_data_return_copied_keys(grib_handle *hin, grib_handle *hout, size_t *nkeys, int *err);
 int codes_bufr_copy_data(grib_handle *hin, grib_handle *hout);
 int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, codes_bufr_header** result, int* num_messages, int strict_mode);
+int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *val, size_t *len);
 
 
 /* string_util.c */
diff --git a/tests/bufr_extract_headers.c b/tests/bufr_extract_headers.c
index f92946015..e2a7e8769 100644
--- a/tests/bufr_extract_headers.c
+++ b/tests/bufr_extract_headers.c
@@ -9,28 +9,7 @@
  */
 
 #include "eccodes.h"
-
-static const char* not_found = "not_found";
-
-static void print_rdb_key(int local, long value)
-{
-    if (local) printf("%ld ", value);
-    else       printf("%s ", not_found);
-}
-
-static void print_rdb_key_double(int local, double value)
-{
-    if (local) printf("%g ", value);
-    else       printf("%s ", not_found);
-}
-
-static void print_rdb_ident(int local, const char* value)
-{
-    if (!local || value == NULL || strlen(value) == 0)
-        printf("%s ", not_found);
-    else
-        printf("%s ", value);
-}
+#include <assert.h>
 
 int main(int argc, char* argv[])
 {
@@ -40,8 +19,11 @@ int main(int argc, char* argv[])
     codes_bufr_header* header_array = NULL;
     codes_context* c = codes_context_get_default();
     const int strict_mode = 1;
+    const int MAX_KEYS=100;
+    int requested_print_keys_count = MAX_KEYS;
+    codes_values requested_print_keys[MAX_KEYS];
 
-    if (argc != 3) return 1;
+    assert (argc == 3);
 
     keys = argv[1]; /* comma-separated like bufr_ls/bufr_get */
     filename = argv[2];
@@ -51,71 +33,19 @@ int main(int argc, char* argv[])
         printf("ERROR: %s\n",grib_get_error_message(err));
         return 1;
     }
-
+    
+    /* Mimic the behaviour of bufr_get -f -p keys for testing */
+    err = parse_keyval_string(NULL, keys, 0, GRIB_TYPE_UNDEFINED, requested_print_keys, &requested_print_keys_count);
+    assert(requested_print_keys_count > 0);
     for (i=0; i < num_messages; ++i) {
-        codes_bufr_header bh = header_array[i];
-        /*
-         * Mimic the behaviour of bufr_get -f -p keys for testing
-         */
-        const int has_ecmwf_local = (bh.ecmwfLocalSectionPresent == 1 && bh.bufrHeaderCentre == 98);
-
-        if (strstr(keys, "message_offset")) printf("%ld ", bh.message_offset);
-        if (strstr(keys, "message_size")) printf("%ld ", bh.message_size);
-        if (strstr(keys, "edition")) printf("%ld ", bh.edition);
-        if (strstr(keys, "totalLength")) printf("%ld ", bh.message_size);
-        if (strstr(keys, "masterTableNumber")) printf("%ld ", bh.masterTableNumber);
-        if (strstr(keys, "bufrHeaderSubCentre")) printf("%ld ", bh.bufrHeaderSubCentre);
-        if (strstr(keys, "bufrHeaderCentre")) printf("%ld ", bh.bufrHeaderCentre);
-        if (strstr(keys, "updateSequenceNumber")) printf("%ld ", bh.updateSequenceNumber);
-        if (strstr(keys, "dataCategory")) printf("%ld ", bh.dataCategory);
-        if (strstr(keys, "dataSubCategory")) printf("%ld ", bh.dataSubCategory);
-        if (strstr(keys, "masterTablesVersionNumber")) printf("%ld ", bh.masterTablesVersionNumber);
-        if (strstr(keys, "localTablesVersionNumber")) printf("%ld ", bh.localTablesVersionNumber);
-        if (strstr(keys, "typicalYear")) printf("%ld ", bh.typicalYear);
-        if (strstr(keys, "typicalMonth")) printf("%ld ", bh.typicalMonth);
-        if (strstr(keys, "typicalDay")) printf("%ld ", bh.typicalDay);
-        if (strstr(keys, "typicalHour")) printf("%ld ", bh.typicalHour);
-        if (strstr(keys, "typicalMinute")) printf("%ld ", bh.typicalMinute);
-
-        if (strstr(keys, "typicalDate")) printf("%ld ", bh.typicalDate);
-        if (strstr(keys, "typicalTime")) printf("%ld ", bh.typicalTime);
-
-        if (strstr(keys, "internationalDataSubCategory")) printf("%ld ", bh.internationalDataSubCategory);
-        if (strstr(keys, "typicalSecond")) printf("%ld ", bh.typicalSecond);
-        if (strstr(keys, "localSectionPresent")) printf("%ld ", bh.ecmwfLocalSectionPresent);
-
-        if (strstr(keys, "rdbType"))        print_rdb_key(has_ecmwf_local, bh.rdbType);
-        if (strstr(keys, "oldSubtype"))     print_rdb_key(has_ecmwf_local, bh.oldSubtype);
-        if (strstr(keys, "localYear"))      print_rdb_key(has_ecmwf_local, bh.localYear);
-        if (strstr(keys, "localMonth"))     print_rdb_key(has_ecmwf_local, bh.localMonth);
-        if (strstr(keys, "localDay"))       print_rdb_key(has_ecmwf_local, bh.localDay);
-        if (strstr(keys, "localHour"))      print_rdb_key(has_ecmwf_local, bh.localHour);
-        if (strstr(keys, "localMinute"))    print_rdb_key(has_ecmwf_local, bh.localMinute);
-        if (strstr(keys, "localSecond"))    print_rdb_key(has_ecmwf_local, bh.localSecond);
-        if (strstr(keys, "rdbtimeDay"))     print_rdb_key(has_ecmwf_local, bh.rdbtimeDay);
-        if (strstr(keys, "rdbtimeHour"))    print_rdb_key(has_ecmwf_local, bh.rdbtimeHour);
-        if (strstr(keys, "rdbtimeMinute"))  print_rdb_key(has_ecmwf_local, bh.rdbtimeMinute);
-        if (strstr(keys, "rdbtimeSecond"))  print_rdb_key(has_ecmwf_local, bh.rdbtimeSecond);
-        if (strstr(keys, "rectimeDay"))     print_rdb_key(has_ecmwf_local, bh.rectimeDay);
-        if (strstr(keys, "rectimeHour"))    print_rdb_key(has_ecmwf_local, bh.rectimeHour);
-        if (strstr(keys, "rectimeMinute"))  print_rdb_key(has_ecmwf_local, bh.rectimeMinute);
-        if (strstr(keys, "rectimeSecond"))  print_rdb_key(has_ecmwf_local, bh.rectimeSecond);
-        if (strstr(keys, "qualityControl")) print_rdb_key(has_ecmwf_local, bh.qualityControl);
-        if (strstr(keys, "newSubtype"))     print_rdb_key(has_ecmwf_local, bh.newSubtype);
-        if (strstr(keys, "daLoop"))         print_rdb_key(has_ecmwf_local, bh.daLoop);
-
-        if (strstr(keys, "localLongitude1")) print_rdb_key_double(has_ecmwf_local, bh.localLongitude1);
-        if (strstr(keys, "localLatitude1"))  print_rdb_key_double(has_ecmwf_local, bh.localLatitude1);
-        if (strstr(keys, "localLongitude2")) print_rdb_key_double(has_ecmwf_local, bh.localLongitude2);
-        if (strstr(keys, "localLatitude2"))  print_rdb_key_double(has_ecmwf_local, bh.localLatitude2);
-
-        if (strstr(keys, "localNumberOfObservations"))  printf("%ld ", bh.localNumberOfObservations);
-        if (strstr(keys, "satelliteID"))                printf("%ld ", bh.satelliteID);
-        if (strstr(keys, "numberOfSubsets"))            printf("%ld ", bh.numberOfSubsets);
-        if (strstr(keys, "observedData"))               printf("%ld ", bh.observedData);
-        if (strstr(keys, "compressedData"))             printf("%ld ", bh.compressedData);
-
-        if (strstr(keys, "ident"))          print_rdb_ident(has_ecmwf_local, bh.ident);
+        int j;
+        for (j=0; j<requested_print_keys_count; ++j) {
+            size_t vlen = 0;
+            char value[512]={0,};
+            CODES_CHECK( codes_bufr_header_get_string(&header_array[i], requested_print_keys[j].name, value, &vlen), 0);
+            assert(vlen > 0);
+            printf("%s ", value);
+        }
         printf("\n");
     }
 
diff --git a/tests/bufr_extract_headers.sh b/tests/bufr_extract_headers.sh
index ddd79978d..6a1892ce7 100755
--- a/tests/bufr_extract_headers.sh
+++ b/tests/bufr_extract_headers.sh
@@ -30,10 +30,17 @@ done
 
 # Multi-message BUFR
 input=${data_dir}/bufr/aeolus_wmo_26.bufr
-$EXEC ${test_dir}/bufr_extract_headers  edition,totalLength,message_offset  $input > $temp1
-${tools_dir}/bufr_get -p offset,edition,totalLength $input > $temp2
+KEYS='offset,edition,totalLength'
+$EXEC ${test_dir}/bufr_extract_headers  $KEYS  $input > $temp1
+${tools_dir}/bufr_get                -p $KEYS  $input > $temp2
 diff -w $temp1 $temp2
 
+# Test local ECMWF keys; should be "not_found"
+input=${data_dir}/bufr/synop.bufr
+KEYS='localSectionPresent,rdbType,ident,isSatellite,satelliteID'
+$EXEC ${test_dir}/bufr_extract_headers $KEYS $input > $temp1
+${tools_dir}/bufr_get            -f -p $KEYS $input > $temp2
+diff -w $temp1 $temp2
 
 # BUFRs with localLatitude1, localLongitude1, localLongitude2 etc
 bufr_files="

From c9894e6f510d80010bdaa0c0e34e9cfa820a74fe Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 19 Nov 2019 10:30:55 +0000
Subject: [PATCH 07/38] Fix broken test

---
 tests/bufr_extract_headers.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/bufr_extract_headers.sh b/tests/bufr_extract_headers.sh
index 6a1892ce7..fb5cc3554 100755
--- a/tests/bufr_extract_headers.sh
+++ b/tests/bufr_extract_headers.sh
@@ -35,8 +35,8 @@ $EXEC ${test_dir}/bufr_extract_headers  $KEYS  $input > $temp1
 ${tools_dir}/bufr_get                -p $KEYS  $input > $temp2
 diff -w $temp1 $temp2
 
-# Test local ECMWF keys; should be "not_found"
-input=${data_dir}/bufr/synop.bufr
+# Test local ECMWF keys; should be "not_found" for this input
+input=${data_dir}/bufr/PraticaTemp.bufr
 KEYS='localSectionPresent,rdbType,ident,isSatellite,satelliteID'
 $EXEC ${test_dir}/bufr_extract_headers $KEYS $input > $temp1
 ${tools_dir}/bufr_get            -f -p $KEYS $input > $temp2

From 6432768792e353d2c2948861970243e6e7b980b0 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 19 Nov 2019 17:36:48 +0000
Subject: [PATCH 08/38] ECC-1026: GRIB2 CCSDS packing: Nearest functionality
 not implemented

---
 src/grib_accessor_class_data_ccsds_packing.c | 46 +++++++++++++++-----
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/grib_accessor_class_data_ccsds_packing.c b/src/grib_accessor_class_data_ccsds_packing.c
index 2df0b5f6c..b937915c7 100644
--- a/src/grib_accessor_class_data_ccsds_packing.c
+++ b/src/grib_accessor_class_data_ccsds_packing.c
@@ -19,6 +19,7 @@
    IMPLEMENTS = init
    IMPLEMENTS = unpack_double
    IMPLEMENTS = pack_double
+   IMPLEMENTS = unpack_double_element
    IMPLEMENTS = value_count
    MEMBERS=const char*   number_of_values
    MEMBERS=const char*   reference_value
@@ -51,6 +52,7 @@ static int unpack_double(grib_accessor*, double* val,size_t *len);
 static int value_count(grib_accessor*,long*);
 static void init(grib_accessor*,const long, grib_arguments* );
 static void init_class(grib_accessor_class*);
+static int unpack_double_element(grib_accessor*,size_t i, double* val);
 
 typedef struct grib_accessor_data_ccsds_packing {
     grib_accessor          att;
@@ -112,7 +114,7 @@ static grib_accessor_class _grib_accessor_class_data_ccsds_packing = {
     0,      /* nearest_smaller_value */
     0,                       /* next accessor    */
     0,                    /* compare vs. another accessor   */
-    0,     /* unpack only ith value          */
+    &unpack_double_element,     /* unpack only ith value          */
     0,     /* unpack a subarray         */
     0,              		/* clear          */
     0,               		/* clone accessor          */
@@ -149,7 +151,6 @@ static void init_class(grib_accessor_class* c)
 	c->nearest_smaller_value	=	(*(c->super))->nearest_smaller_value;
 	c->next	=	(*(c->super))->next;
 	c->compare	=	(*(c->super))->compare;
-	c->unpack_double_element	=	(*(c->super))->unpack_double_element;
 	c->unpack_double_subarray	=	(*(c->super))->unpack_double_subarray;
 	c->clear	=	(*(c->super))->clear;
 	c->make_clone	=	(*(c->super))->make_clone;
@@ -303,7 +304,6 @@ static int unpack_double(grib_accessor* a, double* val, size_t *len)
 cleanup:
     grib_context_buffer_free(a->context,decoded);
     return err;
-
 }
 
 static int pack_double(grib_accessor* a, const double* val, size_t *len)
@@ -520,21 +520,45 @@ cleanup:
 
     return err;
 }
-#else
 
-static int unpack_double(grib_accessor* a, double* val, size_t *len)
+static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
 {
-    grib_context_log(a->context, GRIB_LOG_ERROR,
-            "grib_accessor_data_ccsds_packing: CCSDS support not enabled. "
-            "Please rebuild with -DENABLE_AEC=ON");
-    return GRIB_FUNCTIONALITY_NOT_ENABLED;
+    /* The index idx relates to codedValues NOT values! */
+    size_t size = 0;
+    double* values = NULL;
+    int err=grib_get_size(grib_handle_of_accessor(a),"codedValues",&size);
+    if (err) return err;
+    if (idx > size) return GRIB_INVALID_NEAREST;
+
+    values=(double*)grib_context_malloc_clear(a->context,size*sizeof(double));
+    err=grib_get_double_array(grib_handle_of_accessor(a),"codedValues",values,&size);
+    if (err) return err;
+    *val=values[idx];
+    grib_context_free(a->context,values);
+    return err;
 }
 
-static int pack_double(grib_accessor* a, const double* val, size_t *len)
+#else
+
+static void print_error_msg(grib_context* c)
 {
-    grib_context_log(a->context, GRIB_LOG_ERROR,
+    grib_context_log(c, GRIB_LOG_ERROR,
             "grib_accessor_data_ccsds_packing: CCSDS support not enabled. "
             "Please rebuild with -DENABLE_AEC=ON");
+}
+static int unpack_double(grib_accessor* a, double* val, size_t *len)
+{
+    print_error_msg(a->context);
+    return GRIB_FUNCTIONALITY_NOT_ENABLED;
+}
+static int pack_double(grib_accessor* a, const double* val, size_t *len)
+{
+    print_error_msg(a->context);
+    return GRIB_FUNCTIONALITY_NOT_ENABLED;
+}
+static int unpack_double_element(grib_accessor* a, size_t idx, double* val)
+{
+    print_error_msg(a->context);
     return GRIB_FUNCTIONALITY_NOT_ENABLED;
 }
 

From 97b60912e18e0bb099163cc7cd93f7b947f028fc Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 19 Nov 2019 18:39:04 +0000
Subject: [PATCH 09/38] ECC-991: Fix use of sprintf and default length

---
 src/bufr_util.c | 126 +++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 97 insertions(+), 29 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index 1568fe449..38c3ea66d 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -626,6 +626,7 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
         if (mesg && err) {
             if (strict_mode) {
                 fclose(fp);
+                grib_context_free(c, mesg);
                 return GRIB_DECODING_ERROR;
             }
         }
@@ -646,12 +647,71 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
     return GRIB_SUCCESS;
 }
 
+#if 0
+/* TODO: Not efficient as it opens the code table every time */
+static char* codes_bufr_header_get_centre_name(long edition, long centre_code)
+{
+    char full_path[2014] = {0,};
+    char line[1024];
+    FILE *f = NULL;
+    const char* defs_path = grib_definition_path(NULL);
+
+    if      (edition == 3) sprintf(full_path, "%s/common/c-1.table", defs_path);
+    else if (edition == 4) sprintf(full_path, "%s/common/c-11.table", defs_path);
+    else return NULL;
+
+    f = codes_fopen(full_path, "r");
+    if (!f) return NULL;
+
+    while(fgets(line,sizeof(line)-1,f)) {
+        char* p = line;
+        int code = 0;
+        char abbreviation[32] = {0,};
+        char* q = abbreviation;
+
+        line[strlen(line)-1] = 0;
+
+        while(*p != '\0' && isspace(*p)) p++;
+
+        if(*p == '#')
+            continue;
+
+        while(*p != '\0' && isspace(*p)) p++;
+
+        if( *p =='\0' ) continue;
+
+        Assert(isdigit(*p));
+        while(*p != '\0') {
+            if(isspace(*p)) break;
+            code *= 10;
+            code += *p - '0';
+            p++;
+        }
+
+        while(*p != '\0' && isspace(*p)) p++;
+
+        while(*p != '\0') {
+            if(isspace(*p)) break;
+            *q++ = *p++;
+        }
+        *q = 0;
+        if (code == centre_code) {
+            fclose(f);
+            return strdup(abbreviation);
+        }
+    }
+    fclose(f);
+    return NULL;
+}
+#endif
+
 int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *val, size_t *len)
 {
     static const char* NOT_FOUND = "not_found";
     int isEcmwfLocal = 0;
     Assert(bh);
     Assert(key);
+    *len = strlen(NOT_FOUND); /*By default*/
 
     isEcmwfLocal = (bh->ecmwfLocalSectionPresent == 1 && bh->bufrHeaderCentre == 98);
 
@@ -663,6 +723,14 @@ int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *v
     else if (strcmp(key, "masterTableNumber")==0) *len = sprintf(val, "%ld", bh->masterTableNumber);
     else if (strcmp(key, "bufrHeaderSubCentre")==0) *len = sprintf(val, "%ld", bh->bufrHeaderSubCentre);
     else if (strcmp(key, "bufrHeaderCentre")==0) *len = sprintf(val, "%ld", bh->bufrHeaderCentre);
+    
+    /*
+    else if (strcmp(key, "centre")==0) {
+        char* centre_str = codes_bufr_header_get_centre_name(bh->edition, bh->bufrHeaderCentre);
+        if (centre_str) *len = sprintf(val, "%s", centre_str);
+        else *len = sprintf(val, "%ld", bh->bufrHeaderCentre);
+    }
+    */
     else if (strcmp(key, "updateSequenceNumber")==0) *len = sprintf(val, "%ld", bh->updateSequenceNumber);
     else if (strcmp(key, "dataCategory")==0) *len = sprintf(val, "%ld", bh->dataCategory);
     else if (strcmp(key, "dataSubCategory")==0) *len = sprintf(val, "%ld", bh->dataSubCategory);
@@ -680,38 +748,38 @@ int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *v
     else if (strcmp(key, "localSectionPresent")==0) *len = sprintf(val, "%ld", bh->ecmwfLocalSectionPresent);
 
     /* Local ECMWF keys. Can be absent so must return NOT_FOUND */
-    else if (strcmp(key, "rdbType")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbType); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "oldSubtype")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->oldSubtype); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbType")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbType); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "oldSubtype")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->oldSubtype); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "ident")==0) {
-        if (!isEcmwfLocal || bh->ident == NULL || strlen(bh->ident)==0) *len = sprintf(val, NOT_FOUND);
+        if (!isEcmwfLocal || bh->ident == NULL || strlen(bh->ident)==0) strcpy(val, NOT_FOUND);
         else *len = sprintf(val, "%s", bh->ident);
     }
-    else if (strcmp(key, "localYear")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localYear); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localMonth")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMonth); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localDay")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localDay); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localHour")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localHour); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMinute); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localSecond); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rdbtimeDay")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeDay); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rdbtimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeHour); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rdbtimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeMinute); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rdbtimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeSecond); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeDay")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeDay); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeHour); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeMinute); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeSecond); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "isSatellite")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->isSatellite); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localLongitude1")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude1); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localLatitude1")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude1); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localLongitude2")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude2); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localLatitude2")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude2); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localLatitude")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localLongitude")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "qualityControl")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->qualityControl); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "newSubtype")==0)     { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->newSubtype); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "daLoop")==0)         { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->daLoop); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "localNumberOfObservations")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localNumberOfObservations); else *len = sprintf(val, NOT_FOUND); }
-    else if (strcmp(key, "satelliteID")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->satelliteID); else *len = sprintf(val, NOT_FOUND); }
+    else if (strcmp(key, "localYear")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localYear); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localMonth")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMonth); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localDay")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localDay); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localHour")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localHour); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMinute); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localSecond); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeDay")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeDay); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeHour); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeMinute); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeSecond); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeDay")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeDay); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeHour); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeMinute); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeSecond); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "isSatellite")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->isSatellite); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude1")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude1); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude1")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude1); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude2")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude2); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude2")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude2); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "qualityControl")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->qualityControl); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "newSubtype")==0)     { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->newSubtype); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "daLoop")==0)         { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->daLoop); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localNumberOfObservations")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localNumberOfObservations); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "satelliteID")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->satelliteID); else strcpy(val, NOT_FOUND); }
 
     else if (strcmp(key, "numberOfSubsets")==0) *len = sprintf(val, "%lu", bh->numberOfSubsets);
     else if (strcmp(key, "observedData")==0) *len = sprintf(val, "%ld", bh->observedData);

From 957bdfb35bd24c24c9b936c8a43e9cd18941c456 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 20 Nov 2019 11:52:27 +0000
Subject: [PATCH 10/38] ECC-991: Added separate keys for local section presence

---
 src/bufr_util.c               | 17 +++++++++++------
 src/grib_api.h                |  1 +
 tests/bufr_extract_headers.sh | 15 +++++++++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index 38c3ea66d..af8b1ba4b 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -367,8 +367,8 @@ static int bufr_decode_edition3(const void* message, codes_bufr_header* hdr)
 
     offset_section2 = BUFR_SECTION0_LEN + section1Length;  /*bytes*/
     section2Length = 0;
-    hdr->ecmwfLocalSectionPresent = (section1Flags != 0);
-    if (hdr->ecmwfLocalSectionPresent) {
+    hdr->localSectionPresent = (section1Flags != 0);
+    if (hdr->localSectionPresent) {
         long pos_section2Length;
         const long nbits_section2Length = 3*8;
         pos_section2Length = offset_section2*8;
@@ -376,6 +376,7 @@ static int bufr_decode_edition3(const void* message, codes_bufr_header* hdr)
         section2Length = grib_decode_unsigned_long(message, &pos_section2Length, nbits_section2Length);
 
         if (hdr->bufrHeaderCentre == 98) {
+            hdr->ecmwfLocalSectionPresent = 1;
             err = bufr_decode_rdb_keys(message, offset_section2, hdr);
         }
     }
@@ -497,8 +498,8 @@ static int bufr_decode_edition4(const void* message, codes_bufr_header* hdr)
 
     offset_section2 = BUFR_SECTION0_LEN + section1Length;  /*bytes*/
     section2Length = 0;
-    hdr->ecmwfLocalSectionPresent = (section1Flags != 0);
-    if (hdr->ecmwfLocalSectionPresent) {
+    hdr->localSectionPresent = (section1Flags != 0);
+    if (hdr->localSectionPresent) {
         long pos_section2Length;
         const long nbits_section2Length = 3*8;
         pos_section2Length = offset_section2*8;
@@ -506,6 +507,7 @@ static int bufr_decode_edition4(const void* message, codes_bufr_header* hdr)
         section2Length = grib_decode_unsigned_long(message, &pos_section2Length, nbits_section2Length);
 
         if (hdr->bufrHeaderCentre == 98) {
+            hdr->ecmwfLocalSectionPresent = 1;
             err = bufr_decode_rdb_keys(message, offset_section2, hdr);
         }
     }
@@ -713,7 +715,9 @@ int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *v
     Assert(key);
     *len = strlen(NOT_FOUND); /*By default*/
 
-    isEcmwfLocal = (bh->ecmwfLocalSectionPresent == 1 && bh->bufrHeaderCentre == 98);
+    isEcmwfLocal = (bh->ecmwfLocalSectionPresent == 1);
+    Assert( !(isEcmwfLocal && bh->bufrHeaderCentre != 98)  );
+    Assert( !(bh->ecmwfLocalSectionPresent && !bh->localSectionPresent)  );
 
     if      (strcmp(key, "message_offset")==0) *len = sprintf(val, "%lu", bh->message_offset);
     else if (strcmp(key, "offset")==0) *len = sprintf(val, "%lu", bh->message_offset);
@@ -745,7 +749,8 @@ int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *v
     else if (strcmp(key, "typicalDate")==0) *len = sprintf(val, "%06ld", bh->typicalDate);
     else if (strcmp(key, "typicalTime")==0) *len = sprintf(val, "%06ld", bh->typicalTime);
     else if (strcmp(key, "internationalDataSubCategory")==0) *len = sprintf(val, "%ld", bh->internationalDataSubCategory);
-    else if (strcmp(key, "localSectionPresent")==0) *len = sprintf(val, "%ld", bh->ecmwfLocalSectionPresent);
+    else if (strcmp(key, "localSectionPresent")==0) *len = sprintf(val, "%ld", bh->localSectionPresent);
+    else if (strcmp(key, "ecmwfLocalSectionPresent")==0) *len = sprintf(val, "%ld", bh->ecmwfLocalSectionPresent);
 
     /* Local ECMWF keys. Can be absent so must return NOT_FOUND */
     else if (strcmp(key, "rdbType")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbType); else strcpy(val, NOT_FOUND); }
diff --git a/src/grib_api.h b/src/grib_api.h
index a4bd58f0f..f086577b2 100644
--- a/src/grib_api.h
+++ b/src/grib_api.h
@@ -1590,6 +1590,7 @@ typedef struct codes_bufr_header {
 
     long internationalDataSubCategory; /*BUFR4-specific*/
 
+    long localSectionPresent;
     long ecmwfLocalSectionPresent;
 
     /* ECMWF local section keys */
diff --git a/tests/bufr_extract_headers.sh b/tests/bufr_extract_headers.sh
index fb5cc3554..beb6acc07 100755
--- a/tests/bufr_extract_headers.sh
+++ b/tests/bufr_extract_headers.sh
@@ -42,6 +42,21 @@ $EXEC ${test_dir}/bufr_extract_headers $KEYS $input > $temp1
 ${tools_dir}/bufr_get            -f -p $KEYS $input > $temp2
 diff -w $temp1 $temp2
 
+# Local Section keys
+# DWD BUFR with a local section
+input=${data_dir}/bufr/uegabe.bufr
+r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
+[ "$r" = "1 0 " ]
+# ECMWF BUFR but has no local section
+input=${data_dir}/bufr/207003.bufr
+r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
+[ "$r" = "0 0 " ]
+# ECMWF BUFR with a local section
+input=${data_dir}/bufr/aaen_55.bufr
+r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
+[ "$r" = "1 1 " ]
+
+
 # BUFRs with localLatitude1, localLongitude1, localLongitude2 etc
 bufr_files="
 aaen_55.bufr

From ee8fec3143d514776da67768c652cf0ced6ac1ed Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 20 Nov 2019 12:25:38 +0000
Subject: [PATCH 11/38] ECC-991: Memory leak fix and cleanup

---
 src/bufr_util.c              | 42 ++++++++++++++++++------------------
 tests/bufr_extract_headers.c |  4 ++++
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index af8b1ba4b..2fa6ec089 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -759,30 +759,30 @@ int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *v
         if (!isEcmwfLocal || bh->ident == NULL || strlen(bh->ident)==0) strcpy(val, NOT_FOUND);
         else *len = sprintf(val, "%s", bh->ident);
     }
-    else if (strcmp(key, "localYear")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localYear); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localMonth")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMonth); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localDay")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localDay); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localHour")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localHour); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localYear")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localYear); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localMonth")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMonth); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localDay")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localDay); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localHour); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "localMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localMinute); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "localSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localSecond); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "rdbtimeDay")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeDay); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "rdbtimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeHour); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "rdbtimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeMinute); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "rdbtimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeSecond); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeDay")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeDay); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeHour")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeHour); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeMinute")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeMinute); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "rectimeSecond")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeSecond); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "isSatellite")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->isSatellite); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localLongitude1")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude1); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localLatitude1")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude1); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localLongitude2")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude2); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localLatitude2")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude2); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localLatitude")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLatitude); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "localLongitude")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g", bh->localLongitude); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "qualityControl")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->qualityControl); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "newSubtype")==0)     { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->newSubtype); else strcpy(val, NOT_FOUND); }
-    else if (strcmp(key, "daLoop")==0)         { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->daLoop); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeHour")==0)     { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeHour); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeMinute")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeMinute); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbtimeSecond")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbtimeSecond); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeDay")==0)      { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeDay); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeHour")==0)     { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeHour); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeMinute")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeMinute); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rectimeSecond")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rectimeSecond); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "isSatellite")==0)     { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->isSatellite); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude1")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g",  bh->localLongitude1); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude1")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g",  bh->localLatitude1); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude2")==0) { if (isEcmwfLocal) *len = sprintf(val, "%g",  bh->localLongitude2); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude2")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g",  bh->localLatitude2); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLatitude")==0)   { if (isEcmwfLocal) *len = sprintf(val, "%g",  bh->localLatitude); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "localLongitude")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g",  bh->localLongitude); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "qualityControl")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->qualityControl); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "newSubtype")==0)      { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->newSubtype); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "daLoop")==0)          { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->daLoop); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "localNumberOfObservations")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localNumberOfObservations); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "satelliteID")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->satelliteID); else strcpy(val, NOT_FOUND); }
 
diff --git a/tests/bufr_extract_headers.c b/tests/bufr_extract_headers.c
index e2a7e8769..fc5d940e6 100644
--- a/tests/bufr_extract_headers.c
+++ b/tests/bufr_extract_headers.c
@@ -23,6 +23,7 @@ int main(int argc, char* argv[])
     int requested_print_keys_count = MAX_KEYS;
     codes_values requested_print_keys[MAX_KEYS];
 
+    /* Usage: prog keys file */
     assert (argc == 3);
 
     keys = argv[1]; /* comma-separated like bufr_ls/bufr_get */
@@ -50,6 +51,9 @@ int main(int argc, char* argv[])
     }
 
     free(header_array);
+    for (i=0; i<requested_print_keys_count; ++i) {
+        free((char*)requested_print_keys[i].name);
+    }
 
     return 0;
 }

From c3b81c12b49f28cc3f0bc78a0dba951a62501398 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 20 Nov 2019 15:39:55 +0000
Subject: [PATCH 12/38] ECC-991: Add centre key as string

---
 src/bufr_util.c               | 55 +++++++++++++++++++++--
 tests/bufr_extract_headers.c  |  3 +-
 tests/bufr_extract_headers.sh | 84 +++++++++++++++++++++--------------
 3 files changed, 105 insertions(+), 37 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index 2fa6ec089..9d73c31a7 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -649,6 +649,56 @@ int codes_bufr_extract_headers_malloc(grib_context* c, const char* filename, cod
     return GRIB_SUCCESS;
 }
 
+static char* codes_bufr_header_get_centre_name(long edition, long centre_code)
+{
+    switch (centre_code) {
+        case 1: return "ammc";
+        case 4: return "rums";
+        case 7: return "kwbc";
+        case 24: return "fapr";
+        case 28: return "vabb";
+        case 29: return "dems";
+        case 34: return "rjtd";
+        case 38: return "babj";
+        case 40: return "rksl";
+        case 41: return "sabm";
+        case 46: return "sbsj";
+        case 54: return "cwao";
+        case 58: return "fnmo";
+        case 69: return "nzkl";
+        case 74: return "egrr";
+        case 78: return "edzw";
+        case 80: return "cnmc";
+        case 82: return "eswi";
+        case 84: return "lfpw";
+        case 85: return "lfpw";
+        case 86: return "efkl";
+        case 88: return "enmi";
+        case 94: return "ekmi";
+        case 98: return "ecmf";
+        case 173: return "nasa";
+        case 195: return "wiix";
+        case 204: return "niwa";
+        case 214: return "lemm";
+        case 215: return "lssw";
+        case 218: return "habp";
+        case 224: return "lowm";
+        case 227: return "ebum";
+        case 233: return "eidb";
+        case 235: return "ingv";
+        case 239: return "crfc";
+        case 244: return "vuwien";
+        case 245: return "knmi";
+        case 246: return "ifmk";
+        case 247: return "hadc";
+        case 250: return "cosmo";
+        case 252: return "mpim";
+        case 254: return "eums";
+        case 255: return "consensus";
+        default: return NULL;
+    }
+}
+
 #if 0
 /* TODO: Not efficient as it opens the code table every time */
 static char* codes_bufr_header_get_centre_name(long edition, long centre_code)
@@ -727,14 +777,13 @@ int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *v
     else if (strcmp(key, "masterTableNumber")==0) *len = sprintf(val, "%ld", bh->masterTableNumber);
     else if (strcmp(key, "bufrHeaderSubCentre")==0) *len = sprintf(val, "%ld", bh->bufrHeaderSubCentre);
     else if (strcmp(key, "bufrHeaderCentre")==0) *len = sprintf(val, "%ld", bh->bufrHeaderCentre);
-    
-    /*
+
     else if (strcmp(key, "centre")==0) {
         char* centre_str = codes_bufr_header_get_centre_name(bh->edition, bh->bufrHeaderCentre);
         if (centre_str) *len = sprintf(val, "%s", centre_str);
         else *len = sprintf(val, "%ld", bh->bufrHeaderCentre);
     }
-    */
+
     else if (strcmp(key, "updateSequenceNumber")==0) *len = sprintf(val, "%ld", bh->updateSequenceNumber);
     else if (strcmp(key, "dataCategory")==0) *len = sprintf(val, "%ld", bh->dataCategory);
     else if (strcmp(key, "dataSubCategory")==0) *len = sprintf(val, "%ld", bh->dataSubCategory);
diff --git a/tests/bufr_extract_headers.c b/tests/bufr_extract_headers.c
index fc5d940e6..a029f613a 100644
--- a/tests/bufr_extract_headers.c
+++ b/tests/bufr_extract_headers.c
@@ -45,7 +45,8 @@ int main(int argc, char* argv[])
             char value[512]={0,};
             CODES_CHECK( codes_bufr_header_get_string(&header_array[i], requested_print_keys[j].name, value, &vlen), 0);
             assert(vlen > 0);
-            printf("%s ", value);
+            if (j > 0) printf(" ");
+            printf("%s", value);
         }
         printf("\n");
     }
diff --git a/tests/bufr_extract_headers.sh b/tests/bufr_extract_headers.sh
index beb6acc07..39cc5c20f 100755
--- a/tests/bufr_extract_headers.sh
+++ b/tests/bufr_extract_headers.sh
@@ -12,10 +12,56 @@
 
 # Define a common label for all the tmp files
 label="bufr_extract_headers_test"
-
 temp1="temp.${label}.1"
 temp2="temp.${label}.2"
 
+# Multi-message BUFR
+# --------------------
+input=${data_dir}/bufr/aeolus_wmo_26.bufr
+KEYS='offset,edition,totalLength'
+$EXEC ${test_dir}/bufr_extract_headers  $KEYS  $input > $temp1
+${tools_dir}/bufr_get                -p $KEYS  $input > $temp2
+diff $temp1 $temp2
+
+# Test local ECMWF keys; should be "not_found" for this input
+# -----------------------------------------------------------
+input=${data_dir}/bufr/PraticaTemp.bufr
+KEYS='localSectionPresent,rdbType,ident,isSatellite,satelliteID'
+$EXEC ${test_dir}/bufr_extract_headers $KEYS $input > $temp1
+${tools_dir}/bufr_get            -f -p $KEYS $input > $temp2
+diff $temp1 $temp2
+
+
+# Local Section keys
+# --------------------
+# DWD BUFR with a local section
+input=${data_dir}/bufr/uegabe.bufr
+r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
+[ "$r" = "1 0" ]
+# ECMWF BUFR but has no local section
+input=${data_dir}/bufr/207003.bufr
+r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
+[ "$r" = "0 0" ]
+# ECMWF BUFR with a local section
+input=${data_dir}/bufr/aaen_55.bufr
+r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
+[ "$r" = "1 1" ]
+
+# Key 'centre' as string
+# -----------------------
+r=`${test_dir}/bufr_extract_headers centre ${data_dir}/bufr/aaen_55.bufr`
+[ "$r" = "ecmf" ]
+r=`${test_dir}/bufr_extract_headers centre ${data_dir}/bufr/uegabe.bufr`
+[ "$r" = "edzw" ]
+r=`${test_dir}/bufr_extract_headers centre ${data_dir}/bufr/synop_multi_subset.bufr`
+[ "$r" = "enmi" ]
+r=`${test_dir}/bufr_extract_headers centre ${data_dir}/bufr/PraticaTemp.bufr`
+[ "$r" = "cnmc" ]
+r=`${test_dir}/bufr_extract_headers centre ${data_dir}/bufr/israel_observations_2017041010.bufr`
+[ "$r" = "234" ]
+
+# Test all BUFR files
+# ---------------------
 bufr_files=`cat ${data_dir}/bufr/bufr_data_files.txt`
 
 KEYS='edition,totalLength,bufrHeaderCentre,dataCategory,masterTablesVersionNumber,typicalMonth,typicalDay,rdbType,localYear,qualityControl,numberOfSubsets,compressedData,ident'
@@ -24,40 +70,12 @@ for bf in ${bufr_files}; do
     input=${data_dir}/bufr/$bf
     $EXEC ${test_dir}/bufr_extract_headers $KEYS $input > $temp1
     ${tools_dir}/bufr_get            -f -p $KEYS $input > $temp2
-    diff -w $temp1 $temp2
+    diff $temp1 $temp2
 done
 
 
-# Multi-message BUFR
-input=${data_dir}/bufr/aeolus_wmo_26.bufr
-KEYS='offset,edition,totalLength'
-$EXEC ${test_dir}/bufr_extract_headers  $KEYS  $input > $temp1
-${tools_dir}/bufr_get                -p $KEYS  $input > $temp2
-diff -w $temp1 $temp2
-
-# Test local ECMWF keys; should be "not_found" for this input
-input=${data_dir}/bufr/PraticaTemp.bufr
-KEYS='localSectionPresent,rdbType,ident,isSatellite,satelliteID'
-$EXEC ${test_dir}/bufr_extract_headers $KEYS $input > $temp1
-${tools_dir}/bufr_get            -f -p $KEYS $input > $temp2
-diff -w $temp1 $temp2
-
-# Local Section keys
-# DWD BUFR with a local section
-input=${data_dir}/bufr/uegabe.bufr
-r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
-[ "$r" = "1 0 " ]
-# ECMWF BUFR but has no local section
-input=${data_dir}/bufr/207003.bufr
-r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
-[ "$r" = "0 0 " ]
-# ECMWF BUFR with a local section
-input=${data_dir}/bufr/aaen_55.bufr
-r=`${test_dir}/bufr_extract_headers localSectionPresent,ecmwfLocalSectionPresent $input`
-[ "$r" = "1 1 " ]
-
-
-# BUFRs with localLatitude1, localLongitude1, localLongitude2 etc
+# BUFRs with localLatitude1, localLongitude2 etc
+# ----------------------------------------------
 bufr_files="
 aaen_55.bufr
 aben_55.bufr
@@ -165,7 +183,7 @@ for bf in ${bufr_files}; do
     input=${data_dir}/bufr/$bf
     $EXEC ${test_dir}/bufr_extract_headers $KEYS $input > $temp1
     ${tools_dir}/bufr_get            -f -p $KEYS $input > $temp2
-    diff -w $temp1 $temp2
+    diff $temp1 $temp2
 done
 
 

From 52e12d56984150af93ad31bfa9fc081c6717e017 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 20 Nov 2019 16:20:25 +0000
Subject: [PATCH 13/38] ECC-991: Add rdbSubtype

---
 src/bufr_util.c               |  8 +++++---
 src/grib_api.h                |  1 +
 tests/bufr_extract_headers.sh | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/bufr_util.c b/src/bufr_util.c
index 9d73c31a7..134dd82fa 100644
--- a/src/bufr_util.c
+++ b/src/bufr_util.c
@@ -192,6 +192,7 @@ static int bufr_decode_rdb_keys(const void* message, long offset_section2, codes
     hdr->qualityControl = (long)grib_decode_unsigned_long(message, &pos_qualityControl, nbits_qualityControl);
     hdr->newSubtype     = (long)grib_decode_unsigned_long(message, &pos_newSubtype, nbits_newSubtype);
     hdr->daLoop         = (long)grib_decode_unsigned_long(message, &pos_daLoop, nbits_daLoop);
+    hdr->rdbSubtype = (hdr->oldSubtype < 255) ? hdr->oldSubtype : hdr->newSubtype;
 
     return GRIB_SUCCESS;
 }
@@ -219,7 +220,7 @@ static int bufr_decode_extra_rdb_keys(const void* message, long offset_section2,
     } else {
         hdr->isSatellite = 0;
     }
-    
+
     if (hdr->isSatellite) {
         unsigned char* pKeyMoreLong = (unsigned char*)message + offset_keyMore; /* as an integer */
         unsigned char* pKeySat      = (unsigned char*)message + offset_keySat;
@@ -236,7 +237,7 @@ static int bufr_decode_extra_rdb_keys(const void* message, long offset_section2,
         start = 32;
         lValue = (long)grib_decode_unsigned_long(pKeyMoreLong, &start, 25);
         hdr->localLatitude2  = (lValue - 9000000)/100000.0;
-        
+
         if (hdr->oldSubtype == 255 || hdr->numberOfSubsets > 255 ||
             (hdr->oldSubtype >= 121 && hdr->oldSubtype <= 130)   ||
             hdr->oldSubtype==31)
@@ -353,7 +354,7 @@ static int bufr_decode_edition3(const void* message, codes_bufr_header* hdr)
     hdr->dataCategory        = (long)grib_decode_unsigned_long(message, &pos_dataCategory, nbits_dataCategory);
     hdr->dataSubCategory     = (long)grib_decode_unsigned_long(message, &pos_dataSubCategory, nbits_dataSubCategory);
     hdr->masterTablesVersionNumber = (long)grib_decode_unsigned_long(
-        message, &pos_masterTablesVersionNumber, nbits_masterTablesVersionNumber);
+            message, &pos_masterTablesVersionNumber, nbits_masterTablesVersionNumber);
     hdr->localTablesVersionNumber = (long)grib_decode_unsigned_long(message, &pos_localTablesVersionNumber, nbits_localTablesVersionNumber);
     typicalYearOfCentury = (long)grib_decode_unsigned_long(message, &pos_typicalYearOfCentury, nbits_typicalYearOfCentury);
     hdr->typicalYear = (typicalCentury - 1) * 100  + typicalYearOfCentury;
@@ -831,6 +832,7 @@ int codes_bufr_header_get_string(codes_bufr_header* bh, const char* key, char *v
     else if (strcmp(key, "localLongitude")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%g",  bh->localLongitude); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "qualityControl")==0)  { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->qualityControl); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "newSubtype")==0)      { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->newSubtype); else strcpy(val, NOT_FOUND); }
+    else if (strcmp(key, "rdbSubtype")==0)      { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->rdbSubtype); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "daLoop")==0)          { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->daLoop); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "localNumberOfObservations")==0) { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->localNumberOfObservations); else strcpy(val, NOT_FOUND); }
     else if (strcmp(key, "satelliteID")==0)    { if (isEcmwfLocal) *len = sprintf(val, "%ld", bh->satelliteID); else strcpy(val, NOT_FOUND); }
diff --git a/src/grib_api.h b/src/grib_api.h
index f086577b2..dd9b6f25f 100644
--- a/src/grib_api.h
+++ b/src/grib_api.h
@@ -1596,6 +1596,7 @@ typedef struct codes_bufr_header {
     /* ECMWF local section keys */
     long rdbType;
     long oldSubtype;
+    long rdbSubtype;
     char ident[9];
     long localYear;
     long localMonth;
diff --git a/tests/bufr_extract_headers.sh b/tests/bufr_extract_headers.sh
index 39cc5c20f..3bd9b5506 100755
--- a/tests/bufr_extract_headers.sh
+++ b/tests/bufr_extract_headers.sh
@@ -60,6 +60,23 @@ r=`${test_dir}/bufr_extract_headers centre ${data_dir}/bufr/PraticaTemp.bufr`
 r=`${test_dir}/bufr_extract_headers centre ${data_dir}/bufr/israel_observations_2017041010.bufr`
 [ "$r" = "234" ]
 
+
+# Test rdbSubtype
+# ---------------
+fBufr3Input=$ECCODES_SAMPLES_PATH/BUFR3_local.tmpl
+fBufr4Input=$ECCODES_SAMPLES_PATH/BUFR4_local.tmpl
+inputs="$fBufr3Input $fBufr4Input"
+for fin in $inputs; do
+  ${tools_dir}/bufr_set -s oldSubtype=2,newSubtype=300 $fin $temp1
+  r=`${test_dir}/bufr_extract_headers rdbSubtype,oldSubtype,newSubtype $temp1`
+  [ "$r" = "2 2 300" ]
+
+  ${tools_dir}/bufr_set -s oldSubtype=255,newSubtype=300 $fin $temp1
+  res=`${test_dir}/bufr_extract_headers rdbSubtype,oldSubtype,newSubtype $temp1`
+  [ "$res" = "300 255 300" ]
+done
+
+
 # Test all BUFR files
 # ---------------------
 bufr_files=`cat ${data_dir}/bufr/bufr_data_files.txt`

From 409b335691811eb879d5e7bd5e2af6d395eb2855 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 20 Nov 2019 17:41:53 +0000
Subject: [PATCH 14/38] ECC-1027: Table 4.230 empty in tableVersions 6 to 20

---
 definitions/grib2/tables/1/4.230.table  |   4 -
 definitions/grib2/tables/10/4.230.table | 406 ++++++++++++++++++++-
 definitions/grib2/tables/11/4.230.table | 406 ++++++++++++++++++++-
 definitions/grib2/tables/12/4.230.table | 412 +++++++++++++++++++++-
 definitions/grib2/tables/13/4.230.table | 412 +++++++++++++++++++++-
 definitions/grib2/tables/14/4.230.table | 411 +++++++++++++++++++++-
 definitions/grib2/tables/15/4.230.table | 413 +++++++++++++++++++++-
 definitions/grib2/tables/16/4.230.table | 413 +++++++++++++++++++++-
 definitions/grib2/tables/17/4.230.table | 413 +++++++++++++++++++++-
 definitions/grib2/tables/18/4.230.table | 436 ++++++++++++++++++++++-
 definitions/grib2/tables/19/4.230.table | 436 ++++++++++++++++++++++-
 definitions/grib2/tables/20/4.230.table | 447 +++++++++++++++++++++++
 definitions/grib2/tables/22/4.230.table | 449 ++++++++++++++++++++++++
 definitions/grib2/tables/6/4.230.table  | 116 +++++-
 definitions/grib2/tables/7/4.230.table  | 116 +++++-
 definitions/grib2/tables/8/4.230.table  | 414 +++++++++++++++++++++-
 definitions/grib2/tables/9/4.230.table  | 414 +++++++++++++++++++++-
 17 files changed, 6100 insertions(+), 18 deletions(-)
 create mode 100644 definitions/grib2/tables/22/4.230.table

diff --git a/definitions/grib2/tables/1/4.230.table b/definitions/grib2/tables/1/4.230.table
index 23e819b65..696ffe3e5 100644
--- a/definitions/grib2/tables/1/4.230.table
+++ b/definitions/grib2/tables/1/4.230.table
@@ -1,4 +1,3 @@
-#Code figure	Code figure	Meaning
 0	0	Air
 1	1	Ozone
 2	2	Water vapour
@@ -27,7 +26,6 @@
 25	25	Non-methane volatile organic compounds expressed as carbon
 26	26	Anthropogenic non-methane volatile organic compounds expressed as carbon
 27	27	Biogenic non-methane volatile organic compounds expressed as carbon
-#28-39999	28-39999	Reserved
 40000	40000	Sulphate dry aerosol
 40001	40001	Black carbon dry aerosol
 40002	40002	Particulate organic matter dry aerosol
@@ -42,6 +40,4 @@
 40011	40011	Nitrate dry aerosol
 40012	40012	Ammonium dry aerosol
 40013	40013	Water in ambient aerosol
-#40014-63999	40014-63999	Reserved
-#64000-65534	64000-65534	Reserved for local use
 65535	65535	Missing
diff --git a/definitions/grib2/tables/10/4.230.table b/definitions/grib2/tables/10/4.230.table
index 5c39a79b9..1b2c9300f 100644
--- a/definitions/grib2/tables/10/4.230.table
+++ b/definitions/grib2/tables/10/4.230.table
@@ -1,3 +1,407 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+10500 10500 Dimethyl sulphide
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulfur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
 65535 65535 Missing
diff --git a/definitions/grib2/tables/11/4.230.table b/definitions/grib2/tables/11/4.230.table
index 5c39a79b9..1b2c9300f 100644
--- a/definitions/grib2/tables/11/4.230.table
+++ b/definitions/grib2/tables/11/4.230.table
@@ -1,3 +1,407 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+10500 10500 Dimethyl sulphide
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulfur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
 65535 65535 Missing
diff --git a/definitions/grib2/tables/12/4.230.table b/definitions/grib2/tables/12/4.230.table
index 5c39a79b9..b35a9002e 100644
--- a/definitions/grib2/tables/12/4.230.table
+++ b/definitions/grib2/tables/12/4.230.table
@@ -1,3 +1,413 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+10500 10500 Dimethyl sulphide
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulfur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62019 62019 Reserved
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
 65535 65535 Missing
diff --git a/definitions/grib2/tables/13/4.230.table b/definitions/grib2/tables/13/4.230.table
index 5c39a79b9..b35a9002e 100644
--- a/definitions/grib2/tables/13/4.230.table
+++ b/definitions/grib2/tables/13/4.230.table
@@ -1,3 +1,413 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+10500 10500 Dimethyl sulphide
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulfur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62019 62019 Reserved
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
 65535 65535 Missing
diff --git a/definitions/grib2/tables/14/4.230.table b/definitions/grib2/tables/14/4.230.table
index 5c39a79b9..654de4d97 100644
--- a/definitions/grib2/tables/14/4.230.table
+++ b/definitions/grib2/tables/14/4.230.table
@@ -1,3 +1,412 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+10500 10500 Dimethyl sulphide
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulfur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
 65535 65535 Missing
diff --git a/definitions/grib2/tables/15/4.230.table b/definitions/grib2/tables/15/4.230.table
index 5c39a79b9..a7ce00d31 100644
--- a/definitions/grib2/tables/15/4.230.table
+++ b/definitions/grib2/tables/15/4.230.table
@@ -1,3 +1,414 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3
+14 14 Hydroperoxyl radical HO2
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Molecular hydrogen H
+21 21 Atomic nitrogen N
+22 22 Sulphate SO42-
+23 23 Radon Rn
+24 24 Elemental mercury Hg(0)
+25 25 Divalent mercury Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Oxygen O2
+10000 10000 Hydroxyl radical OH
+10001 10001 Methyl peroxy radical CH3O2
+10002 10002 Methyl hydroperoxide CH3O2H
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid CH3OOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butanes C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a CH3CCl3
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+62025 62025 Volcanic ash
 65535 65535 Missing
diff --git a/definitions/grib2/tables/16/4.230.table b/definitions/grib2/tables/16/4.230.table
index 5c39a79b9..a7ce00d31 100644
--- a/definitions/grib2/tables/16/4.230.table
+++ b/definitions/grib2/tables/16/4.230.table
@@ -1,3 +1,414 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3
+14 14 Hydroperoxyl radical HO2
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Molecular hydrogen H
+21 21 Atomic nitrogen N
+22 22 Sulphate SO42-
+23 23 Radon Rn
+24 24 Elemental mercury Hg(0)
+25 25 Divalent mercury Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Oxygen O2
+10000 10000 Hydroxyl radical OH
+10001 10001 Methyl peroxy radical CH3O2
+10002 10002 Methyl hydroperoxide CH3O2H
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid CH3OOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butanes C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a CH3CCl3
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+62025 62025 Volcanic ash
 65535 65535 Missing
diff --git a/definitions/grib2/tables/17/4.230.table b/definitions/grib2/tables/17/4.230.table
index 5c39a79b9..a7ce00d31 100644
--- a/definitions/grib2/tables/17/4.230.table
+++ b/definitions/grib2/tables/17/4.230.table
@@ -1,3 +1,414 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3
+14 14 Hydroperoxyl radical HO2
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Molecular hydrogen H
+21 21 Atomic nitrogen N
+22 22 Sulphate SO42-
+23 23 Radon Rn
+24 24 Elemental mercury Hg(0)
+25 25 Divalent mercury Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Oxygen O2
+10000 10000 Hydroxyl radical OH
+10001 10001 Methyl peroxy radical CH3O2
+10002 10002 Methyl hydroperoxide CH3O2H
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid CH3OOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butanes C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a CH3CCl3
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+62025 62025 Volcanic ash
 65535 65535 Missing
diff --git a/definitions/grib2/tables/18/4.230.table b/definitions/grib2/tables/18/4.230.table
index 5c39a79b9..d2e91fadb 100644
--- a/definitions/grib2/tables/18/4.230.table
+++ b/definitions/grib2/tables/18/4.230.table
@@ -1,3 +1,437 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3
+14 14 Hydroperoxyl radical HO2
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Molecular hydrogen H
+21 21 Atomic nitrogen N
+22 22 Sulphate SO42-
+23 23 Radon Rn
+24 24 Elemental mercury Hg(0)
+25 25 Divalent mercury Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Oxygen O2
+10000 10000 Hydroxyl radical OH
+10001 10001 Methyl peroxy radical CH3O2
+10002 10002 Methyl hydroperoxide CH3O2H
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid CH3OOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butanes C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a CH3CCl3
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+62025 62025 Volcanic ash
+62026 62026 Particulate matter (PM)
+62100 62100 Alnus (Alder) pollen
+62101 62101 Betula (Birch) pollen
+62102 62102 Castanea (Chestnut) pollen
+62103 62103 Carpinus (Hornbeam) pollen
+62104 62104 Corylus (Hazel) pollen
+62105 62105 Fagus (Beech) pollen
+62106 62106 Fraxinus (Ash) pollen
+62107 62107 Pinus (Pine) pollen
+62108 62108 Platanus (Plane) pollen
+62109 62109 Populus (Cottonwood, Poplar) pollen
+62110 62110 Quercus (Oak) pollen
+62111 62111 Salix (Willow) pollen
+62112 62112 Taxus (Yew) pollen
+62113 62113 Tilia (Lime, Linden) pollen
+62114 62114 Ulmus (Elm) pollen
+62200 62200 Ambrosia (Ragweed, Burr-ragweed ) pollen
+62201 62201 Artemisia (Sagebrush, Wormwood, Mugwort) pollen
+62202 62202 Brassica (Rape, Broccoli, Brussels Sprouts, Cabbage, Cauliflower, Collards, Kale, Kohlrabi, Mustard, Rutabaga) pollen
+62203 62203 Plantago (Plantain) pollen
+62204 62204 Rumex (Dock, Sorrel) pollen
+62205 62205 Urtica (Nettle) pollen
+62300 62300 Poaceae (Grass family) pollen
 65535 65535 Missing
diff --git a/definitions/grib2/tables/19/4.230.table b/definitions/grib2/tables/19/4.230.table
index 5c39a79b9..d2e91fadb 100644
--- a/definitions/grib2/tables/19/4.230.table
+++ b/definitions/grib2/tables/19/4.230.table
@@ -1,3 +1,437 @@
 # Code table 4.230 - Atmospheric chemical constituent type
-# (See Common Code table C-14)
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3
+14 14 Hydroperoxyl radical HO2
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Molecular hydrogen H
+21 21 Atomic nitrogen N
+22 22 Sulphate SO42-
+23 23 Radon Rn
+24 24 Elemental mercury Hg(0)
+25 25 Divalent mercury Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Oxygen O2
+10000 10000 Hydroxyl radical OH
+10001 10001 Methyl peroxy radical CH3O2
+10002 10002 Methyl hydroperoxide CH3O2H
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid CH3OOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butanes C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a CH3CCl3
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+62025 62025 Volcanic ash
+62026 62026 Particulate matter (PM)
+62100 62100 Alnus (Alder) pollen
+62101 62101 Betula (Birch) pollen
+62102 62102 Castanea (Chestnut) pollen
+62103 62103 Carpinus (Hornbeam) pollen
+62104 62104 Corylus (Hazel) pollen
+62105 62105 Fagus (Beech) pollen
+62106 62106 Fraxinus (Ash) pollen
+62107 62107 Pinus (Pine) pollen
+62108 62108 Platanus (Plane) pollen
+62109 62109 Populus (Cottonwood, Poplar) pollen
+62110 62110 Quercus (Oak) pollen
+62111 62111 Salix (Willow) pollen
+62112 62112 Taxus (Yew) pollen
+62113 62113 Tilia (Lime, Linden) pollen
+62114 62114 Ulmus (Elm) pollen
+62200 62200 Ambrosia (Ragweed, Burr-ragweed ) pollen
+62201 62201 Artemisia (Sagebrush, Wormwood, Mugwort) pollen
+62202 62202 Brassica (Rape, Broccoli, Brussels Sprouts, Cabbage, Cauliflower, Collards, Kale, Kohlrabi, Mustard, Rutabaga) pollen
+62203 62203 Plantago (Plantain) pollen
+62204 62204 Rumex (Dock, Sorrel) pollen
+62205 62205 Urtica (Nettle) pollen
+62300 62300 Poaceae (Grass family) pollen
 65535 65535 Missing
diff --git a/definitions/grib2/tables/20/4.230.table b/definitions/grib2/tables/20/4.230.table
index 16d22f7a8..272731d76 100644
--- a/definitions/grib2/tables/20/4.230.table
+++ b/definitions/grib2/tables/20/4.230.table
@@ -1,2 +1,449 @@
 # Code table 4.230 - Atmospheric chemical constituent type
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium NH4+
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3
+14 14 Hydroperoxyl radical HO2
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Molecular hydrogen H
+21 21 Atomic nitrogen N
+22 22 Sulphate SO42-
+23 23 Radon Rn
+24 24 Elemental mercury Hg(0)
+25 25 Divalent mercury Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Oxygen O2
+#39-9999 Reserved
+10000 10000 Hydroxyl radical OH
+10001 10001 Methyl peroxy radical CH3O2
+10002 10002 Methyl hydroperoxide CH3O2H
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid CH3OOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butanes C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+#10024-10499 Reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides...)
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+#10501-20000 Reserved
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a CH3CCl3
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+#20022-29999 Reserved
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+#30001-30009 Reserved
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+#30295-59999 Reserved
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+#60018-61999 Reserved
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+#62019 Reserved
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+62025 62025 Volcanic ash
+62026 62026 Particulate matter (PM)
+# 62027-62099 Reserved
+62100 62100 Alnus (Alder) pollen
+62101 62101 Betula (Birch) pollen
+62102 62102 Castanea (Chestnut) pollen
+62103 62103 Carpinus (Hornbeam) pollen
+62104 62104 Corylus (Hazel) pollen
+62105 62105 Fagus (Beech) pollen
+62106 62106 Fraxinus (Ash) pollen
+62107 62107 Pinus (Pine) pollen
+62108 62108 Platanus (Plane) pollen
+62109 62109 Populus (Cottonwood, Poplar) pollen
+62110 62110 Quercus (Oak) pollen
+62111 62111 Salix (Willow) pollen
+62112 62112 Taxus (Yew) pollen
+62113 62113 Tilia (Lime, Linden) pollen
+62114 62114 Ulmus (Elm) pollen
+# 62115-62199 Reserved
+62200 62200 Ambrosia (Ragweed, Burr-ragweed ) pollen
+62201 62201 Artemisia (Sagebrush, Wormwood, Mugwort) pollen
+62202 62202 Brassica (Rape, Broccoli, Brussels Sprouts, Cabbage, Cauliflower, Collards, Kale, Kohlrabi, Mustard, Rutabaga) pollen
+62203 62203 Plantago (Plantain) pollen
+62204 62204 Rumex (Dock, Sorrel) pollen
+62205 62205 Urtica (Nettle) pollen
+# 62206-62299 Reserved 
+62300 62300 Poaceae (Grass family) pollen
+# 62301-65534 Reserved
 65535 65535 Missing
diff --git a/definitions/grib2/tables/22/4.230.table b/definitions/grib2/tables/22/4.230.table
new file mode 100644
index 000000000..dfc1ffc31
--- /dev/null
+++ b/definitions/grib2/tables/22/4.230.table
@@ -0,0 +1,449 @@
+# Code table 4.230 - Atmospheric chemical constituent type
+0 0 Ozone O3
+1 1 Water vapour H2O
+2 2 Methane CH4
+3 3 Carbon dioxide CO2
+4 4 Carbon monoxide CO
+5 5 Nitrogen dioxide NO2
+6 6 Nitrous oxide N2O
+7 7 Formaldehyde HCHO
+8 8 Sulphur dioxide SO2
+9 9 Ammonia NH3
+10 10 Ammonium NH4
+11 11 Nitrogen monoxide NO
+12 12 Atomic oxygen O
+13 13 Nitrate radical NO3
+14 14 Hydroperoxyl radical HO2
+15 15 Dinitrogen pentoxide N2O5
+16 16 Nitrous acid HONO
+17 17 Nitric acid HNO3
+18 18 Peroxynitric acid HO2NO2
+19 19 Hydrogen peroxide H2O2
+20 20 Molecular hydrogen H2
+21 21 Atomic nitrogen N
+22 22 Sulphate SO42-
+23 23 Radon Rn
+24 24 Elemental mercury Hg(0)
+25 25 Divalent mercury Hg2+
+26 26 Atomic chlorine Cl
+27 27 Chlorine monoxide ClO
+28 28 Dichlorine peroxide Cl2O2
+29 29 Hypochlorous acid HClO
+30 30 Chlorine nitrate ClONO2
+31 31 Chlorine dioxide ClO2
+32 32 Atomic bromine Br
+33 33 Bromine monoxide BrO
+34 34 Bromine chloride BrCl
+35 35 Hydrogen bromide HBr
+36 36 Hypobromous acid HBrO
+37 37 Bromine nitrate BrONO2
+38 38 Oxygen O2
+#39-9999 Reserved
+10000 10000 Hydroxyl radical OH
+10001 10001 Methyl peroxy radical CH3O2
+10002 10002 Methyl hydroperoxide CH3O2H
+10004 10004 Methanol CH3OH
+10005 10005 Formic acid CH3OOH
+10006 10006 Hydrogen cyanide HCN
+10007 10007 Aceto nitrile CH3CN
+10008 10008 Ethane C2H6
+10009 10009 Ethene (= Ethylene) C2H4
+10010 10010 Ethyne (= Acetylene) C2H2
+10011 10011 Ethanol C2H5OH
+10012 10012 Acetic acid C2H5OOH
+10013 10013 Peroxyacetyl nitrate CH3C(O)OONO2
+10014 10014 Propane C3H8
+10015 10015 Propene C3H6
+10016 10016 Butanes C4H10
+10017 10017 Isoprene C5H10
+10018 10018 Alpha pinene C10H16
+10019 10019 Beta pinene C10H16
+10020 10020 Limonene C10H16
+10021 10021 Benzene C6H6
+10022 10022 Toluene C7H8
+10023 10023 Xylene C8H10
+#10024-10499 Reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides...)
+10500 10500 Dimethyl sulphide CH3SCH3 (DMS)
+#10501-20000 Reserved
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a CH3CCl3
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+#20022-29999 Reserved
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+#30001-30009 Reserved
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulphur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44 Ti-44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+#30295-59999 Reserved
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+60017 60017 NOx expressed as nitrogen dioxide (NO2)
+#60018-61999 Reserved
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+#62019 Reserved
+62020 62020 Smoke - high absorption
+62021 62021 Smoke - low absorption
+62022 62022 Aerosol - high absorption
+62023 62023 Aerosol - low absorption
+62025 62025 Volcanic ash
+62026 62026 Particulate matter (PM)
+# 62027-62099 Reserved
+62100 62100 Alnus (Alder) pollen
+62101 62101 Betula (Birch) pollen
+62102 62102 Castanea (Chestnut) pollen
+62103 62103 Carpinus (Hornbeam) pollen
+62104 62104 Corylus (Hazel) pollen
+62105 62105 Fagus (Beech) pollen
+62106 62106 Fraxinus (Ash) pollen
+62107 62107 Pinus (Pine) pollen
+62108 62108 Platanus (Plane) pollen
+62109 62109 Populus (Cottonwood, Poplar) pollen
+62110 62110 Quercus (Oak) pollen
+62111 62111 Salix (Willow) pollen
+62112 62112 Taxus (Yew) pollen
+62113 62113 Tilia (Lime, Linden) pollen
+62114 62114 Ulmus (Elm) pollen
+# 62115-62199 Reserved
+62200 62200 Ambrosia (Ragweed, Burr-ragweed ) pollen
+62201 62201 Artemisia (Sagebrush, Wormwood, Mugwort) pollen
+62202 62202 Brassica (Rape, Broccoli, Brussels Sprouts, Cabbage, Cauliflower, Collards, Kale, Kohlrabi, Mustard, Rutabaga) pollen
+62203 62203 Plantago (Plantain) pollen
+62204 62204 Rumex (Dock, Sorrel) pollen
+62205 62205 Urtica (Nettle) pollen
+# 62206-62299 Reserved 
+62300 62300 Poaceae (Grass family) pollen
+# 62301-65534 Reserved
+65535 65535 Missing
diff --git a/definitions/grib2/tables/6/4.230.table b/definitions/grib2/tables/6/4.230.table
index 0a81b2eb7..7bcbe3043 100644
--- a/definitions/grib2/tables/6/4.230.table
+++ b/definitions/grib2/tables/6/4.230.table
@@ -1,3 +1,117 @@
 #Code figure	Code figure	Meaning
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen Cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+#10024-10499 10024-10499 reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides,...)
+10500 10500 Dimethyl sulphide
+#10501-20000 10501-20000 Reserved
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen
+60005 60005 Total inorganic chlorine
+60006 60006 Total inorganic bromine
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped Alkanes
+60010 60010 Lumped Alkenes
+60011 60011 Lumped Aromatic Compounds
+60012 60012 Lumped Terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
 65535 65535 Missing
diff --git a/definitions/grib2/tables/7/4.230.table b/definitions/grib2/tables/7/4.230.table
index 0a81b2eb7..7bcbe3043 100644
--- a/definitions/grib2/tables/7/4.230.table
+++ b/definitions/grib2/tables/7/4.230.table
@@ -1,3 +1,117 @@
 #Code figure	Code figure	Meaning
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen Cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+#10024-10499 10024-10499 reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides,...)
+10500 10500 Dimethyl sulphide
+#10501-20000 10501-20000 Reserved
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen
+60005 60005 Total inorganic chlorine
+60006 60006 Total inorganic bromine
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped Alkanes
+60010 60010 Lumped Alkenes
+60011 60011 Lumped Aromatic Compounds
+60012 60012 Lumped Terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
 65535 65535 Missing
diff --git a/definitions/grib2/tables/8/4.230.table b/definitions/grib2/tables/8/4.230.table
index c5e8f2b40..afd1ab8db 100644
--- a/definitions/grib2/tables/8/4.230.table
+++ b/definitions/grib2/tables/8/4.230.table
@@ -1,3 +1,415 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+#38-9999 Reserved
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen Cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+#10024-10499 Reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides...)
+10500 10500 Dimethyl sulphide
+#10501-20000 Reserved
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+#20022-29999 Reserved
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+#30001-30009 Reserved
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulfur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+#30295-59999 Reserved
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+#60017-61999 Reserved
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+#62019-65534 Reserved
 65535 65535 Missing
diff --git a/definitions/grib2/tables/9/4.230.table b/definitions/grib2/tables/9/4.230.table
index c5e8f2b40..afd1ab8db 100644
--- a/definitions/grib2/tables/9/4.230.table
+++ b/definitions/grib2/tables/9/4.230.table
@@ -1,3 +1,415 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-# (See Common Code table C-14)
+0 0 Ozone
+1 1 Water vapour
+2 2 Methane
+3 3 Carbon dioxide
+4 4 Carbon monoxide
+5 5 Nitrogen dioxide
+6 6 Nitrous oxide
+7 7 Formaldehyde
+8 8 Sulphur dioxide
+9 9 Ammonia
+10 10 Ammonium
+11 11 Nitrogen monoxide
+12 12 Atomic oxygen
+13 13 Nitrate radical
+14 14 Hydroperoxyl radical
+15 15 Dinitrogen pentoxide
+16 16 Nitrous acid
+17 17 Nitric acid
+18 18 Peroxynitric acid
+19 19 Hydrogen peroxide
+20 20 Molecular hydrogen
+21 21 Atomic nitrogen
+22 22 Sulphate
+23 23 Radon
+24 24 Elemental mercury
+25 25 Divalent mercury
+26 26 Atomic chlorine
+27 27 Chlorine monoxide
+28 28 Dichlorine peroxide
+29 29 Hypochlorous acid
+30 30 Chlorine nitrate
+31 31 Chlorine dioxide
+32 32 Atomic bromine
+33 33 Bromine monoxide
+34 34 Bromine chloride
+35 35 Hydrogen bromide
+36 36 Hypobromous acid
+37 37 Bromine nitrate
+#38-9999 Reserved
+10000 10000 Hydroxyl radical
+10001 10001 Methyl peroxy radical
+10002 10002 Methyl hydroperoxide
+10004 10004 Methanol
+10005 10005 Formic acid
+10006 10006 Hydrogen Cyanide
+10007 10007 Aceto nitrile
+10008 10008 Ethane
+10009 10009 Ethene (= Ethylene)
+10010 10010 Ethyne (= Acetylene)
+10011 10011 Ethanol
+10012 10012 Acetic acid
+10013 10013 Peroxyacetyl nitrate
+10014 10014 Propane
+10015 10015 Propene
+10016 10016 Butanes
+10017 10017 Isoprene
+10018 10018 Alpha pinene
+10019 10019 Beta pinene
+10020 10020 Limonene
+10021 10021 Benzene
+10022 10022 Toluene
+10023 10023 Xylene
+#10024-10499 Reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides...)
+10500 10500 Dimethyl sulphide
+#10501-20000 Reserved
+20001 20001 Hydrogen chloride
+20002 20002 CFC-11
+20003 20003 CFC-12
+20004 20004 CFC-113
+20005 20005 CFC-113a
+20006 20006 CFC-114
+20007 20007 CFC-115
+20008 20008 HCFC-22
+20009 20009 HCFC-141b
+20010 20010 HCFC-142b
+20011 20011 Halon-1202
+20012 20012 Halon-1211
+20013 20013 Halon-1301
+20014 20014 Halon-2402
+20015 20015 Methyl chloride (HCC-40)
+20016 20016 Carbon tetrachloride (HCC-10)
+20017 20017 HCC-140a
+20018 20018 Methyl bromide (HBC-40B1)
+20019 20019 Hexachlorocyclohexane (HCH)
+20020 20020 Alpha hexachlorocyclohexane
+20021 20021 Hexachlorobiphenyl (PCB-153)
+#20022-29999 Reserved
+30000 30000 Radioactive pollutant (tracer, defined by originating centre)
+#30001-30009 Reserved
+30010 30010 Hydrogen H-3
+30011 30011 Hydrogen organic bounded H-3o
+30012 30012 Hydrogen inorganic H-3a
+30013 30013 Beryllium 7 Be-7
+30014 30014 Beryllium 10 Be-10
+30015 30015 Carbon 14 C-14
+30016 30016 Carbon 14 CO2 C-14CO2
+30017 30017 Carbon 14 other gases C-14og
+30018 30018 Nitrogen 13 N-13
+30019 30019 Nitrogen 16 N-16
+30020 30020 Fluorine 18 F-18
+30021 30021 Sodium 22 Na-22
+30022 30022 Phosphate 32 P-32
+30023 30023 Phosphate 33 P-33
+30024 30024 Sulfur 35 S-35
+30025 30025 Chlorine 36 Cl-36
+30026 30026 Potassium 40 K-40
+30027 30027 Argon 41 Ar-41
+30028 30028 Calcium 41 Ca-41
+30029 30029 Calcium 45 Ca-45
+30030 30030 Titanium 44
+30031 30031 Scandium 46 Sc-46
+30032 30032 Vanadium 48 V-48
+30033 30033 Vanadium 49 V-49
+30034 30034 Chrome 51 Cr-51
+30035 30035 Manganese 52 Mn-52
+30036 30036 Manganese 54 Mn-54
+30037 30037 Iron 55 Fe-55
+30038 30038 Iron 59 Fe-59
+30039 30039 Cobalt 56 Co-56
+30040 30040 Cobalt 57 Co-57
+30041 30041 Cobalt 58 Co-58
+30042 30042 Cobalt 60 Co-60
+30043 30043 Nickel 59 Ni-59
+30044 30044 Nickel 63 Ni-63
+30045 30045 Zinc 65 Zn-65
+30046 30046 Gallium 67 Ga-67
+30047 30047 Gallium 68 Ga-68
+30048 30048 Germanium 68 Ge-68
+30049 30049 Germanium 69 Ge-69
+30050 30050 Arsenic 73 As-73
+30051 30051 Selenium 75 Se-75
+30052 30052 Selenium 79 Se-79
+30053 30053 Rubidium 81 Rb-81
+30054 30054 Rubidium 83 Rb-83
+30055 30055 Rubidium 84 Rb-84
+30056 30056 Rubidium 86 Rb-86
+30057 30057 Rubidium 87 Rb-87
+30058 30058 Rubidium 88 Rb-88
+30059 30059 Krypton 85 Kr-85
+30060 30060 Krypton 85 metastable Kr-85m
+30061 30061 Krypton 87 Kr-87
+30062 30062 Krypton 88 Kr-88
+30063 30063 Krypton 89 Kr-89
+30064 30064 Strontium 85 Sr-85
+30065 30065 Strontium 89 Sr-89
+30066 30066 Strontium 89/90 Sr-8990
+30067 30067 Strontium 90 Sr-90
+30068 30068 Strontium 91 Sr-91
+30069 30069 Strontium 92 Sr-92
+30070 30070 Yttrium 87 Y-87
+30071 30071 Yttrium 88 Y-88
+30072 30072 Yttrium 90 Y-90
+30073 30073 Yttrium 91 Y-91
+30074 30074 Yttrium 91 metastable Y-91m
+30075 30075 Yttrium 92 Y-92
+30076 30076 Yttrium 93 Y-93
+30077 30077 Zirconium 89 Zr-89
+30078 30078 Zirconium 93 Zr-93
+30079 30079 Zirconium 95 Zr-95
+30080 30080 Zirconium 97 Zr-97
+30081 30081 Niobium 93 metastable Nb-93m
+30082 30082 Niobium 94 Nb-94
+30083 30083 Niobium 95 Nb-95
+30084 30084 Niobium 95 metastable Nb-95m
+30085 30085 Niobium 97 Nb-97
+30086 30086 Niobium 97 metastable Nb-97m
+30087 30087 Molybdenum 93 Mo-93
+30088 30088 Molybdenum 99 Mo-99
+30089 30089 Technetium 95 metastable Tc-95m
+30090 30090 Technetium 96 Tc-96
+30091 30091 Technetium 99 Tc-99
+30092 30092 Technetium 99 metastable Tc-99m
+30093 30093 Rhodium 99 Rh-99
+30094 30094 Rhodium 101 Rh-101
+30095 30095 Rhodium 102 metastable Rh-102m
+30096 30096 Rhodium 103 metastable Rh-103m
+30097 30097 Rhodium 105 Rh-105
+30098 30098 Rhodium 106 Rh-106
+30099 30099 Palladium 100 Pd-100
+30100 30100 Palladium 103 Pd-103
+30101 30101 Palladium 107 Pd-107
+30102 30102 Ruthenium 103 Ru-103
+30103 30103 Ruthenium 105 Ru-105
+30104 30104 Ruthenium 106 Ru-106
+30105 30105 Silver 108 metastable Ag-108m
+30106 30106 Silver 110 metastable Ag-110m
+30107 30107 Cadmium 109 Cd-109
+30108 30108 Cadmium 113 metastable Cd-113m
+30109 30109 Cadmium 115 metastable Cd-115m
+30110 30110 Indium 114 metastable In-114m
+30111 30111 Tin 113 Sn-113
+30112 30112 Tin 119 metastable Sn-119m
+30113 30113 Tin 121 metastable Sn-121m
+30114 30114 Tin 122 Sn-122
+30115 30115 Tin 123 Sn-123
+30116 30116 Tin 126 Sn-126
+30117 30117 Antimony 124 Sb-124
+30118 30118 Antimony 125 Sb-125
+30119 30119 Antimony 126 Sb-126
+30120 30120 Antimony 127 Sb-127
+30121 30121 Antimony 129 Sb-129
+30122 30122 Tellurium 123 metastable Te-123m
+30123 30123 Tellurium 125 metastable Te-125m
+30124 30124 Tellurium 127 Te-127
+30125 30125 Tellurium 127 metastable Te-127m
+30126 30126 Tellurium 129 Te-129
+30127 30127 Tellurium 129 metastable Te-129m
+30128 30128 Tellurium 131 metastable Te-131m
+30129 30129 Tellurium 132 Te-132
+30130 30130 Iodine 123 I-123
+30131 30131 Iodine 124 I-124
+30132 30132 Iodine 125 I-125
+30133 30133 Iodine 126 I-126
+30134 30134 Iodine 129 I-129
+30135 30135 Iodine 129 elementary gaseous I-129g
+30136 30136 Iodine 129 organic bounded I-129o
+30137 30137 Iodine 131 I-131
+30138 30138 Iodine 131 elementary gaseous I-131g
+30139 30139 Iodine 131 organic bounded I-131o
+30140 30140 Iodine 131 gaseous elementary and organic bounded I-131go
+30141 30141 Iodine 131 aerosol I-131a
+30142 30142 Iodine 132 I-132
+30143 30143 Iodine 132 elementary gaseous I-132g
+30144 30144 Iodine 132 organic bounded I-132o
+30145 30145 Iodine 132 gaseous elementary and organic bounded I-132go
+30146 30146 Iodine 132 aerosol I-132a
+30147 30147 Iodine 133 I-133
+30148 30148 Iodine 133 elementary gaseous I-133g
+30149 30149 Iodine 133 organic bounded I-133o
+30150 30150 Iodine 133 gaseous elementary and organic bounded I-133go
+30151 30151 Iodine 133 aerosol I-133a
+30152 30152 Iodine 134 I-134
+30153 30153 Iodine 134 elementary gaseous I-134g
+30154 30154 Iodine 134 organic bounded I-134o
+30155 30155 Iodine 135 I-135
+30156 30156 Iodine 135 elementary gaseous I-135g
+30157 30157 Iodine 135 organic bounded I-135o
+30158 30158 Iodine 135 gaseous elementary and organic bounded I-135go
+30159 30159 Iodine 135 aerosol I-135a
+30160 30160 Xenon 131 metastable Xe-131m
+30161 30161 Xenon 133 Xe-133
+30162 30162 Xenon 133 metastable Xe-133m
+30163 30163 Xenon 135 Xe-135
+30164 30164 Xenon 135 metastable Xe-135m
+30165 30165 Xenon 137 Xe-137
+30166 30166 Xenon 138 Xe-138
+30167 30167 Xenon sum of all Xenon isotopes Xe-sum
+30168 30168 Caesium 131 Cs-131
+30169 30169 Caesium 134 Cs-134
+30170 30170 Caesium 135 Cs-135
+30171 30171 Caesium 136 Cs-136
+30172 30172 Caesium 137 Cs-137
+30173 30173 Barium 133 Ba-133
+30174 30174 Barium 137 metastable Ba-137m
+30175 30175 Barium 140 Ba-140
+30176 30176 Cerium 139 Ce-139
+30177 30177 Cerium 141 Ce-141
+30178 30178 Cerium 143 Ce-143
+30179 30179 Cerium 144 Ce-144
+30180 30180 Lanthanum 140 La-140
+30181 30181 Lanthanum 141 La-141
+30182 30182 Praseodymium 143 Pr-143
+30183 30183 Praseodymium 144 Pr-144
+30184 30184 Praseodymium 144 metastable Pr-144m
+30185 30185 Samarium 145 Sm-145
+30186 30186 Samarium 147 Sm-147
+30187 30187 Samarium 151 Sm-151
+30188 30188 Neodymium 147 Nd-147
+30189 30189 Promethium 146 Pm-146
+30190 30190 Promethium 147 Pm-147
+30191 30191 Promethium 151 Pm-151
+30192 30192 Europium 152 Eu-152
+30193 30193 Europium 154 Eu-154
+30194 30194 Europium 155 Eu-155
+30195 30195 Gadolinium 153 Gd-153
+30196 30196 Terbium 160 Tb-160
+30197 30197 Holmium 166 metastable Ho-166m
+30198 30198 Thulium 170 Tm-170
+30199 30199 Ytterbium 169 Yb-169
+30200 30200 Hafnium 175 Hf-175
+30201 30201 Hafnium 181 Hf-181
+30202 30202 Tantalum 179 Ta-179
+30203 30203 Tantalum 182 Ta-182
+30204 30204 Rhenium 184 Re-184
+30205 30205 Iridium 192 Ir-192
+30206 30206 Mercury 203 Hg-203
+30207 30207 Thallium 204 Tl-204
+30208 30208 Thallium 207 Tl-207
+30209 30209 Thallium 208 Tl-208
+30210 30210 Thallium 209 Tl-209
+30211 30211 Bismuth 205 Bi-205
+30212 30212 Bismuth 207 Bi-207
+30213 30213 Bismuth 210 Bi-210
+30214 30214 Bismuth 211 Bi-211
+30215 30215 Bismuth 212 Bi-212
+30216 30216 Bismuth 213 Bi-213
+30217 30217 Bismuth 214 Bi-214
+30218 30218 Polonium 208 Po-208
+30219 30219 Polonium 210 Po-210
+30220 30220 Polonium 212 Po-212
+30221 30221 Polonium 213 Po-213
+30222 30222 Polonium 214 Po-214
+30223 30223 Polonium 215 Po-215
+30224 30224 Polonium 216 Po-216
+30225 30225 Polonium 218 Po-218
+30226 30226 Lead 209 Pb-209
+30227 30227 Lead 210 Pb-210
+30228 30228 Lead 211 Pb-211
+30229 30229 Lead 212 Pb-212
+30230 30230 Lead 214 Pb-214
+30231 30231 Astatine 217 At-217
+30232 30232 Radon 219 Rn-219
+30233 30233 Radon 220 Rn-220
+30234 30234 Radon 222 Rn-222
+30235 30235 Francium 221 Fr-221
+30236 30236 Francium 223 Fr-223
+30237 30237 Radium 223 Ra-223
+30238 30238 Radium 224 Ra-224
+30239 30239 Radium 225 Ra-225
+30240 30240 Radium 226 Ra-226
+30241 30241 Radium 228 Ra-228
+30242 30242 Actinium 225 Ac-225
+30243 30243 Actinium 227 Ac-227
+30244 30244 Actinium 228 Ac-228
+30245 30245 Thorium 227 Th-227
+30246 30246 Thorium 228 Th-228
+30247 30247 Thorium 229 Th-229
+30248 30248 Thorium 230 Th-230
+30249 30249 Thorium 231 Th-231
+30250 30250 Thorium 232 Th-232
+30251 30251 Thorium 234 Th-234
+30252 30252 Protactinium 231 Pa-231
+30253 30253 Protactinium 233 Pa-233
+30254 30254 Protactinium 234 metastable Pa-234m
+30255 30255 Uranium 232 U-232
+30256 30256 Uranium 233 U-233
+30257 30257 Uranium 234 U-234
+30258 30258 Uranium 235 U-235
+30259 30259 Uranium 236 U-236
+30260 30260 Uranium 237 U-237
+30261 30261 Uranium 238 U-238
+30262 30262 Plutonium 236 Pu-236
+30263 30263 Plutonium 238 Pu-238
+30264 30264 Plutonium 239 Pu-239
+30265 30265 Plutonium 240 Pu-240
+30266 30266 Plutonium 241 Pu-241
+30267 30267 Plutonium 242 Pu-242
+30268 30268 Plutonium 244 Pu-244
+30269 30269 Neptunium 237 Np-237
+30270 30270 Neptunium 238 Np-238
+30271 30271 Neptunium 239 Np-239
+30272 30272 Americium 241 Am-241
+30273 30273 Americium 242 Am-242
+30274 30274 Americium 242 metastable Am-242m
+30275 30275 Americium 243 Am-243
+30276 30276 Curium 242 Cm-242
+30277 30277 Curium 243 Cm-243
+30278 30278 Curium 244 Cm-244
+30279 30279 Curium 245 Cm-245
+30280 30280 Curium 246 Cm-246
+30281 30281 Curium 247 Cm-247
+30282 30282 Curium 248 Cm-248
+30283 30283 Curium 243/244 Cm-243244
+30284 30284 Plutonium 238/Americium 241 Pu-238Am-241
+30285 30285 Plutonium 239/240 Pu-239240
+30286 30286 Berkelium 249 Bk-249
+30287 30287 Californium 249 Cf-249
+30288 30288 Californium 250 Cf-250
+30289 30289 Californium 252 Cf-252
+30290 30290 Sum aerosol particulates SumAer
+30291 30291 Sum Iodine SumIod
+30292 30292 Sum noble gas SumNG
+30293 30293 Activation gas ActGas
+30294 30294 Cs-137 Equivalent EquCs137
+#30295-59999 Reserved
+60000 60000 HOx radical (OH+HO2)
+60001 60001 Total inorganic and organic peroxy radicals (HO2 + RO2)
+60002 60002 Passive Ozone
+60003 60003 NOx expressed as nitrogen NOx
+60004 60004 All nitrogen oxides (NOy) expressed as nitrogen NOy
+60005 60005 Total inorganic chlorine Clx
+60006 60006 Total inorganic bromine Brx
+60007 60007 Total inorganic chlorine except HCl, ClONO2: ClOx
+60008 60008 Total inorganic bromine except HBr, BrONO2: BrOx
+60009 60009 Lumped alkanes
+60010 60010 Lumped alkenes
+60011 60011 Lumped aromatic compounds
+60012 60012 Lumped terpenes
+60013 60013 Non-methane volatile organic compounds expressed as carbon
+60014 60014 Anthropogenic non-methane volatile organic compounds expressed as carbon
+60015 60015 Biogenic non-methane volatile organic compounds expressed as carbon
+60016 60016 Lumped oxygenated hydrocarbons
+#60017-61999 Reserved
+62000 62000 Total aerosol
+62001 62001 Dust dry
+62002 62002 Water in ambient
+62003 62003 Ammonium dry
+62004 62004 Nitrate dry
+62005 62005 Nitric acid trihydrate
+62006 62006 Sulphate dry
+62007 62007 Mercury dry
+62008 62008 Sea salt dry
+62009 62009 Black carbon dry
+62010 62010 Particulate organic matter dry
+62011 62011 Primary particulate organic matter dry
+62012 62012 Secondary particulate organic matter dry
+62013 62013 Black carbon hydrophilic dry
+62014 62014 Black carbon hydrophobic dry
+62015 62015 Particulate organic matter hydrophilic dry
+62016 62016 Particulate organic matter hydrophobic dry
+62017 62017 Nitrate hydrophilic dry
+62018 62018 Nitrate hydrophobic dry
+#62019-65534 Reserved
 65535 65535 Missing

From 04abee9234ee20d90b5d147b4f546bad99d6ab89 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 21 Nov 2019 12:00:02 +0000
Subject: [PATCH 15/38] ECC-1023: grib_to_netcdf: when writing to a directory
 without permissions, the error message is very cryptic

---
 tools/grib_to_netcdf.c | 100 ++++++++++++++++++++++-------------------
 1 file changed, 54 insertions(+), 46 deletions(-)

diff --git a/tools/grib_to_netcdf.c b/tools/grib_to_netcdf.c
index 2c83a22eb..adb3319a2 100644
--- a/tools/grib_to_netcdf.c
+++ b/tools/grib_to_netcdf.c
@@ -25,7 +25,10 @@
 #include "eccodes_windef.h"
 
 #ifdef ECCODES_ON_WINDOWS
-#include <stdint.h>
+ #include <stdint.h>
+ #define ecc_snprintf _snprintf
+#else
+ #define ecc_snprintf snprintf
 #endif
 
 const char* grib_tool_description = "Convert a GRIB file to netCDF format."
@@ -2124,14 +2127,16 @@ static nc_type translate_nctype(const char *name)
     return NC_SHORT;
 }
 
-static void check_err(const int stat, const int line, const char *file)
+static void check_err(const char* function, const int stat, const int line)
 {
     if(stat != NC_NOERR)
     {
-        (void) fprintf(stderr, "line %d of %s: %s\n", line, file, nc_strerror(stat));
+        /* (void) fprintf(stderr, "line %d of %s: %s\n", line, grib_tool_name, nc_strerror(stat)); */
+        (void)fprintf(stderr, "\n%s ERROR: line %d, %s: %s\n",
+                      grib_tool_name, line, function, nc_strerror(stat));
         if (stat == NC_EVARSIZE) {
-            (void) fprintf(stderr, "\nCannot create netCDF classic format, dataset is too large!\n"
-                    "Try splitting the input GRIB(s).\n");
+            (void)fprintf(stderr, "\nCannot create netCDF classic format, dataset is too large!\n"
+                                  "Try splitting the input GRIB(s).\n");
         }
         exit(1);
     }
@@ -2149,22 +2154,22 @@ static int set_dimension(int ncid, const char *name, int n, int xtype, const cha
         n = NC_UNLIMITED;
 
     stat = nc_def_dim(ncid, name, n, &dim_id);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_def_dim", stat, __LINE__);
 
     dim_vec[0] = dim_id;
     stat = nc_def_var(ncid, name, (nc_type) xtype, 1, dim_vec, &var_id);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_def_var", stat, __LINE__);
 
     if(units != NULL)
     {
         stat = nc_put_att_text(ncid, var_id, "units", strlen(units), units);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_put_att_text", stat, __LINE__);
     }
 
     if(long_name != NULL)
     {
         stat = nc_put_att_text(ncid, var_id, "long_name", strlen(long_name), long_name);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_put_att_text", stat, __LINE__);
     }
 
     return var_id;
@@ -2324,7 +2329,7 @@ static int put_latlon(int ncid, fieldset *fs)
     /* longitude */
     n = ni;
     stat = nc_inq_varid(ncid, "longitude", &var_id);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_inq_varid", stat, __LINE__);
     if((e = grib_get_double_array(g->handle, "distinctLongitudes", dvalues, &n)) != GRIB_SUCCESS)
     {
         grib_context_log(ctx, GRIB_LOG_ERROR, "ecCodes: put_latlon: cannot get distinctLongitudes: %s", grib_get_error_message(e));
@@ -2335,12 +2340,12 @@ static int put_latlon(int ncid, fieldset *fs)
     for(i=0; i< n; i++) { fvalues[i] = dvalues[i]; }
 
     stat = nc_put_var_float(ncid, var_id, fvalues);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_put_var_float", stat, __LINE__);
 
     /* latitude */
     n = nj;
     stat = nc_inq_varid(ncid, "latitude", &var_id);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_inq_varid", stat, __LINE__);
     if((e = grib_get_double_array(g->handle, "distinctLatitudes", dvalues, &n)) != GRIB_SUCCESS)
     {
         grib_context_log(ctx, GRIB_LOG_ERROR, "ecCodes: put_latlon: cannot get distinctLatitudes: %s", grib_get_error_message(e));
@@ -2351,7 +2356,7 @@ static int put_latlon(int ncid, fieldset *fs)
 
     for(i=0; i< n; i++) { fvalues[i] = dvalues[i]; }
     stat = nc_put_var_float(ncid, var_id, fvalues);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_put_var_float", stat, __LINE__);
 
     /* g->purge_header = TRUE; */
     release_field(g);
@@ -2806,7 +2811,7 @@ static int put_data(hypercube *h, int ncid, const char *name, dataset_t *subset)
     release_field(f);
 
     stat = nc_inq_varid(ncid, name, &dataid);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_inq_varid", stat, __LINE__);
 
     /* GRIB-792: Build fast array storing values for the "time" axis. */
     /* This is for performance reasons */
@@ -2891,7 +2896,7 @@ static int put_data(hypercube *h, int ncid, const char *name, dataset_t *subset)
             grib_context_log(ctx, GRIB_LOG_DEBUG, "grib_to_netcdf: Put data from field %d", i);
 
             stat = nc_put_vara_type(ncid, dataid, start, count, vscaled, subset->att.nctype);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_vara_type", stat, __LINE__);
         }
 
         /* g->purge_header = TRUE; */
@@ -3103,11 +3108,11 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
                 {
                     char *period = "0000-01-00 00:00:00";
                     stat = nc_put_att_text(ncid, var_id, "avg_period", strlen(period), period);
-                    check_err(stat, __LINE__, __FILE__);
+                    check_err("nc_put_att_text", stat, __LINE__);
                 }
 
                 stat = nc_put_att_text(ncid, var_id, "calendar", strlen(cal), cal);
-                check_err(stat, __LINE__, __FILE__);
+                check_err("nc_put_att_text", stat, __LINE__);
             }
         }
     }
@@ -3122,17 +3127,17 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
         printf("%s: Defining variable '%s'.\n", grib_tool_name, subsets[i].att.name);
 
         stat = nc_def_var(ncid, subsets[i].att.name, subsets[i].att.nctype, n, dims, &var_id);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_def_var", stat, __LINE__);
 
         if (setup.deflate > -1)
         {
 #ifdef NC_NETCDF4
             stat = nc_def_var_chunking(ncid, var_id, NC_CHUNKED, chunks);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_def_var_chunking", stat, __LINE__);
 
             /* Set compression settings for a variable */
             stat = nc_def_var_deflate(ncid, var_id, setup.shuffle, 1, setup.deflate);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_def_var_deflate", stat, __LINE__);
 #else
             grib_context_log(ctx, GRIB_LOG_ERROR, "Deflate option only supported in NetCDF4");
 #endif
@@ -3141,43 +3146,43 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
         {
             compute_scale(&subsets[i]);
             stat = nc_put_att_double(ncid, var_id, "scale_factor", NC_DOUBLE, 1, &subsets[i].scale_factor);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_att_double", stat, __LINE__);
 
             stat = nc_put_att_double(ncid, var_id, "add_offset", NC_DOUBLE, 1, &subsets[i].add_offset);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_att_double", stat, __LINE__);
         }
 
         stat = nc_put_att_type(ncid, var_id, "_FillValue", subsets[i].att.nctype, 1, nc_type_values[subsets[i].att.nctype].nc_type_missing);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_put_att_type", stat, __LINE__);
         stat = nc_put_att_type(ncid, var_id, "missing_value", subsets[i].att.nctype, 1, nc_type_values[subsets[i].att.nctype].nc_type_missing);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_put_att_type", stat, __LINE__);
 
         if(subsets[i].att.units)
         {
             const char *txt = subsets[i].att.units;
             stat = nc_put_att_text(ncid, var_id, "units", strlen(txt), txt);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_att_text", stat, __LINE__);
         }
 
         if(subsets[i].att.long_name)
         {
             const char *txt = subsets[i].att.long_name;
             stat = nc_put_att_text(ncid, var_id, "long_name", strlen(txt), txt);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_att_text", stat, __LINE__);
         }
 
         if(subsets[i].att.short_name)
         {
             const char *txt = subsets[i].att.short_name;
             stat = nc_put_att_text(ncid, var_id, "short_name", strlen(txt), txt);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_att_text", stat, __LINE__);
         }
 
         if(subsets[i].att.standard_name)
         {
             const char *txt = subsets[i].att.standard_name;
             stat = nc_put_att_text(ncid, var_id, "standard_name", strlen(txt), txt);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_att_text", stat, __LINE__);
         }
 
 #if 0
@@ -3185,7 +3190,7 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
         {
             const char *txt = subsets[i].att.long_name;
             stat = nc_put_att_text(ncid, var_id, "other",strlen(txt),txt);
-            check_err(stat,__LINE__,__FILE__);
+            check_err("nc_put_att_text", stat,__LINE__,__FILE__);
         }
 #endif
 
@@ -3197,7 +3202,7 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
             {
                 const char *txt = p->values->name;
                 stat = nc_put_att_text(ncid, var_id, p->name, strlen(txt), txt);
-                check_err(stat, __LINE__, __FILE__);
+                check_err("nc_put_att_text", stat, __LINE__);
 
                 p = p->next;
             }
@@ -3211,7 +3216,7 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
         /* parameter *p = data_r->params; */
         parameter *p = setup.mars_description->params;
         stat = nc_def_var(ncid, "MARS", NC_CHAR, 0, 0, &var_id);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_def_var", stat, __LINE__);
 
         /* Store request for those parameters with single value */
         while(p)
@@ -3232,7 +3237,7 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
                 {
                     printf("Error setting request for %s = %s\n", par, val);
                 }
-                check_err(stat, __LINE__, __FILE__);
+                check_err("nc_put_att_text", stat, __LINE__);
             }
             p = p->next;
         }
@@ -3249,7 +3254,7 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
 
         /* Convention */
         stat = nc_put_att_text(ncid, NC_GLOBAL, "Conventions", strlen(convention), convention);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_put_att_text", stat, __LINE__);
 
         /* Use history provided or Timestamp */
         if(setup.history)
@@ -3267,7 +3272,7 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
             sprintf(history, "%s by grib_to_netcdf-%d.%d.%d: %s", timestamp, major, minor, revision, argvString);
         }
         stat = nc_put_att_text(ncid, NC_GLOBAL, "history", strlen(history), history);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_put_att_text", stat, __LINE__);
 
 #if 0
         stat = nc_put_att_text(ncid, NC_GLOBAL, "source",strlen(setup.source),setup.source);
@@ -3280,7 +3285,7 @@ static int define_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid, datase
         if(setup.title)
         {
             stat = nc_put_att_text(ncid, NC_GLOBAL, "title", strlen(setup.title), setup.title);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_att_text", stat, __LINE__);
         }
 
     }
@@ -3365,7 +3370,7 @@ static int fill_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid)
         }
 
         stat = nc_inq_varid(ncid, (lowaxis), &var_id);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_inq_varid", stat, __LINE__);
 
         /* if ( strcmp("time", axis) == 0 && setup.unlimited != NULL && strcmp(setup.unlimited, "time") == 0 && setup.usevalidtime) */
         /* GRIB-437, GRIB-625 Special treatment of RECORD (unlimited) dimension */
@@ -3381,15 +3386,15 @@ static int fill_netcdf_dimensions(hypercube *h, fieldset *fs, int ncid)
             count[0] = n;
 
             stat = nc_inq_vartype(ncid, var_id, &dim_type); /* get the type of this dimension */
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_inq_vartype", stat, __LINE__);
 
             stat = nc_put_vara_type(ncid, var_id, start, count, values, dim_type);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_vara_type", stat, __LINE__);
         }
         else
         {
             stat = nc_put_var_int(ncid, var_id, values);
-            check_err(stat, __LINE__, __FILE__);
+            check_err("nc_put_var_int", stat, __LINE__);
         }
 
         grib_context_free(ctx, values);
@@ -4412,22 +4417,26 @@ int grib_tool_finalise_action(grib_runtime_options* options)
 
     creation_mode = get_creation_mode(option_kind);
     stat = nc_create(options->outfile->name, creation_mode, &ncid);
-    check_err(stat, __LINE__, __FILE__);
+    if (stat != NC_NOERR) {
+        char msg[1024];
+        ecc_snprintf(msg, sizeof(msg), "nc_create: '%s'", options->outfile->name);
+        check_err(msg, stat, __LINE__);
+    }
 
     /* Define netcdf dataset */
     err = define_netcdf_dimensions(dims, fs, ncid, subsets, count, data_r);
     if (err != GRIB_SUCCESS) {
         stat = nc_close(ncid);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_close", stat, __LINE__);
         stat = nc_delete(options->outfile->name);
-        check_err(stat, __LINE__, __FILE__);
+        check_err("nc_delete", stat, __LINE__);
 
         exit(1);
     }
 
     /* End definitions */
     stat = nc_enddef(ncid);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_enddef", stat, __LINE__);
 
     /* Fill dimensions */
     fill_netcdf_dimensions(dims, fs, ncid);
@@ -4438,8 +4447,7 @@ int grib_tool_finalise_action(grib_runtime_options* options)
         if(subsets[i].fset)
         {
             char dataset[100];
-
-            sprintf(dataset, subsets[i].att.name, i + 1);
+            ecc_snprintf(dataset, sizeof(dataset), subsets[i].att.name, i + 1);
             put_data(dims, ncid, dataset, &subsets[i]);
         }
         else
@@ -4449,7 +4457,7 @@ int grib_tool_finalise_action(grib_runtime_options* options)
     }
 
     stat = nc_close(ncid);
-    check_err(stat, __LINE__, __FILE__);
+    check_err("nc_close", stat, __LINE__);
 
     free_all_requests(data_r);
     free_hypercube(dims);

From 40b59d968ea960a346f00a815286ad3cf477d58d Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 21 Nov 2019 12:27:15 +0000
Subject: [PATCH 16/38] Refactoring

---
 src/grib_api_internal.h | 3 +++
 tools/grib_to_netcdf.c  | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h
index 4e7ca8dd1..43fa2722e 100644
--- a/src/grib_api_internal.h
+++ b/src/grib_api_internal.h
@@ -64,6 +64,7 @@
    #include <dirent.h>
    #include <unistd.h>
    #include <inttypes.h>
+   #define ecc_snprintf snprintf
 #else
    #include <direct.h>
    #include <io.h>
@@ -99,6 +100,8 @@
    #    define strdup(str)         _strdup(str)
    #  endif
 
+   #define ecc_snprintf _snprintf
+
 #endif
 
 
diff --git a/tools/grib_to_netcdf.c b/tools/grib_to_netcdf.c
index adb3319a2..d20d45d0c 100644
--- a/tools/grib_to_netcdf.c
+++ b/tools/grib_to_netcdf.c
@@ -26,9 +26,6 @@
 
 #ifdef ECCODES_ON_WINDOWS
  #include <stdint.h>
- #define ecc_snprintf _snprintf
-#else
- #define ecc_snprintf snprintf
 #endif
 
 const char* grib_tool_description = "Convert a GRIB file to netCDF format."

From 93bb2bab52493d44fc27c143773d23f0595824f1 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 21 Nov 2019 13:14:12 +0000
Subject: [PATCH 17/38] ECC-993: CRRA needs eps number for mars

---
 definitions/grib2/template.4.eps.def | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/definitions/grib2/template.4.eps.def b/definitions/grib2/template.4.eps.def
index a5ccc0a15..2252000bd 100644
--- a/definitions/grib2/template.4.eps.def
+++ b/definitions/grib2/template.4.eps.def
@@ -11,13 +11,15 @@ alias number=perturbationNumber;
 unsigned[1] numberOfForecastsInEnsemble  : dump;
 alias totalNumber=numberOfForecastsInEnsemble;
 
-#  Rules for TIGGE, S2S and UERRA
+#  Rules for TIGGE, S2S, UERRA and CRRA
 if (productionStatusOfProcessedData == 4 ||
     productionStatusOfProcessedData == 5 ||
     productionStatusOfProcessedData == 6 ||
     productionStatusOfProcessedData == 7 ||
     productionStatusOfProcessedData == 8 ||
-    productionStatusOfProcessedData == 9)
+    productionStatusOfProcessedData == 9 ||
+    productionStatusOfProcessedData == 10||
+    productionStatusOfProcessedData == 11)
 {
     alias mars.number=perturbationNumber;
 }

From e802f0b0097149e8ca4b96d216f6d3bbb00d5dbd Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 21 Nov 2019 14:50:43 +0000
Subject: [PATCH 18/38] ECC-1028: Segmentation fault: bufr_dump -d on message
 with incorrect replication

---
 src/grib_accessor_class_expanded_descriptors.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/grib_accessor_class_expanded_descriptors.c b/src/grib_accessor_class_expanded_descriptors.c
index e0cf65c22..f0236e0ae 100644
--- a/src/grib_accessor_class_expanded_descriptors.c
+++ b/src/grib_accessor_class_expanded_descriptors.c
@@ -739,18 +739,16 @@ static int pack_long(grib_accessor* a, const long* val, size_t *len)
 static int value_count(grib_accessor* a,long* rlen)
 {
     grib_accessor_expanded_descriptors* self = (grib_accessor_expanded_descriptors*)a;
-    int ret=0;
-    grib_context* c=a->context;
+    int err=0;
     *rlen=0;
 
-    ret=expand(a);
-    *rlen=BUFR_DESCRIPTORS_ARRAY_USED_SIZE(self->expanded);
-    if (ret) {
-        grib_context_log(c,GRIB_LOG_ERROR,"%s unable to compute size",a->name);
-        return ret;
+    err=expand(a);
+    if (err) {
+        grib_context_log(a->context,GRIB_LOG_ERROR,"%s unable to compute size",a->name);
+        return err;
     }
-
-    return ret;
+    *rlen=BUFR_DESCRIPTORS_ARRAY_USED_SIZE(self->expanded);
+    return err;
 }
 
 static void destroy(grib_context* c,grib_accessor* a)

From 47dba875f5c7b17d2d19c866ab0776579b100bdc Mon Sep 17 00:00:00 2001
From: Richard Mladek <Richard.Mladek@ecmwf.int>
Date: Thu, 21 Nov 2019 15:01:56 +0000
Subject: [PATCH 19/38] pl levels update for CERRA

---
 tigge/tigge_check.c | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/tigge/tigge_check.c b/tigge/tigge_check.c
index 615782211..235b42e2f 100755
--- a/tigge/tigge_check.c
+++ b/tigge/tigge_check.c
@@ -554,7 +554,7 @@ static void pressure_level(grib_handle* h,const parameter* p,double min,double m
 {
     long level = get(h,"level");
 
-    if (is_uerra){
+    if (is_uerra && !is_crra){
         switch(level)
         {
         case 1000:
@@ -577,7 +577,7 @@ static void pressure_level(grib_handle* h,const parameter* p,double min,double m
         case  150:
         case  100:
         case   70:
-        case  50:
+        case   50:
         case   30:
         case   20:
         case   10:
@@ -588,6 +588,45 @@ static void pressure_level(grib_handle* h,const parameter* p,double min,double m
             break;
         }
     }
+    else if (is_uerra && is_crra){
+        switch(level)
+        {
+        case 1000:
+        case  975:
+        case  950:
+        case  925:
+        case  900:
+        case  875:
+        case  850:
+        case  825:
+        case  800:
+        case  750:
+        case  700:
+        case  600:
+        case  500:
+        case  400:
+        case  300:
+        case  250:
+        case  200:
+        case  150:
+        case  100:
+        case   70:
+        case   50:
+        case   30:
+        case   20:
+        case   10:
+        case    7:
+        case    5:
+        case    3:
+        case    2:
+        case    1:
+            break;
+        default:
+            printf("%s, field %d [%s]: invalid pressure level %ld\n",file,field,param,level);
+            error++;
+            break;
+        }
+    }
     else if (is_s2s){
         switch(level)
         {

From 5cdd11271ca51495791d832f97326f9775064f97 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 21 Nov 2019 17:33:09 +0000
Subject: [PATCH 20/38] Refactoring

---
 src/grib_jasper_encoding.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/grib_jasper_encoding.c b/src/grib_jasper_encoding.c
index a3de941c6..45a2d2ba0 100644
--- a/src/grib_jasper_encoding.c
+++ b/src/grib_jasper_encoding.c
@@ -161,11 +161,7 @@ int grib_jasper_encode(grib_context *c, j2k_encode_helper *helper)
     if( helper->compression != 0)
     {
         /* Lossy */
-#ifndef ECCODES_ON_WINDOWS
-        snprintf (opts, MAXOPTSSIZE, "mode=real\nrate=%f", 1.0/helper->compression);
-#else
-        _snprintf(opts, MAXOPTSSIZE, "mode=real\nrate=%f", 1.0/helper->compression);
-#endif
+        ecc_snprintf(opts, MAXOPTSSIZE, "mode=real\nrate=%f", 1.0/helper->compression);
     }
 
     Assert(cmpt.width_ * cmpt.height_ * cmpt.cps_ == buflen);

From 4eadf6d37a54fa779d1c718b0d19f7e96434c367 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 21 Nov 2019 17:59:20 +0000
Subject: [PATCH 21/38] ECC-1022: Grib2 Keys: parameterName, parameterUnits are
 displayed incorrectly if the parameterName includes parentheses

---
 definitions/grib2/tables/10/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/10/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/10/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/10/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/10/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/10/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/10/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/10/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/10/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/10/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/10/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/10/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/10/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/10/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/10/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/10/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/10/4.2.10.191.table |  2 +-
 definitions/grib2/tables/10/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/10/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/10/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/11/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/11/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/11/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/11/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/11/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/11/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/11/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/11/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/11/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/11/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/11/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/11/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/11/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/11/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/11/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/11/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/11/4.2.10.191.table |  2 +-
 definitions/grib2/tables/11/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/11/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/11/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/12/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/12/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/12/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/12/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/12/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/12/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/12/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/12/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/12/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/12/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/12/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/12/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/12/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/12/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/12/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/12/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/12/4.2.10.191.table |  2 +-
 definitions/grib2/tables/12/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/12/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/12/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/13/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/13/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/13/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/13/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/13/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/13/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/13/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/13/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/13/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/13/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/13/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/13/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/13/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/13/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/13/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/13/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/13/4.2.10.191.table |  2 +-
 definitions/grib2/tables/13/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/13/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/13/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/14/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/14/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/14/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/14/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/14/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/14/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/14/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/14/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/14/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/14/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/14/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/14/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/14/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/14/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/14/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/14/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/14/4.2.10.191.table |  2 +-
 definitions/grib2/tables/14/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/14/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/14/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/15/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/15/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/15/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/15/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/15/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/15/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/15/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/15/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/15/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/15/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/15/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/15/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/15/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/15/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/15/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/15/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/15/4.2.10.191.table |  2 +-
 definitions/grib2/tables/15/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/15/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/15/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/16/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/16/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/16/4.2.0.19.table   |  4 ++--
 definitions/grib2/tables/16/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/16/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/16/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/16/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/16/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/16/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/16/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/16/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/16/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/16/4.2.10.191.table |  2 +-
 definitions/grib2/tables/16/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/16/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/16/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/16/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/17/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/17/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/17/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/17/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/17/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/17/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/17/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/17/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/17/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/17/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/17/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/17/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/17/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/17/4.2.10.191.table |  2 +-
 definitions/grib2/tables/17/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/17/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/17/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/17/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/18/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/18/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/18/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/18/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/18/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/18/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/18/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/18/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/18/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/18/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/18/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/18/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/18/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/18/4.2.10.191.table |  2 +-
 definitions/grib2/tables/18/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/18/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/18/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/18/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/19/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/19/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/19/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/19/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/19/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/19/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/19/4.2.0.20.table   | 18 +++++++++---------
 definitions/grib2/tables/19/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/19/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/19/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/19/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/19/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/19/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/19/4.2.10.191.table |  2 +-
 definitions/grib2/tables/19/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/19/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/19/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/19/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/20/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/20/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/20/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/20/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/20/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/20/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/20/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/20/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/20/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/20/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/20/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/20/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/20/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/20/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/20/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/20/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/20/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/20/4.2.10.191.table |  2 +-
 definitions/grib2/tables/20/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/20/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/20/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/20/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/21/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/21/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/21/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/21/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/21/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/21/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/21/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/21/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/21/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/21/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/21/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/21/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/21/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/21/4.2.10.191.table |  2 +-
 definitions/grib2/tables/21/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/21/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/21/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/21/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/23/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/23/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/23/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/23/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/23/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/23/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/23/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/23/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/23/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/23/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/23/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/23/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/23/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/23/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/23/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/23/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/23/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/23/4.2.10.191.table |  2 +-
 definitions/grib2/tables/23/4.2.10.4.table   | 12 ++++++------
 definitions/grib2/tables/23/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/23/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/23/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/23/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/24/4.2.0.15.table   |  8 ++++----
 definitions/grib2/tables/24/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/24/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/24/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/24/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/24/4.2.0.2.table    | 12 ++++++------
 definitions/grib2/tables/24/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/24/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/24/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/24/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/24/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/24/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/24/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/24/4.2.10.191.table |  2 +-
 definitions/grib2/tables/24/4.2.10.4.table   | 10 +++++-----
 definitions/grib2/tables/24/4.2.2.0.table    |  6 +++---
 definitions/grib2/tables/24/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/24/4.2.2.4.table    | 14 +++++++-------
 definitions/grib2/tables/24/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/4/4.2.0.1.table     |  2 +-
 definitions/grib2/tables/5/4.2.0.2.table     |  2 +-
 definitions/grib2/tables/6/4.2.0.2.table     |  2 +-
 definitions/grib2/tables/7/4.2.0.2.table     |  2 +-
 definitions/grib2/tables/8/4.2.0.2.table     |  2 +-
 definitions/grib2/tables/9/4.2.0.0.table     |  4 ++--
 definitions/grib2/tables/9/4.2.0.1.table     | 16 ++++++++--------
 definitions/grib2/tables/9/4.2.0.15.table    |  8 ++++----
 definitions/grib2/tables/9/4.2.0.18.table    |  2 +-
 definitions/grib2/tables/9/4.2.0.19.table    |  2 +-
 definitions/grib2/tables/9/4.2.0.191.table   |  2 +-
 definitions/grib2/tables/9/4.2.0.2.table     | 12 ++++++------
 definitions/grib2/tables/9/4.2.0.20.table    | 10 +++++-----
 definitions/grib2/tables/9/4.2.0.4.table     | 10 +++++-----
 definitions/grib2/tables/9/4.2.0.5.table     |  4 ++--
 definitions/grib2/tables/9/4.2.0.6.table     |  2 +-
 definitions/grib2/tables/9/4.2.0.7.table     |  6 +++---
 definitions/grib2/tables/9/4.2.1.0.table     |  4 ++--
 definitions/grib2/tables/9/4.2.1.1.table     |  6 +++---
 definitions/grib2/tables/9/4.2.1.2.table     |  2 +-
 definitions/grib2/tables/9/4.2.10.0.table    | 16 ++++++++--------
 definitions/grib2/tables/9/4.2.10.1.table    |  2 +-
 definitions/grib2/tables/9/4.2.10.191.table  |  2 +-
 definitions/grib2/tables/9/4.2.10.2.table    |  2 +-
 definitions/grib2/tables/9/4.2.2.0.table     |  4 ++--
 definitions/grib2/tables/9/4.2.2.3.table     | 16 ++++++++--------
 definitions/grib2/tables/9/4.2.3.1.table     |  4 ++--
 324 files changed, 1037 insertions(+), 1037 deletions(-)

diff --git a/definitions/grib2/tables/10/4.2.0.0.table b/definitions/grib2/tables/10/4.2.0.0.table
index debc0a6f4..13adadb70 100644
--- a/definitions/grib2/tables/10/4.2.0.0.table
+++ b/definitions/grib2/tables/10/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew-point temperature (K)
-7 7 Dew-point depression (or deficit) (K)
+7 7 Dew-point depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/10/4.2.0.1.table b/definitions/grib2/tables/10/4.2.0.1.table
index fbebb792d..d8c498d7a 100644
--- a/definitions/grib2/tables/10/4.2.0.1.table
+++ b/definitions/grib2/tables/10/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/10/4.2.0.15.table b/definitions/grib2/tables/10/4.2.0.15.table
index 895892f86..004d02950 100644
--- a/definitions/grib2/tables/10/4.2.0.15.table
+++ b/definitions/grib2/tables/10/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically-integrated liquid water (VIL) (kg m-2)
+3 3 Vertically-integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/10/4.2.0.18.table b/definitions/grib2/tables/10/4.2.0.18.table
index 30060fd2d..aa2e3d1fb 100644
--- a/definitions/grib2/tables/10/4.2.0.18.table
+++ b/definitions/grib2/tables/10/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/10/4.2.0.19.table b/definitions/grib2/tables/10/4.2.0.19.table
index e6c97e5f9..922efb1ed 100644
--- a/definitions/grib2/tables/10/4.2.0.19.table
+++ b/definitions/grib2/tables/10/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather (Code table 4.225)
diff --git a/definitions/grib2/tables/10/4.2.0.191.table b/definitions/grib2/tables/10/4.2.0.191.table
index 81230c0e0..4833f8f88 100644
--- a/definitions/grib2/tables/10/4.2.0.191.table
+++ b/definitions/grib2/tables/10/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/10/4.2.0.2.table b/definitions/grib2/tables/10/4.2.0.2.table
index 17ff85867..3251431dd 100644
--- a/definitions/grib2/tables/10/4.2.0.2.table
+++ b/definitions/grib2/tables/10/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 2: momentum
-0 0 Wind direction (from which blowing) (degree true) (deg)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/10/4.2.0.20.table b/definitions/grib2/tables/10/4.2.0.20.table
index cc2dbcc52..e636a5ee9 100644
--- a/definitions/grib2/tables/10/4.2.0.20.table
+++ b/definitions/grib2/tables/10/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (Sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [Sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/10/4.2.0.4.table b/definitions/grib2/tables/10/4.2.0.4.table
index fea4cafc3..0b83187b4 100644
--- a/definitions/grib2/tables/10/4.2.0.4.table
+++ b/definitions/grib2/tables/10/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/10/4.2.0.5.table b/definitions/grib2/tables/10/4.2.0.5.table
index b0c93dd3a..032d152ad 100644
--- a/definitions/grib2/tables/10/4.2.0.5.table
+++ b/definitions/grib2/tables/10/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 5: long-wave radiation
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/10/4.2.0.6.table b/definitions/grib2/tables/10/4.2.0.6.table
index 055df76a5..0f60b71b6 100644
--- a/definitions/grib2/tables/10/4.2.0.6.table
+++ b/definitions/grib2/tables/10/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/10/4.2.0.7.table b/definitions/grib2/tables/10/4.2.0.7.table
index 7a7d2008b..244272e58 100644
--- a/definitions/grib2/tables/10/4.2.0.7.table
+++ b/definitions/grib2/tables/10/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/10/4.2.1.0.table b/definitions/grib2/tables/10/4.2.1.0.table
index 4e72e1ab3..00b032310 100644
--- a/definitions/grib2/tables/10/4.2.1.0.table
+++ b/definitions/grib2/tables/10/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/10/4.2.1.1.table b/definitions/grib2/tables/10/4.2.1.1.table
index cb5117dc8..3b95971a9 100644
--- a/definitions/grib2/tables/10/4.2.1.1.table
+++ b/definitions/grib2/tables/10/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/10/4.2.1.2.table b/definitions/grib2/tables/10/4.2.1.2.table
index 2c70c6bd0..842b8da1a 100644
--- a/definitions/grib2/tables/10/4.2.1.2.table
+++ b/definitions/grib2/tables/10/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/10/4.2.10.0.table b/definitions/grib2/tables/10/4.2.10.0.table
index a620c36ba..0319fb0b5 100644
--- a/definitions/grib2/tables/10/4.2.10.0.table
+++ b/definitions/grib2/tables/10/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 10 - Oceanographic products, parameter category 0: waves
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/10/4.2.10.191.table b/definitions/grib2/tables/10/4.2.10.191.table
index 14085ac9a..f0936614f 100644
--- a/definitions/grib2/tables/10/4.2.10.191.table
+++ b/definitions/grib2/tables/10/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/10/4.2.2.0.table b/definitions/grib2/tables/10/4.2.2.0.table
index d9498c4fc..83547c3c8 100644
--- a/definitions/grib2/tables/10/4.2.2.0.table
+++ b/definitions/grib2/tables/10/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 2 - Land surface products, parameter category 0: vegetation/biomass
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/10/4.2.2.3.table b/definitions/grib2/tables/10/4.2.2.3.table
index 4c5e2a4b4..4a900111e 100644
--- a/definitions/grib2/tables/10/4.2.2.3.table
+++ b/definitions/grib2/tables/10/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/10/4.2.3.1.table b/definitions/grib2/tables/10/4.2.3.1.table
index 176ac35fb..beae6d7c5 100644
--- a/definitions/grib2/tables/10/4.2.3.1.table
+++ b/definitions/grib2/tables/10/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/11/4.2.0.0.table b/definitions/grib2/tables/11/4.2.0.0.table
index f7784cc33..8cda6d39e 100644
--- a/definitions/grib2/tables/11/4.2.0.0.table
+++ b/definitions/grib2/tables/11/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/11/4.2.0.1.table b/definitions/grib2/tables/11/4.2.0.1.table
index 2d8fbed8c..a7b5e08bb 100644
--- a/definitions/grib2/tables/11/4.2.0.1.table
+++ b/definitions/grib2/tables/11/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/11/4.2.0.15.table b/definitions/grib2/tables/11/4.2.0.15.table
index 9a178ceb7..470d3ba3d 100644
--- a/definitions/grib2/tables/11/4.2.0.15.table
+++ b/definitions/grib2/tables/11/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/11/4.2.0.18.table b/definitions/grib2/tables/11/4.2.0.18.table
index 82fd13da1..af78a53f3 100644
--- a/definitions/grib2/tables/11/4.2.0.18.table
+++ b/definitions/grib2/tables/11/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/11/4.2.0.19.table b/definitions/grib2/tables/11/4.2.0.19.table
index e6c97e5f9..922efb1ed 100644
--- a/definitions/grib2/tables/11/4.2.0.19.table
+++ b/definitions/grib2/tables/11/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather (Code table 4.225)
diff --git a/definitions/grib2/tables/11/4.2.0.191.table b/definitions/grib2/tables/11/4.2.0.191.table
index 81230c0e0..4833f8f88 100644
--- a/definitions/grib2/tables/11/4.2.0.191.table
+++ b/definitions/grib2/tables/11/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/11/4.2.0.2.table b/definitions/grib2/tables/11/4.2.0.2.table
index d587f84e9..b969e0634 100644
--- a/definitions/grib2/tables/11/4.2.0.2.table
+++ b/definitions/grib2/tables/11/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 2: momentum
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/11/4.2.0.20.table b/definitions/grib2/tables/11/4.2.0.20.table
index 22cea6061..e1dcea60a 100644
--- a/definitions/grib2/tables/11/4.2.0.20.table
+++ b/definitions/grib2/tables/11/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/11/4.2.0.4.table b/definitions/grib2/tables/11/4.2.0.4.table
index fea4cafc3..0b83187b4 100644
--- a/definitions/grib2/tables/11/4.2.0.4.table
+++ b/definitions/grib2/tables/11/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/11/4.2.0.5.table b/definitions/grib2/tables/11/4.2.0.5.table
index b0c93dd3a..032d152ad 100644
--- a/definitions/grib2/tables/11/4.2.0.5.table
+++ b/definitions/grib2/tables/11/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 5: long-wave radiation
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/11/4.2.0.6.table b/definitions/grib2/tables/11/4.2.0.6.table
index 051830aff..bacbbdfbf 100644
--- a/definitions/grib2/tables/11/4.2.0.6.table
+++ b/definitions/grib2/tables/11/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/11/4.2.0.7.table b/definitions/grib2/tables/11/4.2.0.7.table
index 7a7d2008b..244272e58 100644
--- a/definitions/grib2/tables/11/4.2.0.7.table
+++ b/definitions/grib2/tables/11/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/11/4.2.1.0.table b/definitions/grib2/tables/11/4.2.1.0.table
index 4e72e1ab3..00b032310 100644
--- a/definitions/grib2/tables/11/4.2.1.0.table
+++ b/definitions/grib2/tables/11/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/11/4.2.1.1.table b/definitions/grib2/tables/11/4.2.1.1.table
index cb5117dc8..3b95971a9 100644
--- a/definitions/grib2/tables/11/4.2.1.1.table
+++ b/definitions/grib2/tables/11/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/11/4.2.1.2.table b/definitions/grib2/tables/11/4.2.1.2.table
index 2c70c6bd0..842b8da1a 100644
--- a/definitions/grib2/tables/11/4.2.1.2.table
+++ b/definitions/grib2/tables/11/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/11/4.2.10.0.table b/definitions/grib2/tables/11/4.2.10.0.table
index b820364fa..8eb807f78 100644
--- a/definitions/grib2/tables/11/4.2.10.0.table
+++ b/definitions/grib2/tables/11/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 10 - Oceanographic products, parameter category 0: waves
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/11/4.2.10.191.table b/definitions/grib2/tables/11/4.2.10.191.table
index 14085ac9a..f0936614f 100644
--- a/definitions/grib2/tables/11/4.2.10.191.table
+++ b/definitions/grib2/tables/11/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/11/4.2.2.0.table b/definitions/grib2/tables/11/4.2.2.0.table
index d9498c4fc..83547c3c8 100644
--- a/definitions/grib2/tables/11/4.2.2.0.table
+++ b/definitions/grib2/tables/11/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 2 - Land surface products, parameter category 0: vegetation/biomass
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/11/4.2.2.3.table b/definitions/grib2/tables/11/4.2.2.3.table
index 4c5e2a4b4..4a900111e 100644
--- a/definitions/grib2/tables/11/4.2.2.3.table
+++ b/definitions/grib2/tables/11/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/11/4.2.3.1.table b/definitions/grib2/tables/11/4.2.3.1.table
index 176ac35fb..beae6d7c5 100644
--- a/definitions/grib2/tables/11/4.2.3.1.table
+++ b/definitions/grib2/tables/11/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/12/4.2.0.0.table b/definitions/grib2/tables/12/4.2.0.0.table
index ce91fe429..2516c23fb 100644
--- a/definitions/grib2/tables/12/4.2.0.0.table
+++ b/definitions/grib2/tables/12/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/12/4.2.0.1.table b/definitions/grib2/tables/12/4.2.0.1.table
index bb0ff7c42..4b2cccd18 100644
--- a/definitions/grib2/tables/12/4.2.0.1.table
+++ b/definitions/grib2/tables/12/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.0.15.table b/definitions/grib2/tables/12/4.2.0.15.table
index d74fa7234..f40608676 100644
--- a/definitions/grib2/tables/12/4.2.0.15.table
+++ b/definitions/grib2/tables/12/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/12/4.2.0.18.table b/definitions/grib2/tables/12/4.2.0.18.table
index 18c41aa48..0a26caf85 100644
--- a/definitions/grib2/tables/12/4.2.0.18.table
+++ b/definitions/grib2/tables/12/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.0.19.table b/definitions/grib2/tables/12/4.2.0.19.table
index 0478ef16f..ff90cfb21 100644
--- a/definitions/grib2/tables/12/4.2.0.19.table
+++ b/definitions/grib2/tables/12/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/12/4.2.0.191.table b/definitions/grib2/tables/12/4.2.0.191.table
index 1f949f149..b1bb14e3d 100644
--- a/definitions/grib2/tables/12/4.2.0.191.table
+++ b/definitions/grib2/tables/12/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/12/4.2.0.2.table b/definitions/grib2/tables/12/4.2.0.2.table
index 84882e8b8..9fcd7cde7 100644
--- a/definitions/grib2/tables/12/4.2.0.2.table
+++ b/definitions/grib2/tables/12/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/12/4.2.0.20.table b/definitions/grib2/tables/12/4.2.0.20.table
index ac97b0b39..1f730fd67 100644
--- a/definitions/grib2/tables/12/4.2.0.20.table
+++ b/definitions/grib2/tables/12/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/12/4.2.0.4.table b/definitions/grib2/tables/12/4.2.0.4.table
index dbfcbddb7..85b51e85e 100644
--- a/definitions/grib2/tables/12/4.2.0.4.table
+++ b/definitions/grib2/tables/12/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/12/4.2.0.5.table b/definitions/grib2/tables/12/4.2.0.5.table
index f1c04650d..344336b0b 100644
--- a/definitions/grib2/tables/12/4.2.0.5.table
+++ b/definitions/grib2/tables/12/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/12/4.2.0.6.table b/definitions/grib2/tables/12/4.2.0.6.table
index b97357194..a21a99552 100644
--- a/definitions/grib2/tables/12/4.2.0.6.table
+++ b/definitions/grib2/tables/12/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/12/4.2.0.7.table b/definitions/grib2/tables/12/4.2.0.7.table
index db47d0113..9c0180d7b 100644
--- a/definitions/grib2/tables/12/4.2.0.7.table
+++ b/definitions/grib2/tables/12/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/12/4.2.1.0.table b/definitions/grib2/tables/12/4.2.1.0.table
index 77b25fa24..b83e223d7 100644
--- a/definitions/grib2/tables/12/4.2.1.0.table
+++ b/definitions/grib2/tables/12/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/12/4.2.1.1.table b/definitions/grib2/tables/12/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/12/4.2.1.1.table
+++ b/definitions/grib2/tables/12/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.1.2.table b/definitions/grib2/tables/12/4.2.1.2.table
index 2d08d44f4..7f65cbf94 100644
--- a/definitions/grib2/tables/12/4.2.1.2.table
+++ b/definitions/grib2/tables/12/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/12/4.2.10.0.table b/definitions/grib2/tables/12/4.2.10.0.table
index 761b6395c..3df4946bf 100644
--- a/definitions/grib2/tables/12/4.2.10.0.table
+++ b/definitions/grib2/tables/12/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/12/4.2.10.191.table b/definitions/grib2/tables/12/4.2.10.191.table
index 18e56f930..3938fcc28 100644
--- a/definitions/grib2/tables/12/4.2.10.191.table
+++ b/definitions/grib2/tables/12/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/12/4.2.2.0.table b/definitions/grib2/tables/12/4.2.2.0.table
index bf3574834..bfcae567f 100644
--- a/definitions/grib2/tables/12/4.2.2.0.table
+++ b/definitions/grib2/tables/12/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/12/4.2.2.3.table b/definitions/grib2/tables/12/4.2.2.3.table
index 28284d4d4..68282148c 100644
--- a/definitions/grib2/tables/12/4.2.2.3.table
+++ b/definitions/grib2/tables/12/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/12/4.2.3.1.table b/definitions/grib2/tables/12/4.2.3.1.table
index 0c0fc8d37..b7dcf5335 100644
--- a/definitions/grib2/tables/12/4.2.3.1.table
+++ b/definitions/grib2/tables/12/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/13/4.2.0.0.table b/definitions/grib2/tables/13/4.2.0.0.table
index 6de8a23c8..73c97bf34 100644
--- a/definitions/grib2/tables/13/4.2.0.0.table
+++ b/definitions/grib2/tables/13/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/13/4.2.0.1.table b/definitions/grib2/tables/13/4.2.0.1.table
index bb0ff7c42..4b2cccd18 100644
--- a/definitions/grib2/tables/13/4.2.0.1.table
+++ b/definitions/grib2/tables/13/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.0.15.table b/definitions/grib2/tables/13/4.2.0.15.table
index d74fa7234..f40608676 100644
--- a/definitions/grib2/tables/13/4.2.0.15.table
+++ b/definitions/grib2/tables/13/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/13/4.2.0.18.table b/definitions/grib2/tables/13/4.2.0.18.table
index 18c41aa48..0a26caf85 100644
--- a/definitions/grib2/tables/13/4.2.0.18.table
+++ b/definitions/grib2/tables/13/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.0.19.table b/definitions/grib2/tables/13/4.2.0.19.table
index 0478ef16f..ff90cfb21 100644
--- a/definitions/grib2/tables/13/4.2.0.19.table
+++ b/definitions/grib2/tables/13/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/13/4.2.0.191.table b/definitions/grib2/tables/13/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/13/4.2.0.191.table
+++ b/definitions/grib2/tables/13/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/13/4.2.0.2.table b/definitions/grib2/tables/13/4.2.0.2.table
index c83b07300..246b99fe9 100644
--- a/definitions/grib2/tables/13/4.2.0.2.table
+++ b/definitions/grib2/tables/13/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/13/4.2.0.20.table b/definitions/grib2/tables/13/4.2.0.20.table
index 9584f7c7f..3e01fd6b9 100644
--- a/definitions/grib2/tables/13/4.2.0.20.table
+++ b/definitions/grib2/tables/13/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/13/4.2.0.4.table b/definitions/grib2/tables/13/4.2.0.4.table
index dbfcbddb7..85b51e85e 100644
--- a/definitions/grib2/tables/13/4.2.0.4.table
+++ b/definitions/grib2/tables/13/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/13/4.2.0.5.table b/definitions/grib2/tables/13/4.2.0.5.table
index f1c04650d..344336b0b 100644
--- a/definitions/grib2/tables/13/4.2.0.5.table
+++ b/definitions/grib2/tables/13/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/13/4.2.0.6.table b/definitions/grib2/tables/13/4.2.0.6.table
index b97357194..a21a99552 100644
--- a/definitions/grib2/tables/13/4.2.0.6.table
+++ b/definitions/grib2/tables/13/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/13/4.2.0.7.table b/definitions/grib2/tables/13/4.2.0.7.table
index db47d0113..9c0180d7b 100644
--- a/definitions/grib2/tables/13/4.2.0.7.table
+++ b/definitions/grib2/tables/13/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/13/4.2.1.0.table b/definitions/grib2/tables/13/4.2.1.0.table
index 989c4ae28..ed367ebc2 100644
--- a/definitions/grib2/tables/13/4.2.1.0.table
+++ b/definitions/grib2/tables/13/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/13/4.2.1.1.table b/definitions/grib2/tables/13/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/13/4.2.1.1.table
+++ b/definitions/grib2/tables/13/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.1.2.table b/definitions/grib2/tables/13/4.2.1.2.table
index 8daf51efd..b0a920d00 100644
--- a/definitions/grib2/tables/13/4.2.1.2.table
+++ b/definitions/grib2/tables/13/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/13/4.2.10.0.table b/definitions/grib2/tables/13/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/13/4.2.10.0.table
+++ b/definitions/grib2/tables/13/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/13/4.2.10.191.table b/definitions/grib2/tables/13/4.2.10.191.table
index dc0e23d7b..200150e86 100644
--- a/definitions/grib2/tables/13/4.2.10.191.table
+++ b/definitions/grib2/tables/13/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/13/4.2.2.0.table b/definitions/grib2/tables/13/4.2.2.0.table
index ed9e43eb7..d38eb9285 100644
--- a/definitions/grib2/tables/13/4.2.2.0.table
+++ b/definitions/grib2/tables/13/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
diff --git a/definitions/grib2/tables/13/4.2.2.3.table b/definitions/grib2/tables/13/4.2.2.3.table
index 28284d4d4..68282148c 100644
--- a/definitions/grib2/tables/13/4.2.2.3.table
+++ b/definitions/grib2/tables/13/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/13/4.2.3.1.table b/definitions/grib2/tables/13/4.2.3.1.table
index 0c0fc8d37..b7dcf5335 100644
--- a/definitions/grib2/tables/13/4.2.3.1.table
+++ b/definitions/grib2/tables/13/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/14/4.2.0.0.table b/definitions/grib2/tables/14/4.2.0.0.table
index 41e5291a9..582c08a9e 100644
--- a/definitions/grib2/tables/14/4.2.0.0.table
+++ b/definitions/grib2/tables/14/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/14/4.2.0.1.table b/definitions/grib2/tables/14/4.2.0.1.table
index 0af12c3c3..9607d6b65 100644
--- a/definitions/grib2/tables/14/4.2.0.1.table
+++ b/definitions/grib2/tables/14/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 # 95-191 Reserved 
diff --git a/definitions/grib2/tables/14/4.2.0.15.table b/definitions/grib2/tables/14/4.2.0.15.table
index d74fa7234..f40608676 100644
--- a/definitions/grib2/tables/14/4.2.0.15.table
+++ b/definitions/grib2/tables/14/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/14/4.2.0.18.table b/definitions/grib2/tables/14/4.2.0.18.table
index 18c41aa48..0a26caf85 100644
--- a/definitions/grib2/tables/14/4.2.0.18.table
+++ b/definitions/grib2/tables/14/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/14/4.2.0.19.table b/definitions/grib2/tables/14/4.2.0.19.table
index 0478ef16f..ff90cfb21 100644
--- a/definitions/grib2/tables/14/4.2.0.19.table
+++ b/definitions/grib2/tables/14/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/14/4.2.0.191.table b/definitions/grib2/tables/14/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/14/4.2.0.191.table
+++ b/definitions/grib2/tables/14/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/14/4.2.0.2.table b/definitions/grib2/tables/14/4.2.0.2.table
index c83b07300..246b99fe9 100644
--- a/definitions/grib2/tables/14/4.2.0.2.table
+++ b/definitions/grib2/tables/14/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/14/4.2.0.20.table b/definitions/grib2/tables/14/4.2.0.20.table
index 9584f7c7f..3e01fd6b9 100644
--- a/definitions/grib2/tables/14/4.2.0.20.table
+++ b/definitions/grib2/tables/14/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/14/4.2.0.4.table b/definitions/grib2/tables/14/4.2.0.4.table
index dbfcbddb7..85b51e85e 100644
--- a/definitions/grib2/tables/14/4.2.0.4.table
+++ b/definitions/grib2/tables/14/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/14/4.2.0.5.table b/definitions/grib2/tables/14/4.2.0.5.table
index f1c04650d..344336b0b 100644
--- a/definitions/grib2/tables/14/4.2.0.5.table
+++ b/definitions/grib2/tables/14/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/14/4.2.0.6.table b/definitions/grib2/tables/14/4.2.0.6.table
index cb160fa0b..849315b98 100644
--- a/definitions/grib2/tables/14/4.2.0.6.table
+++ b/definitions/grib2/tables/14/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/14/4.2.0.7.table b/definitions/grib2/tables/14/4.2.0.7.table
index db47d0113..9c0180d7b 100644
--- a/definitions/grib2/tables/14/4.2.0.7.table
+++ b/definitions/grib2/tables/14/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/14/4.2.1.0.table b/definitions/grib2/tables/14/4.2.1.0.table
index 989c4ae28..ed367ebc2 100644
--- a/definitions/grib2/tables/14/4.2.1.0.table
+++ b/definitions/grib2/tables/14/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/14/4.2.1.1.table b/definitions/grib2/tables/14/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/14/4.2.1.1.table
+++ b/definitions/grib2/tables/14/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/14/4.2.1.2.table b/definitions/grib2/tables/14/4.2.1.2.table
index 8daf51efd..b0a920d00 100644
--- a/definitions/grib2/tables/14/4.2.1.2.table
+++ b/definitions/grib2/tables/14/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/14/4.2.10.0.table b/definitions/grib2/tables/14/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/14/4.2.10.0.table
+++ b/definitions/grib2/tables/14/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/14/4.2.10.191.table b/definitions/grib2/tables/14/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/14/4.2.10.191.table
+++ b/definitions/grib2/tables/14/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/14/4.2.2.0.table b/definitions/grib2/tables/14/4.2.2.0.table
index 958c4bf64..93f3ce12f 100644
--- a/definitions/grib2/tables/14/4.2.2.0.table
+++ b/definitions/grib2/tables/14/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
diff --git a/definitions/grib2/tables/14/4.2.2.3.table b/definitions/grib2/tables/14/4.2.2.3.table
index 28284d4d4..68282148c 100644
--- a/definitions/grib2/tables/14/4.2.2.3.table
+++ b/definitions/grib2/tables/14/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/14/4.2.3.1.table b/definitions/grib2/tables/14/4.2.3.1.table
index 0c0fc8d37..b7dcf5335 100644
--- a/definitions/grib2/tables/14/4.2.3.1.table
+++ b/definitions/grib2/tables/14/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/15/4.2.0.0.table b/definitions/grib2/tables/15/4.2.0.0.table
index 41e5291a9..582c08a9e 100644
--- a/definitions/grib2/tables/15/4.2.0.0.table
+++ b/definitions/grib2/tables/15/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/15/4.2.0.1.table b/definitions/grib2/tables/15/4.2.0.1.table
index c90ade1c5..8c3528b59 100644
--- a/definitions/grib2/tables/15/4.2.0.1.table
+++ b/definitions/grib2/tables/15/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/15/4.2.0.15.table b/definitions/grib2/tables/15/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/15/4.2.0.15.table
+++ b/definitions/grib2/tables/15/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/15/4.2.0.18.table b/definitions/grib2/tables/15/4.2.0.18.table
index 18c41aa48..0a26caf85 100644
--- a/definitions/grib2/tables/15/4.2.0.18.table
+++ b/definitions/grib2/tables/15/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.0.19.table b/definitions/grib2/tables/15/4.2.0.19.table
index 0478ef16f..ff90cfb21 100644
--- a/definitions/grib2/tables/15/4.2.0.19.table
+++ b/definitions/grib2/tables/15/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/15/4.2.0.191.table b/definitions/grib2/tables/15/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/15/4.2.0.191.table
+++ b/definitions/grib2/tables/15/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/15/4.2.0.2.table b/definitions/grib2/tables/15/4.2.0.2.table
index c83b07300..246b99fe9 100644
--- a/definitions/grib2/tables/15/4.2.0.2.table
+++ b/definitions/grib2/tables/15/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/15/4.2.0.20.table b/definitions/grib2/tables/15/4.2.0.20.table
index 9584f7c7f..3e01fd6b9 100644
--- a/definitions/grib2/tables/15/4.2.0.20.table
+++ b/definitions/grib2/tables/15/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/15/4.2.0.4.table b/definitions/grib2/tables/15/4.2.0.4.table
index dbfcbddb7..85b51e85e 100644
--- a/definitions/grib2/tables/15/4.2.0.4.table
+++ b/definitions/grib2/tables/15/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/15/4.2.0.5.table b/definitions/grib2/tables/15/4.2.0.5.table
index 932a12fbd..047688ba4 100644
--- a/definitions/grib2/tables/15/4.2.0.5.table
+++ b/definitions/grib2/tables/15/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/15/4.2.0.6.table b/definitions/grib2/tables/15/4.2.0.6.table
index 906eeb9ac..2abb7f599 100644
--- a/definitions/grib2/tables/15/4.2.0.6.table
+++ b/definitions/grib2/tables/15/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/15/4.2.0.7.table b/definitions/grib2/tables/15/4.2.0.7.table
index db47d0113..9c0180d7b 100644
--- a/definitions/grib2/tables/15/4.2.0.7.table
+++ b/definitions/grib2/tables/15/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/15/4.2.1.0.table b/definitions/grib2/tables/15/4.2.1.0.table
index 989c4ae28..ed367ebc2 100644
--- a/definitions/grib2/tables/15/4.2.1.0.table
+++ b/definitions/grib2/tables/15/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/15/4.2.1.1.table b/definitions/grib2/tables/15/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/15/4.2.1.1.table
+++ b/definitions/grib2/tables/15/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.1.2.table b/definitions/grib2/tables/15/4.2.1.2.table
index 8daf51efd..b0a920d00 100644
--- a/definitions/grib2/tables/15/4.2.1.2.table
+++ b/definitions/grib2/tables/15/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/15/4.2.10.0.table b/definitions/grib2/tables/15/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/15/4.2.10.0.table
+++ b/definitions/grib2/tables/15/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/15/4.2.10.191.table b/definitions/grib2/tables/15/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/15/4.2.10.191.table
+++ b/definitions/grib2/tables/15/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/15/4.2.2.0.table b/definitions/grib2/tables/15/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/15/4.2.2.0.table
+++ b/definitions/grib2/tables/15/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.2.3.table b/definitions/grib2/tables/15/4.2.2.3.table
index 56e66c83a..a9462256d 100644
--- a/definitions/grib2/tables/15/4.2.2.3.table
+++ b/definitions/grib2/tables/15/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/15/4.2.3.1.table b/definitions/grib2/tables/15/4.2.3.1.table
index 0bda53063..ae2871304 100644
--- a/definitions/grib2/tables/15/4.2.3.1.table
+++ b/definitions/grib2/tables/15/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/16/4.2.0.0.table b/definitions/grib2/tables/16/4.2.0.0.table
index cfadd2d07..dbd90dc79 100644
--- a/definitions/grib2/tables/16/4.2.0.0.table
+++ b/definitions/grib2/tables/16/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/16/4.2.0.1.table b/definitions/grib2/tables/16/4.2.0.1.table
index b0127980c..33bff15fe 100644
--- a/definitions/grib2/tables/16/4.2.0.1.table
+++ b/definitions/grib2/tables/16/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/16/4.2.0.15.table b/definitions/grib2/tables/16/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/16/4.2.0.15.table
+++ b/definitions/grib2/tables/16/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/16/4.2.0.18.table b/definitions/grib2/tables/16/4.2.0.18.table
index 18c41aa48..0a26caf85 100644
--- a/definitions/grib2/tables/16/4.2.0.18.table
+++ b/definitions/grib2/tables/16/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.0.19.table b/definitions/grib2/tables/16/4.2.0.19.table
index 35b9deb7f..e64cdd7bc 100644
--- a/definitions/grib2/tables/16/4.2.0.19.table
+++ b/definitions/grib2/tables/16/4.2.0.19.table
@@ -21,13 +21,13 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
 # 29-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.0.191.table b/definitions/grib2/tables/16/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/16/4.2.0.191.table
+++ b/definitions/grib2/tables/16/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/16/4.2.0.2.table b/definitions/grib2/tables/16/4.2.0.2.table
index 46b0774aa..01e540d47 100644
--- a/definitions/grib2/tables/16/4.2.0.2.table
+++ b/definitions/grib2/tables/16/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/16/4.2.0.20.table b/definitions/grib2/tables/16/4.2.0.20.table
index 9584f7c7f..3e01fd6b9 100644
--- a/definitions/grib2/tables/16/4.2.0.20.table
+++ b/definitions/grib2/tables/16/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/16/4.2.0.4.table b/definitions/grib2/tables/16/4.2.0.4.table
index bd37ea3f5..9e53f608c 100644
--- a/definitions/grib2/tables/16/4.2.0.4.table
+++ b/definitions/grib2/tables/16/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short wave radiation flux (W m-2)
 14 14 Diffuse short wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/16/4.2.0.5.table b/definitions/grib2/tables/16/4.2.0.5.table
index 932a12fbd..047688ba4 100644
--- a/definitions/grib2/tables/16/4.2.0.5.table
+++ b/definitions/grib2/tables/16/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/16/4.2.0.6.table b/definitions/grib2/tables/16/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/16/4.2.0.6.table
+++ b/definitions/grib2/tables/16/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.0.7.table b/definitions/grib2/tables/16/4.2.0.7.table
index 23a1a82da..77fd5bd67 100644
--- a/definitions/grib2/tables/16/4.2.0.7.table
+++ b/definitions/grib2/tables/16/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/16/4.2.1.0.table b/definitions/grib2/tables/16/4.2.1.0.table
index 89083fa27..6840add5b 100644
--- a/definitions/grib2/tables/16/4.2.1.0.table
+++ b/definitions/grib2/tables/16/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/16/4.2.1.1.table b/definitions/grib2/tables/16/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/16/4.2.1.1.table
+++ b/definitions/grib2/tables/16/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.1.2.table b/definitions/grib2/tables/16/4.2.1.2.table
index 02979ecb2..ec4148a81 100644
--- a/definitions/grib2/tables/16/4.2.1.2.table
+++ b/definitions/grib2/tables/16/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/16/4.2.10.0.table b/definitions/grib2/tables/16/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/16/4.2.10.0.table
+++ b/definitions/grib2/tables/16/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/16/4.2.10.191.table b/definitions/grib2/tables/16/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/16/4.2.10.191.table
+++ b/definitions/grib2/tables/16/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/16/4.2.2.0.table b/definitions/grib2/tables/16/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/16/4.2.2.0.table
+++ b/definitions/grib2/tables/16/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.2.3.table b/definitions/grib2/tables/16/4.2.2.3.table
index 9dd57a190..bd021d038 100644
--- a/definitions/grib2/tables/16/4.2.2.3.table
+++ b/definitions/grib2/tables/16/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/16/4.2.2.4.table b/definitions/grib2/tables/16/4.2.2.4.table
index b9383fe10..c4fd16747 100644
--- a/definitions/grib2/tables/16/4.2.2.4.table
+++ b/definitions/grib2/tables/16/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Fire weather index (Canadian forest service) (Numeric)
-6 6 Fine fuel moisture code (Canadian forest service) (Numeric)
-7 7 Duff moisture code (Canadian forest service) (Numeric)
-8 8 Drought code (Canadian forest service) (Numeric)
-9 9 Initial fire spread index (Canadian forest service) (Numeric)
-10 10 Fire build up index (Canadian forest service) (Numeric)
-11 11 Fire daily severity rating (Canadian forest service) (Numeric)
+5 5 Fire weather index [Canadian forest service] (Numeric)
+6 6 Fine fuel moisture code [Canadian forest service] (Numeric)
+7 7 Duff moisture code [Canadian forest service] (Numeric)
+8 8 Drought code [Canadian forest service] (Numeric)
+9 9 Initial fire spread index [Canadian forest service] (Numeric)
+10 10 Fire build up index [Canadian forest service] (Numeric)
+11 11 Fire daily severity rating [Canadian forest service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.3.1.table b/definitions/grib2/tables/16/4.2.3.1.table
index 75911ee32..4b758cdb7 100644
--- a/definitions/grib2/tables/16/4.2.3.1.table
+++ b/definitions/grib2/tables/16/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um 
diff --git a/definitions/grib2/tables/17/4.2.0.0.table b/definitions/grib2/tables/17/4.2.0.0.table
index f24b8832c..b8984706f 100644
--- a/definitions/grib2/tables/17/4.2.0.0.table
+++ b/definitions/grib2/tables/17/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/17/4.2.0.1.table b/definitions/grib2/tables/17/4.2.0.1.table
index 490297d22..1edff015a 100644
--- a/definitions/grib2/tables/17/4.2.0.1.table
+++ b/definitions/grib2/tables/17/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/17/4.2.0.15.table b/definitions/grib2/tables/17/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/17/4.2.0.15.table
+++ b/definitions/grib2/tables/17/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/17/4.2.0.17.table b/definitions/grib2/tables/17/4.2.0.17.table
index a6799631f..913a5ab37 100644
--- a/definitions/grib2/tables/17/4.2.0.17.table
+++ b/definitions/grib2/tables/17/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index (LPI) (J kg-1)
+1 1 Lightning potential index [LPI] (J kg-1)
diff --git a/definitions/grib2/tables/17/4.2.0.18.table b/definitions/grib2/tables/17/4.2.0.18.table
index 9ae3539ca..b87b481b2 100644
--- a/definitions/grib2/tables/17/4.2.0.18.table
+++ b/definitions/grib2/tables/17/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/17/4.2.0.19.table b/definitions/grib2/tables/17/4.2.0.19.table
index d2a4338d6..5b5063c70 100644
--- a/definitions/grib2/tables/17/4.2.0.19.table
+++ b/definitions/grib2/tables/17/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
-29 29 Clear air turbulence (CAT) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+29 29 Clear air turbulence [CAT] (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of Eddy dissipation parameter in layer (m2/3 s-1)
 # 32-191 Reserved 
diff --git a/definitions/grib2/tables/17/4.2.0.191.table b/definitions/grib2/tables/17/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/17/4.2.0.191.table
+++ b/definitions/grib2/tables/17/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/17/4.2.0.2.table b/definitions/grib2/tables/17/4.2.0.2.table
index 8ebc75124..5f351ce69 100644
--- a/definitions/grib2/tables/17/4.2.0.2.table
+++ b/definitions/grib2/tables/17/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/17/4.2.0.20.table b/definitions/grib2/tables/17/4.2.0.20.table
index 983539bd2..9295d786a 100644
--- a/definitions/grib2/tables/17/4.2.0.20.table
+++ b/definitions/grib2/tables/17/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -29,7 +29,7 @@
 61 61 Maximum of mass density in layer (kg m-3)
 62 62 Height of maximum mass density (m)
 # 63-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/17/4.2.0.4.table b/definitions/grib2/tables/17/4.2.0.4.table
index 0a5ded2b5..4d2f8d900 100644
--- a/definitions/grib2/tables/17/4.2.0.4.table
+++ b/definitions/grib2/tables/17/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/17/4.2.0.5.table b/definitions/grib2/tables/17/4.2.0.5.table
index 4550220b6..d28169fe1 100644
--- a/definitions/grib2/tables/17/4.2.0.5.table
+++ b/definitions/grib2/tables/17/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/17/4.2.0.6.table b/definitions/grib2/tables/17/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/17/4.2.0.6.table
+++ b/definitions/grib2/tables/17/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.0.7.table b/definitions/grib2/tables/17/4.2.0.7.table
index 6d0d87a46..84b320b0b 100644
--- a/definitions/grib2/tables/17/4.2.0.7.table
+++ b/definitions/grib2/tables/17/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/17/4.2.1.0.table b/definitions/grib2/tables/17/4.2.1.0.table
index e906af726..4f6c5ea69 100644
--- a/definitions/grib2/tables/17/4.2.1.0.table
+++ b/definitions/grib2/tables/17/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/17/4.2.1.1.table b/definitions/grib2/tables/17/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/17/4.2.1.1.table
+++ b/definitions/grib2/tables/17/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.1.2.table b/definitions/grib2/tables/17/4.2.1.2.table
index ec9b11d41..ca130e960 100644
--- a/definitions/grib2/tables/17/4.2.1.2.table
+++ b/definitions/grib2/tables/17/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/17/4.2.10.0.table b/definitions/grib2/tables/17/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/17/4.2.10.0.table
+++ b/definitions/grib2/tables/17/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/17/4.2.10.191.table b/definitions/grib2/tables/17/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/17/4.2.10.191.table
+++ b/definitions/grib2/tables/17/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/17/4.2.2.0.table b/definitions/grib2/tables/17/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/17/4.2.2.0.table
+++ b/definitions/grib2/tables/17/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.2.3.table b/definitions/grib2/tables/17/4.2.2.3.table
index 447e4f9cb..7c5614cdb 100644
--- a/definitions/grib2/tables/17/4.2.2.3.table
+++ b/definitions/grib2/tables/17/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/17/4.2.2.4.table b/definitions/grib2/tables/17/4.2.2.4.table
index bb54fac22..5edfd3b7e 100644
--- a/definitions/grib2/tables/17/4.2.2.4.table
+++ b/definitions/grib2/tables/17/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
-6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
-7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
-8 8 Drought Code (Canadian Forest Service) (Numeric)
-9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
-10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
-11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
+5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
+6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
+7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
+8 8 Drought Code [Canadian Forest Service] (Numeric)
+9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
+10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
+11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.3.1.table b/definitions/grib2/tables/17/4.2.3.1.table
index 8e0793fe0..71f896fd7 100644
--- a/definitions/grib2/tables/17/4.2.3.1.table
+++ b/definitions/grib2/tables/17/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/18/4.2.0.0.table b/definitions/grib2/tables/18/4.2.0.0.table
index 7201a8667..1682411de 100644
--- a/definitions/grib2/tables/18/4.2.0.0.table
+++ b/definitions/grib2/tables/18/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/18/4.2.0.1.table b/definitions/grib2/tables/18/4.2.0.1.table
index 8f96bcd60..53499c529 100644
--- a/definitions/grib2/tables/18/4.2.0.1.table
+++ b/definitions/grib2/tables/18/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/18/4.2.0.15.table b/definitions/grib2/tables/18/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/18/4.2.0.15.table
+++ b/definitions/grib2/tables/18/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/18/4.2.0.17.table b/definitions/grib2/tables/18/4.2.0.17.table
index a6799631f..913a5ab37 100644
--- a/definitions/grib2/tables/18/4.2.0.17.table
+++ b/definitions/grib2/tables/18/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index (LPI) (J kg-1)
+1 1 Lightning potential index [LPI] (J kg-1)
diff --git a/definitions/grib2/tables/18/4.2.0.18.table b/definitions/grib2/tables/18/4.2.0.18.table
index 9d106f419..35e23577f 100644
--- a/definitions/grib2/tables/18/4.2.0.18.table
+++ b/definitions/grib2/tables/18/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/18/4.2.0.19.table b/definitions/grib2/tables/18/4.2.0.19.table
index d2a4338d6..5b5063c70 100644
--- a/definitions/grib2/tables/18/4.2.0.19.table
+++ b/definitions/grib2/tables/18/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
-29 29 Clear air turbulence (CAT) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+29 29 Clear air turbulence [CAT] (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of Eddy dissipation parameter in layer (m2/3 s-1)
 # 32-191 Reserved 
diff --git a/definitions/grib2/tables/18/4.2.0.191.table b/definitions/grib2/tables/18/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/18/4.2.0.191.table
+++ b/definitions/grib2/tables/18/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/18/4.2.0.2.table b/definitions/grib2/tables/18/4.2.0.2.table
index 5446262e6..fc169f9ba 100644
--- a/definitions/grib2/tables/18/4.2.0.2.table
+++ b/definitions/grib2/tables/18/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/18/4.2.0.20.table b/definitions/grib2/tables/18/4.2.0.20.table
index efc427a19..19db8a604 100644
--- a/definitions/grib2/tables/18/4.2.0.20.table
+++ b/definitions/grib2/tables/18/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,7 +30,7 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/18/4.2.0.4.table b/definitions/grib2/tables/18/4.2.0.4.table
index 0a5ded2b5..4d2f8d900 100644
--- a/definitions/grib2/tables/18/4.2.0.4.table
+++ b/definitions/grib2/tables/18/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/18/4.2.0.5.table b/definitions/grib2/tables/18/4.2.0.5.table
index 4550220b6..d28169fe1 100644
--- a/definitions/grib2/tables/18/4.2.0.5.table
+++ b/definitions/grib2/tables/18/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/18/4.2.0.6.table b/definitions/grib2/tables/18/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/18/4.2.0.6.table
+++ b/definitions/grib2/tables/18/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.0.7.table b/definitions/grib2/tables/18/4.2.0.7.table
index 6d0d87a46..84b320b0b 100644
--- a/definitions/grib2/tables/18/4.2.0.7.table
+++ b/definitions/grib2/tables/18/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/18/4.2.1.0.table b/definitions/grib2/tables/18/4.2.1.0.table
index e906af726..4f6c5ea69 100644
--- a/definitions/grib2/tables/18/4.2.1.0.table
+++ b/definitions/grib2/tables/18/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/18/4.2.1.1.table b/definitions/grib2/tables/18/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/18/4.2.1.1.table
+++ b/definitions/grib2/tables/18/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.1.2.table b/definitions/grib2/tables/18/4.2.1.2.table
index ec9b11d41..ca130e960 100644
--- a/definitions/grib2/tables/18/4.2.1.2.table
+++ b/definitions/grib2/tables/18/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/18/4.2.10.0.table b/definitions/grib2/tables/18/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/18/4.2.10.0.table
+++ b/definitions/grib2/tables/18/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/18/4.2.10.191.table b/definitions/grib2/tables/18/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/18/4.2.10.191.table
+++ b/definitions/grib2/tables/18/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/18/4.2.2.0.table b/definitions/grib2/tables/18/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/18/4.2.2.0.table
+++ b/definitions/grib2/tables/18/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.2.3.table b/definitions/grib2/tables/18/4.2.2.3.table
index 447e4f9cb..7c5614cdb 100644
--- a/definitions/grib2/tables/18/4.2.2.3.table
+++ b/definitions/grib2/tables/18/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/18/4.2.2.4.table b/definitions/grib2/tables/18/4.2.2.4.table
index bb54fac22..5edfd3b7e 100644
--- a/definitions/grib2/tables/18/4.2.2.4.table
+++ b/definitions/grib2/tables/18/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
-6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
-7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
-8 8 Drought Code (Canadian Forest Service) (Numeric)
-9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
-10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
-11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
+5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
+6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
+7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
+8 8 Drought Code [Canadian Forest Service] (Numeric)
+9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
+10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
+11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.3.1.table b/definitions/grib2/tables/18/4.2.3.1.table
index 8e0793fe0..71f896fd7 100644
--- a/definitions/grib2/tables/18/4.2.3.1.table
+++ b/definitions/grib2/tables/18/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/19/4.2.0.0.table b/definitions/grib2/tables/19/4.2.0.0.table
index 7201a8667..1682411de 100644
--- a/definitions/grib2/tables/19/4.2.0.0.table
+++ b/definitions/grib2/tables/19/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/19/4.2.0.1.table b/definitions/grib2/tables/19/4.2.0.1.table
index 8f96bcd60..53499c529 100644
--- a/definitions/grib2/tables/19/4.2.0.1.table
+++ b/definitions/grib2/tables/19/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/19/4.2.0.15.table b/definitions/grib2/tables/19/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/19/4.2.0.15.table
+++ b/definitions/grib2/tables/19/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/19/4.2.0.17.table b/definitions/grib2/tables/19/4.2.0.17.table
index a6799631f..913a5ab37 100644
--- a/definitions/grib2/tables/19/4.2.0.17.table
+++ b/definitions/grib2/tables/19/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index (LPI) (J kg-1)
+1 1 Lightning potential index [LPI] (J kg-1)
diff --git a/definitions/grib2/tables/19/4.2.0.18.table b/definitions/grib2/tables/19/4.2.0.18.table
index 9d106f419..35e23577f 100644
--- a/definitions/grib2/tables/19/4.2.0.18.table
+++ b/definitions/grib2/tables/19/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/19/4.2.0.19.table b/definitions/grib2/tables/19/4.2.0.19.table
index 0e49286a7..d0f098912 100644
--- a/definitions/grib2/tables/19/4.2.0.19.table
+++ b/definitions/grib2/tables/19/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
-29 29 Clear air turbulence (CAT) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+29 29 Clear air turbulence [CAT] (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 # 32-191 Reserved 
diff --git a/definitions/grib2/tables/19/4.2.0.191.table b/definitions/grib2/tables/19/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/19/4.2.0.191.table
+++ b/definitions/grib2/tables/19/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/19/4.2.0.2.table b/definitions/grib2/tables/19/4.2.0.2.table
index 5446262e6..fc169f9ba 100644
--- a/definitions/grib2/tables/19/4.2.0.2.table
+++ b/definitions/grib2/tables/19/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/19/4.2.0.20.table b/definitions/grib2/tables/19/4.2.0.20.table
index efc427a19..6f3ba9810 100644
--- a/definitions/grib2/tables/19/4.2.0.20.table
+++ b/definitions/grib2/tables/19/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,17 +30,17 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (m-1)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
 104 104 Asymmetry factor (Numeric)
-105 105 Aerosol extinction coefficient (/m)
-106 106 Aerosol absorption coefficient (/m)
+105 105 Aerosol extinction coefficient (m-1)
+106 106 Aerosol absorption coefficient (m-1)
 107 107 Aerosol lidar backscatter from satellite (m-1 sr-1)
 108 108 Aerosol lidar backscatter from the ground (m-1 sr-1)
-109 109 Aerosol lidar extinction from satellite (/m)
-110 110 Aerosol lidar extinction from the ground (/m)
+109 109 Aerosol lidar extinction from satellite (m-1)
+110 110 Aerosol lidar extinction from the ground (m-1)
 111 111 Angstrom exponent (Numeric)
 # 112-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/19/4.2.0.4.table b/definitions/grib2/tables/19/4.2.0.4.table
index 0a5ded2b5..4d2f8d900 100644
--- a/definitions/grib2/tables/19/4.2.0.4.table
+++ b/definitions/grib2/tables/19/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/19/4.2.0.5.table b/definitions/grib2/tables/19/4.2.0.5.table
index 4550220b6..d28169fe1 100644
--- a/definitions/grib2/tables/19/4.2.0.5.table
+++ b/definitions/grib2/tables/19/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/19/4.2.0.6.table b/definitions/grib2/tables/19/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/19/4.2.0.6.table
+++ b/definitions/grib2/tables/19/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.0.7.table b/definitions/grib2/tables/19/4.2.0.7.table
index aff6a6516..5e86b2b7a 100644
--- a/definitions/grib2/tables/19/4.2.0.7.table
+++ b/definitions/grib2/tables/19/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/19/4.2.1.0.table b/definitions/grib2/tables/19/4.2.1.0.table
index e906af726..4f6c5ea69 100644
--- a/definitions/grib2/tables/19/4.2.1.0.table
+++ b/definitions/grib2/tables/19/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/19/4.2.1.1.table b/definitions/grib2/tables/19/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/19/4.2.1.1.table
+++ b/definitions/grib2/tables/19/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.1.2.table b/definitions/grib2/tables/19/4.2.1.2.table
index ec9b11d41..ca130e960 100644
--- a/definitions/grib2/tables/19/4.2.1.2.table
+++ b/definitions/grib2/tables/19/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/19/4.2.10.0.table b/definitions/grib2/tables/19/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/19/4.2.10.0.table
+++ b/definitions/grib2/tables/19/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/19/4.2.10.191.table b/definitions/grib2/tables/19/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/19/4.2.10.191.table
+++ b/definitions/grib2/tables/19/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/19/4.2.2.0.table b/definitions/grib2/tables/19/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/19/4.2.2.0.table
+++ b/definitions/grib2/tables/19/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.2.3.table b/definitions/grib2/tables/19/4.2.2.3.table
index 447e4f9cb..7c5614cdb 100644
--- a/definitions/grib2/tables/19/4.2.2.3.table
+++ b/definitions/grib2/tables/19/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/19/4.2.2.4.table b/definitions/grib2/tables/19/4.2.2.4.table
index bb54fac22..5edfd3b7e 100644
--- a/definitions/grib2/tables/19/4.2.2.4.table
+++ b/definitions/grib2/tables/19/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
-6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
-7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
-8 8 Drought Code (Canadian Forest Service) (Numeric)
-9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
-10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
-11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
+5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
+6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
+7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
+8 8 Drought Code [Canadian Forest Service] (Numeric)
+9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
+10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
+11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.3.1.table b/definitions/grib2/tables/19/4.2.3.1.table
index 8e0793fe0..71f896fd7 100644
--- a/definitions/grib2/tables/19/4.2.3.1.table
+++ b/definitions/grib2/tables/19/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/20/4.2.0.0.table b/definitions/grib2/tables/20/4.2.0.0.table
index 7201a8667..1682411de 100644
--- a/definitions/grib2/tables/20/4.2.0.0.table
+++ b/definitions/grib2/tables/20/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/20/4.2.0.1.table b/definitions/grib2/tables/20/4.2.0.1.table
index 75df7d4ea..d83267a4c 100644
--- a/definitions/grib2/tables/20/4.2.0.1.table
+++ b/definitions/grib2/tables/20/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/20/4.2.0.15.table b/definitions/grib2/tables/20/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/20/4.2.0.15.table
+++ b/definitions/grib2/tables/20/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/20/4.2.0.17.table b/definitions/grib2/tables/20/4.2.0.17.table
index a6799631f..913a5ab37 100644
--- a/definitions/grib2/tables/20/4.2.0.17.table
+++ b/definitions/grib2/tables/20/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index (LPI) (J kg-1)
+1 1 Lightning potential index [LPI] (J kg-1)
diff --git a/definitions/grib2/tables/20/4.2.0.18.table b/definitions/grib2/tables/20/4.2.0.18.table
index 9d106f419..35e23577f 100644
--- a/definitions/grib2/tables/20/4.2.0.18.table
+++ b/definitions/grib2/tables/20/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/20/4.2.0.19.table b/definitions/grib2/tables/20/4.2.0.19.table
index e4a4e2d04..182f1400e 100644
--- a/definitions/grib2/tables/20/4.2.0.19.table
+++ b/definitions/grib2/tables/20/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
-29 29 Clear air turbulence (CAT) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+29 29 Clear air turbulence [CAT] (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/20/4.2.0.191.table b/definitions/grib2/tables/20/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/20/4.2.0.191.table
+++ b/definitions/grib2/tables/20/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/20/4.2.0.2.table b/definitions/grib2/tables/20/4.2.0.2.table
index 5446262e6..fc169f9ba 100644
--- a/definitions/grib2/tables/20/4.2.0.2.table
+++ b/definitions/grib2/tables/20/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/20/4.2.0.20.table b/definitions/grib2/tables/20/4.2.0.20.table
index efc427a19..19db8a604 100644
--- a/definitions/grib2/tables/20/4.2.0.20.table
+++ b/definitions/grib2/tables/20/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,7 +30,7 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/20/4.2.0.4.table b/definitions/grib2/tables/20/4.2.0.4.table
index 0a5ded2b5..4d2f8d900 100644
--- a/definitions/grib2/tables/20/4.2.0.4.table
+++ b/definitions/grib2/tables/20/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/20/4.2.0.5.table b/definitions/grib2/tables/20/4.2.0.5.table
index 4550220b6..d28169fe1 100644
--- a/definitions/grib2/tables/20/4.2.0.5.table
+++ b/definitions/grib2/tables/20/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/20/4.2.0.6.table b/definitions/grib2/tables/20/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/20/4.2.0.6.table
+++ b/definitions/grib2/tables/20/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.0.7.table b/definitions/grib2/tables/20/4.2.0.7.table
index aff6a6516..5e86b2b7a 100644
--- a/definitions/grib2/tables/20/4.2.0.7.table
+++ b/definitions/grib2/tables/20/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/20/4.2.1.0.table b/definitions/grib2/tables/20/4.2.1.0.table
index e906af726..4f6c5ea69 100644
--- a/definitions/grib2/tables/20/4.2.1.0.table
+++ b/definitions/grib2/tables/20/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/20/4.2.1.1.table b/definitions/grib2/tables/20/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/20/4.2.1.1.table
+++ b/definitions/grib2/tables/20/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.1.2.table b/definitions/grib2/tables/20/4.2.1.2.table
index ec9b11d41..ca130e960 100644
--- a/definitions/grib2/tables/20/4.2.1.2.table
+++ b/definitions/grib2/tables/20/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/20/4.2.10.0.table b/definitions/grib2/tables/20/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/20/4.2.10.0.table
+++ b/definitions/grib2/tables/20/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/20/4.2.10.191.table b/definitions/grib2/tables/20/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/20/4.2.10.191.table
+++ b/definitions/grib2/tables/20/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/20/4.2.2.0.table b/definitions/grib2/tables/20/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/20/4.2.2.0.table
+++ b/definitions/grib2/tables/20/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.2.3.table b/definitions/grib2/tables/20/4.2.2.3.table
index 447e4f9cb..7c5614cdb 100644
--- a/definitions/grib2/tables/20/4.2.2.3.table
+++ b/definitions/grib2/tables/20/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/20/4.2.2.4.table b/definitions/grib2/tables/20/4.2.2.4.table
index bb54fac22..5edfd3b7e 100644
--- a/definitions/grib2/tables/20/4.2.2.4.table
+++ b/definitions/grib2/tables/20/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
-6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
-7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
-8 8 Drought Code (Canadian Forest Service) (Numeric)
-9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
-10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
-11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
+5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
+6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
+7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
+8 8 Drought Code [Canadian Forest Service] (Numeric)
+9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
+10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
+11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.3.1.table b/definitions/grib2/tables/20/4.2.3.1.table
index 8e0793fe0..71f896fd7 100644
--- a/definitions/grib2/tables/20/4.2.3.1.table
+++ b/definitions/grib2/tables/20/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/21/4.2.0.0.table b/definitions/grib2/tables/21/4.2.0.0.table
index 7201a8667..1682411de 100644
--- a/definitions/grib2/tables/21/4.2.0.0.table
+++ b/definitions/grib2/tables/21/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/21/4.2.0.1.table b/definitions/grib2/tables/21/4.2.0.1.table
index 75df7d4ea..d83267a4c 100644
--- a/definitions/grib2/tables/21/4.2.0.1.table
+++ b/definitions/grib2/tables/21/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/21/4.2.0.15.table b/definitions/grib2/tables/21/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/21/4.2.0.15.table
+++ b/definitions/grib2/tables/21/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/21/4.2.0.17.table b/definitions/grib2/tables/21/4.2.0.17.table
index a6799631f..913a5ab37 100644
--- a/definitions/grib2/tables/21/4.2.0.17.table
+++ b/definitions/grib2/tables/21/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index (LPI) (J kg-1)
+1 1 Lightning potential index [LPI] (J kg-1)
diff --git a/definitions/grib2/tables/21/4.2.0.18.table b/definitions/grib2/tables/21/4.2.0.18.table
index 9d106f419..35e23577f 100644
--- a/definitions/grib2/tables/21/4.2.0.18.table
+++ b/definitions/grib2/tables/21/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/21/4.2.0.19.table b/definitions/grib2/tables/21/4.2.0.19.table
index e4a4e2d04..182f1400e 100644
--- a/definitions/grib2/tables/21/4.2.0.19.table
+++ b/definitions/grib2/tables/21/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
-29 29 Clear air turbulence (CAT) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+29 29 Clear air turbulence [CAT] (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/21/4.2.0.191.table b/definitions/grib2/tables/21/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/21/4.2.0.191.table
+++ b/definitions/grib2/tables/21/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/21/4.2.0.2.table b/definitions/grib2/tables/21/4.2.0.2.table
index 5446262e6..fc169f9ba 100644
--- a/definitions/grib2/tables/21/4.2.0.2.table
+++ b/definitions/grib2/tables/21/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/21/4.2.0.20.table b/definitions/grib2/tables/21/4.2.0.20.table
index efc427a19..19db8a604 100644
--- a/definitions/grib2/tables/21/4.2.0.20.table
+++ b/definitions/grib2/tables/21/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,7 +30,7 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/21/4.2.0.4.table b/definitions/grib2/tables/21/4.2.0.4.table
index 0a5ded2b5..4d2f8d900 100644
--- a/definitions/grib2/tables/21/4.2.0.4.table
+++ b/definitions/grib2/tables/21/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/21/4.2.0.5.table b/definitions/grib2/tables/21/4.2.0.5.table
index 4550220b6..d28169fe1 100644
--- a/definitions/grib2/tables/21/4.2.0.5.table
+++ b/definitions/grib2/tables/21/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/21/4.2.0.6.table b/definitions/grib2/tables/21/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/21/4.2.0.6.table
+++ b/definitions/grib2/tables/21/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.0.7.table b/definitions/grib2/tables/21/4.2.0.7.table
index aff6a6516..5e86b2b7a 100644
--- a/definitions/grib2/tables/21/4.2.0.7.table
+++ b/definitions/grib2/tables/21/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/21/4.2.1.0.table b/definitions/grib2/tables/21/4.2.1.0.table
index e906af726..4f6c5ea69 100644
--- a/definitions/grib2/tables/21/4.2.1.0.table
+++ b/definitions/grib2/tables/21/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/21/4.2.1.1.table b/definitions/grib2/tables/21/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/21/4.2.1.1.table
+++ b/definitions/grib2/tables/21/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.1.2.table b/definitions/grib2/tables/21/4.2.1.2.table
index ec9b11d41..ca130e960 100644
--- a/definitions/grib2/tables/21/4.2.1.2.table
+++ b/definitions/grib2/tables/21/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/21/4.2.10.0.table b/definitions/grib2/tables/21/4.2.10.0.table
index 095f51bdf..48362c76a 100644
--- a/definitions/grib2/tables/21/4.2.10.0.table
+++ b/definitions/grib2/tables/21/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/21/4.2.10.191.table b/definitions/grib2/tables/21/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/21/4.2.10.191.table
+++ b/definitions/grib2/tables/21/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/21/4.2.2.0.table b/definitions/grib2/tables/21/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/21/4.2.2.0.table
+++ b/definitions/grib2/tables/21/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.2.3.table b/definitions/grib2/tables/21/4.2.2.3.table
index 447e4f9cb..7c5614cdb 100644
--- a/definitions/grib2/tables/21/4.2.2.3.table
+++ b/definitions/grib2/tables/21/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/21/4.2.2.4.table b/definitions/grib2/tables/21/4.2.2.4.table
index bb54fac22..5edfd3b7e 100644
--- a/definitions/grib2/tables/21/4.2.2.4.table
+++ b/definitions/grib2/tables/21/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
-6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
-7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
-8 8 Drought Code (Canadian Forest Service) (Numeric)
-9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
-10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
-11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
+5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
+6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
+7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
+8 8 Drought Code [Canadian Forest Service] (Numeric)
+9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
+10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
+11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.3.1.table b/definitions/grib2/tables/21/4.2.3.1.table
index 9fdeb0385..2467b58cb 100644
--- a/definitions/grib2/tables/21/4.2.3.1.table
+++ b/definitions/grib2/tables/21/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/23/4.2.0.0.table b/definitions/grib2/tables/23/4.2.0.0.table
index 7201a8667..1682411de 100644
--- a/definitions/grib2/tables/23/4.2.0.0.table
+++ b/definitions/grib2/tables/23/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/23/4.2.0.1.table b/definitions/grib2/tables/23/4.2.0.1.table
index dee95505d..90a3251a5 100644
--- a/definitions/grib2/tables/23/4.2.0.1.table
+++ b/definitions/grib2/tables/23/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/23/4.2.0.15.table b/definitions/grib2/tables/23/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/23/4.2.0.15.table
+++ b/definitions/grib2/tables/23/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/23/4.2.0.17.table b/definitions/grib2/tables/23/4.2.0.17.table
index ce1867aca..9cf729a7b 100644
--- a/definitions/grib2/tables/23/4.2.0.17.table
+++ b/definitions/grib2/tables/23/4.2.0.17.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index (LPI) (J kg-1)
+1 1 Lightning potential index [LPI] (J kg-1)
 2 2 Cloud-to-ground Lightning flash density (km-2 day-1)
 3 3 Cloud-to-cloud Lightning flash density (km-2 day-1)
 4 4 Total Lightning flash density (km-2 day-1)
diff --git a/definitions/grib2/tables/23/4.2.0.18.table b/definitions/grib2/tables/23/4.2.0.18.table
index 9d106f419..35e23577f 100644
--- a/definitions/grib2/tables/23/4.2.0.18.table
+++ b/definitions/grib2/tables/23/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/23/4.2.0.19.table b/definitions/grib2/tables/23/4.2.0.19.table
index e4a4e2d04..182f1400e 100644
--- a/definitions/grib2/tables/23/4.2.0.19.table
+++ b/definitions/grib2/tables/23/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
-29 29 Clear air turbulence (CAT) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+29 29 Clear air turbulence [CAT] (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/23/4.2.0.191.table b/definitions/grib2/tables/23/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/23/4.2.0.191.table
+++ b/definitions/grib2/tables/23/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/23/4.2.0.2.table b/definitions/grib2/tables/23/4.2.0.2.table
index 5446262e6..fc169f9ba 100644
--- a/definitions/grib2/tables/23/4.2.0.2.table
+++ b/definitions/grib2/tables/23/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/23/4.2.0.20.table b/definitions/grib2/tables/23/4.2.0.20.table
index 9e6ac3c05..a79343cd1 100644
--- a/definitions/grib2/tables/23/4.2.0.20.table
+++ b/definitions/grib2/tables/23/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,14 +13,14 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 15 15 Dry deposition velocity (m/s)
 16 16 Mass mixing ratio with respect to dry air (kg/kg)
 17 17 Mass mixing ratio with respect to wet air (kg/kg)
 # 18-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -45,7 +45,7 @@
 74 74 Column-integrated release rate from evaporating convective precipitation (kg m-2 s-1)
 75 75 Wildfire flux (kg m-2 s-1)
 # 76-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/23/4.2.0.4.table b/definitions/grib2/tables/23/4.2.0.4.table
index 0a5ded2b5..4d2f8d900 100644
--- a/definitions/grib2/tables/23/4.2.0.4.table
+++ b/definitions/grib2/tables/23/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/23/4.2.0.5.table b/definitions/grib2/tables/23/4.2.0.5.table
index 4550220b6..d28169fe1 100644
--- a/definitions/grib2/tables/23/4.2.0.5.table
+++ b/definitions/grib2/tables/23/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/23/4.2.0.6.table b/definitions/grib2/tables/23/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/23/4.2.0.6.table
+++ b/definitions/grib2/tables/23/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.0.7.table b/definitions/grib2/tables/23/4.2.0.7.table
index aff6a6516..5e86b2b7a 100644
--- a/definitions/grib2/tables/23/4.2.0.7.table
+++ b/definitions/grib2/tables/23/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/23/4.2.1.0.table b/definitions/grib2/tables/23/4.2.1.0.table
index e906af726..4f6c5ea69 100644
--- a/definitions/grib2/tables/23/4.2.1.0.table
+++ b/definitions/grib2/tables/23/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/23/4.2.1.1.table b/definitions/grib2/tables/23/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/23/4.2.1.1.table
+++ b/definitions/grib2/tables/23/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.1.2.table b/definitions/grib2/tables/23/4.2.1.2.table
index ec9b11d41..ca130e960 100644
--- a/definitions/grib2/tables/23/4.2.1.2.table
+++ b/definitions/grib2/tables/23/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/23/4.2.10.0.table b/definitions/grib2/tables/23/4.2.10.0.table
index 6a60ba8aa..57cdfcc15 100644
--- a/definitions/grib2/tables/23/4.2.10.0.table
+++ b/definitions/grib2/tables/23/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/23/4.2.10.191.table b/definitions/grib2/tables/23/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/23/4.2.10.191.table
+++ b/definitions/grib2/tables/23/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/23/4.2.10.4.table b/definitions/grib2/tables/23/4.2.10.4.table
index bcf955ef5..72f5ea3c8 100644
--- a/definitions/grib2/tables/23/4.2.10.4.table
+++ b/definitions/grib2/tables/23/4.2.10.4.table
@@ -13,12 +13,12 @@
 13 13 Attenuation coefficient of water with respect to solar radiation (/m)
 14 14 Water depth (m)
 15 15 Water temperature (K)
-16 16 Water density (rho) (kg m-3)
-17 17 Water density anomaly (sigma) (kg m-3)
-18 18 Water potential temperature (theta) (K)
-19 19 Water potential density (rho theta) (kg m-3)
-20 20 Water potential density anomaly (sigma theta) (kg m-3)
-21 21 Practical salinity (psu (numeric))
+16 16 Water density [rho] (kg m-3)
+17 17 Water density anomaly [sigma] (kg m-3)
+18 18 Water potential temperature [theta] (K)
+19 19 Water potential density [rho theta] (kg m-3)
+20 20 Water potential density anomaly [sigma theta] (kg m-3)
+21 21 Practical salinity (Numeric)
 # 22-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.2.0.table b/definitions/grib2/tables/23/4.2.2.0.table
index f11616d7c..318d2af45 100644
--- a/definitions/grib2/tables/23/4.2.2.0.table
+++ b/definitions/grib2/tables/23/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.2.3.table b/definitions/grib2/tables/23/4.2.2.3.table
index 447e4f9cb..7c5614cdb 100644
--- a/definitions/grib2/tables/23/4.2.2.3.table
+++ b/definitions/grib2/tables/23/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/23/4.2.2.4.table b/definitions/grib2/tables/23/4.2.2.4.table
index bb54fac22..5edfd3b7e 100644
--- a/definitions/grib2/tables/23/4.2.2.4.table
+++ b/definitions/grib2/tables/23/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
-6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
-7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
-8 8 Drought Code (Canadian Forest Service) (Numeric)
-9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
-10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
-11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
+5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
+6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
+7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
+8 8 Drought Code [Canadian Forest Service] (Numeric)
+9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
+10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
+11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.3.1.table b/definitions/grib2/tables/23/4.2.3.1.table
index 7d4364f4d..7c44965f4 100644
--- a/definitions/grib2/tables/23/4.2.3.1.table
+++ b/definitions/grib2/tables/23/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/24/4.2.0.0.table b/definitions/grib2/tables/24/4.2.0.0.table
index 7201a8667..1682411de 100644
--- a/definitions/grib2/tables/24/4.2.0.0.table
+++ b/definitions/grib2/tables/24/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression (or deficit) (K)
+7 7 Dewpoint depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/24/4.2.0.1.table b/definitions/grib2/tables/24/4.2.0.1.table
index 1c9642374..2b63c1eae 100644
--- a/definitions/grib2/tables/24/4.2.0.1.table
+++ b/definitions/grib2/tables/24/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/24/4.2.0.15.table b/definitions/grib2/tables/24/4.2.0.15.table
index dfbc4d12f..7805f9abc 100644
--- a/definitions/grib2/tables/24/4.2.0.15.table
+++ b/definitions/grib2/tables/24/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water (VIL) (kg m-2)
+3 3 Vertically integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/24/4.2.0.17.table b/definitions/grib2/tables/24/4.2.0.17.table
index ce1867aca..9cf729a7b 100644
--- a/definitions/grib2/tables/24/4.2.0.17.table
+++ b/definitions/grib2/tables/24/4.2.0.17.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index (LPI) (J kg-1)
+1 1 Lightning potential index [LPI] (J kg-1)
 2 2 Cloud-to-ground Lightning flash density (km-2 day-1)
 3 3 Cloud-to-cloud Lightning flash density (km-2 day-1)
 4 4 Total Lightning flash density (km-2 day-1)
diff --git a/definitions/grib2/tables/24/4.2.0.18.table b/definitions/grib2/tables/24/4.2.0.18.table
index 9d106f419..35e23577f 100644
--- a/definitions/grib2/tables/24/4.2.0.18.table
+++ b/definitions/grib2/tables/24/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/24/4.2.0.19.table b/definitions/grib2/tables/24/4.2.0.19.table
index c8d0f991e..956d74f58 100644
--- a/definitions/grib2/tables/24/4.2.0.19.table
+++ b/definitions/grib2/tables/24/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
-29 29 Clear air turbulence (CAT) (m2/3 s-1)
+28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+29 29 Clear air turbulence [CAT] (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/24/4.2.0.191.table b/definitions/grib2/tables/24/4.2.0.191.table
index e3bba0ebe..aa2f7624c 100644
--- a/definitions/grib2/tables/24/4.2.0.191.table
+++ b/definitions/grib2/tables/24/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/24/4.2.0.2.table b/definitions/grib2/tables/24/4.2.0.2.table
index 5446262e6..fc169f9ba 100644
--- a/definitions/grib2/tables/24/4.2.0.2.table
+++ b/definitions/grib2/tables/24/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction (from which blowing) (degree true)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/24/4.2.0.20.table b/definitions/grib2/tables/24/4.2.0.20.table
index 042732760..e467dec0e 100644
--- a/definitions/grib2/tables/24/4.2.0.20.table
+++ b/definitions/grib2/tables/24/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,14 +13,14 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 15 15 Dry deposition velocity (m/s)
 16 16 Mass mixing ratio with respect to dry air (kg/kg)
 17 17 Mass mixing ratio with respect to wet air (kg/kg)
 # 18-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -47,7 +47,7 @@
 76 76 Emission rate (kg kg-1 s-1)
 77 77 Surface emission flux (kg m-2 s-1)
 # 78-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/24/4.2.0.4.table b/definitions/grib2/tables/24/4.2.0.4.table
index 0a5ded2b5..4d2f8d900 100644
--- a/definitions/grib2/tables/24/4.2.0.4.table
+++ b/definitions/grib2/tables/24/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/24/4.2.0.5.table b/definitions/grib2/tables/24/4.2.0.5.table
index 4550220b6..d28169fe1 100644
--- a/definitions/grib2/tables/24/4.2.0.5.table
+++ b/definitions/grib2/tables/24/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/24/4.2.0.6.table b/definitions/grib2/tables/24/4.2.0.6.table
index 1483d8cb3..462ea007f 100644
--- a/definitions/grib2/tables/24/4.2.0.6.table
+++ b/definitions/grib2/tables/24/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud (ice and/or water) (Numeric)
+49 49 Volume fraction of cloud [ice and/or water] (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.0.7.table b/definitions/grib2/tables/24/4.2.0.7.table
index aff6a6516..5e86b2b7a 100644
--- a/definitions/grib2/tables/24/4.2.0.7.table
+++ b/definitions/grib2/tables/24/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/24/4.2.1.0.table b/definitions/grib2/tables/24/4.2.1.0.table
index e906af726..4f6c5ea69 100644
--- a/definitions/grib2/tables/24/4.2.1.0.table
+++ b/definitions/grib2/tables/24/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/24/4.2.1.1.table b/definitions/grib2/tables/24/4.2.1.1.table
index b488eb0bd..28cccf8b4 100644
--- a/definitions/grib2/tables/24/4.2.1.1.table
+++ b/definitions/grib2/tables/24/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.1.2.table b/definitions/grib2/tables/24/4.2.1.2.table
index ec9b11d41..ca130e960 100644
--- a/definitions/grib2/tables/24/4.2.1.2.table
+++ b/definitions/grib2/tables/24/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/24/4.2.10.0.table b/definitions/grib2/tables/24/4.2.10.0.table
index 53c9d2421..607869974 100644
--- a/definitions/grib2/tables/24/4.2.10.0.table
+++ b/definitions/grib2/tables/24/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/24/4.2.10.191.table b/definitions/grib2/tables/24/4.2.10.191.table
index 524929e78..8428cbeb9 100644
--- a/definitions/grib2/tables/24/4.2.10.191.table
+++ b/definitions/grib2/tables/24/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/24/4.2.10.4.table b/definitions/grib2/tables/24/4.2.10.4.table
index 69ba0cc66..72f5ea3c8 100644
--- a/definitions/grib2/tables/24/4.2.10.4.table
+++ b/definitions/grib2/tables/24/4.2.10.4.table
@@ -13,11 +13,11 @@
 13 13 Attenuation coefficient of water with respect to solar radiation (/m)
 14 14 Water depth (m)
 15 15 Water temperature (K)
-16 16 Water density (rho) (kg m-3)
-17 17 Water density anomaly (sigma) (kg m-3)
-18 18 Water potential temperature (theta) (K)
-19 19 Water potential density (rho theta) (kg m-3)
-20 20 Water potential density anomaly (sigma theta) (kg m-3)
+16 16 Water density [rho] (kg m-3)
+17 17 Water density anomaly [sigma] (kg m-3)
+18 18 Water potential temperature [theta] (K)
+19 19 Water potential density [rho theta] (kg m-3)
+20 20 Water potential density anomaly [sigma theta] (kg m-3)
 21 21 Practical salinity (Numeric)
 # 22-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/24/4.2.2.0.table b/definitions/grib2/tables/24/4.2.2.0.table
index ca8651cba..7702b3d3e 100644
--- a/definitions/grib2/tables/24/4.2.2.0.table
+++ b/definitions/grib2/tables/24/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
+38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
 39 39 Evapotranspiration rate (kg m-2 s-1)
 # 40-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/24/4.2.2.3.table b/definitions/grib2/tables/24/4.2.2.3.table
index 447e4f9cb..7c5614cdb 100644
--- a/definitions/grib2/tables/24/4.2.2.3.table
+++ b/definitions/grib2/tables/24/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/24/4.2.2.4.table b/definitions/grib2/tables/24/4.2.2.4.table
index bb54fac22..5edfd3b7e 100644
--- a/definitions/grib2/tables/24/4.2.2.4.table
+++ b/definitions/grib2/tables/24/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
-6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
-7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
-8 8 Drought Code (Canadian Forest Service) (Numeric)
-9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
-10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
-11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
+5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
+6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
+7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
+8 8 Drought Code [Canadian Forest Service] (Numeric)
+9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
+10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
+11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.3.1.table b/definitions/grib2/tables/24/4.2.3.1.table
index 7d4364f4d..7c44965f4 100644
--- a/definitions/grib2/tables/24/4.2.3.1.table
+++ b/definitions/grib2/tables/24/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/4/4.2.0.1.table b/definitions/grib2/tables/4/4.2.0.1.table
index 154f2d007..b321579f0 100644
--- a/definitions/grib2/tables/4/4.2.0.1.table
+++ b/definitions/grib2/tables/4/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (day)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type (code table (4.201)
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg kg-1)
 22 22 Cloud mixing ratio (kg kg-1)
diff --git a/definitions/grib2/tables/5/4.2.0.2.table b/definitions/grib2/tables/5/4.2.0.2.table
index cf930adf5..3d57cf508 100644
--- a/definitions/grib2/tables/5/4.2.0.2.table
+++ b/definitions/grib2/tables/5/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction (from which blowing) (deg true)
+0 0 Wind direction [from which blowing] (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
diff --git a/definitions/grib2/tables/6/4.2.0.2.table b/definitions/grib2/tables/6/4.2.0.2.table
index efc60025d..09a4d28ab 100644
--- a/definitions/grib2/tables/6/4.2.0.2.table
+++ b/definitions/grib2/tables/6/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction (from which blowing) (deg true)
+0 0 Wind direction [from which blowing] (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
diff --git a/definitions/grib2/tables/7/4.2.0.2.table b/definitions/grib2/tables/7/4.2.0.2.table
index 8380d5160..ecd7d825d 100644
--- a/definitions/grib2/tables/7/4.2.0.2.table
+++ b/definitions/grib2/tables/7/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction (from which blowing) (deg true)
+0 0 Wind direction [from which blowing] (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
diff --git a/definitions/grib2/tables/8/4.2.0.2.table b/definitions/grib2/tables/8/4.2.0.2.table
index 22315264b..dbd39702e 100644
--- a/definitions/grib2/tables/8/4.2.0.2.table
+++ b/definitions/grib2/tables/8/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction (from which blowing) (degree true) (deg)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
diff --git a/definitions/grib2/tables/9/4.2.0.0.table b/definitions/grib2/tables/9/4.2.0.0.table
index debc0a6f4..13adadb70 100644
--- a/definitions/grib2/tables/9/4.2.0.0.table
+++ b/definitions/grib2/tables/9/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew-point temperature (K)
-7 7 Dew-point depression (or deficit) (K)
+7 7 Dew-point depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/9/4.2.0.1.table b/definitions/grib2/tables/9/4.2.0.1.table
index 319d5c17c..e4837ea9b 100644
--- a/definitions/grib2/tables/9/4.2.0.1.table
+++ b/definitions/grib2/tables/9/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total Condensate (kg/kg)
 81 81 Total Column-Integrated Condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/9/4.2.0.15.table b/definitions/grib2/tables/9/4.2.0.15.table
index 895892f86..004d02950 100644
--- a/definitions/grib2/tables/9/4.2.0.15.table
+++ b/definitions/grib2/tables/9/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically-integrated liquid water (VIL) (kg m-2)
+3 3 Vertically-integrated liquid water [VIL] (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/9/4.2.0.18.table b/definitions/grib2/tables/9/4.2.0.18.table
index 30060fd2d..aa2e3d1fb 100644
--- a/definitions/grib2/tables/9/4.2.0.18.table
+++ b/definitions/grib2/tables/9/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/9/4.2.0.19.table b/definitions/grib2/tables/9/4.2.0.19.table
index 101103cb4..dceb79ccc 100644
--- a/definitions/grib2/tables/9/4.2.0.19.table
+++ b/definitions/grib2/tables/9/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather (Code table 4.225)
diff --git a/definitions/grib2/tables/9/4.2.0.191.table b/definitions/grib2/tables/9/4.2.0.191.table
index 81230c0e0..4833f8f88 100644
--- a/definitions/grib2/tables/9/4.2.0.191.table
+++ b/definitions/grib2/tables/9/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/9/4.2.0.2.table b/definitions/grib2/tables/9/4.2.0.2.table
index 27d307f92..b5654c5f5 100644
--- a/definitions/grib2/tables/9/4.2.0.2.table
+++ b/definitions/grib2/tables/9/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction (from which blowing) (degree true) (deg)
+0 0 Wind direction [from which blowing] (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/9/4.2.0.20.table b/definitions/grib2/tables/9/4.2.0.20.table
index cc2dbcc52..e636a5ee9 100644
--- a/definitions/grib2/tables/9/4.2.0.20.table
+++ b/definitions/grib2/tables/9/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (Sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [Sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/9/4.2.0.4.table b/definitions/grib2/tables/9/4.2.0.4.table
index fea4cafc3..0b83187b4 100644
--- a/definitions/grib2/tables/9/4.2.0.4.table
+++ b/definitions/grib2/tables/9/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/9/4.2.0.5.table b/definitions/grib2/tables/9/4.2.0.5.table
index aae853bf9..6a861331c 100644
--- a/definitions/grib2/tables/9/4.2.0.5.table
+++ b/definitions/grib2/tables/9/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/9/4.2.0.6.table b/definitions/grib2/tables/9/4.2.0.6.table
index 055df76a5..0f60b71b6 100644
--- a/definitions/grib2/tables/9/4.2.0.6.table
+++ b/definitions/grib2/tables/9/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/9/4.2.0.7.table b/definitions/grib2/tables/9/4.2.0.7.table
index 7a7d2008b..244272e58 100644
--- a/definitions/grib2/tables/9/4.2.0.7.table
+++ b/definitions/grib2/tables/9/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/9/4.2.1.0.table b/definitions/grib2/tables/9/4.2.1.0.table
index 4e72e1ab3..00b032310 100644
--- a/definitions/grib2/tables/9/4.2.1.0.table
+++ b/definitions/grib2/tables/9/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/9/4.2.1.1.table b/definitions/grib2/tables/9/4.2.1.1.table
index cb5117dc8..3b95971a9 100644
--- a/definitions/grib2/tables/9/4.2.1.1.table
+++ b/definitions/grib2/tables/9/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/9/4.2.1.2.table b/definitions/grib2/tables/9/4.2.1.2.table
index c53a175fe..e665fa195 100644
--- a/definitions/grib2/tables/9/4.2.1.2.table
+++ b/definitions/grib2/tables/9/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/9/4.2.10.0.table b/definitions/grib2/tables/9/4.2.10.0.table
index d4321d955..291b54d19 100644
--- a/definitions/grib2/tables/9/4.2.10.0.table
+++ b/definitions/grib2/tables/9/4.2.10.0.table
@@ -1,19 +1,19 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
-4 4 Direction of wind waves (degree true) (deg)
+4 4 Direction of wind waves [degree true] (deg)
 5 5 Significant height of wind waves (m)
 6 6 Mean period of wind waves (s)
-7 7 Direction of swell waves (degree true) (deg)
+7 7 Direction of swell waves [degree true] (deg)
 8 8 Significant height of swell waves (m)
 9 9 Mean period of swell waves (s)
-10 10 Primary wave direction (degree true) (deg)
+10 10 Primary wave direction [degree true] (deg)
 11 11 Primary wave mean period (s)
-12 12 Secondary wave direction (degree true) (deg)
+12 12 Secondary wave direction [degree true] (deg)
 13 13 Secondary wave mean period (s)
-14 14 Direction of combined wind waves and swell (degree true) (deg)
+14 14 Direction of combined wind waves and swell [degree true] (deg)
 15 15 Mean period of combined wind waves and swell (s)
 16 16 Coefficient of drag with waves (-)
 17 17 Friction velocity (m s-1)
diff --git a/definitions/grib2/tables/9/4.2.10.1.table b/definitions/grib2/tables/9/4.2.10.1.table
index 5a33bac5d..f9486e6a4 100644
--- a/definitions/grib2/tables/9/4.2.10.1.table
+++ b/definitions/grib2/tables/9/4.2.10.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Current direction (degree true) (deg)
+0 0 Current direction [degree true] (deg)
 1 1 Current speed (m/s)
 2 2 u-component of current (m/s)
 3 3 v-component of current (m/s)
diff --git a/definitions/grib2/tables/9/4.2.10.191.table b/definitions/grib2/tables/9/4.2.10.191.table
index 14085ac9a..f0936614f 100644
--- a/definitions/grib2/tables/9/4.2.10.191.table
+++ b/definitions/grib2/tables/9/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/9/4.2.10.2.table b/definitions/grib2/tables/9/4.2.10.2.table
index a69b2622c..cb84cbbb2 100644
--- a/definitions/grib2/tables/9/4.2.10.2.table
+++ b/definitions/grib2/tables/9/4.2.10.2.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Ice cover (Proportion)
 1 1 Ice thickness (m)
-2 2 Direction of ice drift (degree true) (deg)
+2 2 Direction of ice drift [degree true] (deg)
 3 3 Speed of ice drift (m/s)
 4 4 u-component of ice drift (m/s)
 5 5 v-component of ice drift (m/s)
diff --git a/definitions/grib2/tables/9/4.2.2.0.table b/definitions/grib2/tables/9/4.2.2.0.table
index 3e43b501c..ff62b236e 100644
--- a/definitions/grib2/tables/9/4.2.2.0.table
+++ b/definitions/grib2/tables/9/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/9/4.2.2.3.table b/definitions/grib2/tables/9/4.2.2.3.table
index 6c135b8cd..ab50b98b0 100644
--- a/definitions/grib2/tables/9/4.2.2.3.table
+++ b/definitions/grib2/tables/9/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/9/4.2.3.1.table b/definitions/grib2/tables/9/4.2.3.1.table
index 16eee69c4..5a49942d6 100644
--- a/definitions/grib2/tables/9/4.2.3.1.table
+++ b/definitions/grib2/tables/9/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um

From 01d9f8b858483909dcb67c998f339d7e12769f0f Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Fri, 22 Nov 2019 10:41:17 +0000
Subject: [PATCH 22/38] Definitions: Add missing tables

---
 definitions/grib2/tables/22/1.4.table  | 13 +++++
 definitions/grib2/tables/22/3.15.table | 23 ++++++++
 definitions/grib2/tables/22/4.10.table | 16 ++++++
 definitions/grib2/tables/22/4.4.table  | 17 ++++++
 definitions/grib2/tables/22/4.5.table  | 72 ++++++++++++++++++++++++++
 definitions/grib2/tables/22/4.91.table | 16 ++++++
 6 files changed, 157 insertions(+)
 create mode 100644 definitions/grib2/tables/22/1.4.table
 create mode 100644 definitions/grib2/tables/22/3.15.table
 create mode 100644 definitions/grib2/tables/22/4.10.table
 create mode 100644 definitions/grib2/tables/22/4.4.table
 create mode 100644 definitions/grib2/tables/22/4.5.table
 create mode 100644 definitions/grib2/tables/22/4.91.table

diff --git a/definitions/grib2/tables/22/1.4.table b/definitions/grib2/tables/22/1.4.table
new file mode 100644
index 000000000..03203d874
--- /dev/null
+++ b/definitions/grib2/tables/22/1.4.table
@@ -0,0 +1,13 @@
+# Code table 1.4 - Type of data
+0 an Analysis products 
+1 fc Forecast products 
+2 af Analysis and forecast products 
+3 cf Control forecast products 
+4 pf Perturbed forecast products 
+5 cp Control and perturbed forecast products 
+6 sa Processed satellite observations 
+7 ra Processed radar observations 
+8 ep Event probability 
+# 9-191 Reserved 
+# 192-254 Reserved for local use 
+255 missing Missing 
diff --git a/definitions/grib2/tables/22/3.15.table b/definitions/grib2/tables/22/3.15.table
new file mode 100644
index 000000000..331217ebe
--- /dev/null
+++ b/definitions/grib2/tables/22/3.15.table
@@ -0,0 +1,23 @@
+# Code table 3.15 - Physical meaning of vertical coordinate
+# 0-19 Reserved 
+20 20 Temperature (K)
+# 21-99 Reserved 
+100 100 Pressure (Pa)
+101 101 Pressure deviation from mean sea level (Pa)
+102 102 Altitude above mean sea level (m)
+103 103 Height above ground (m)
+104 104 Sigma coordinate 
+105 105 Hybrid coordinate 
+106 106 Depth below land surface (m)
+107 pt Potential temperature (theta) (K)
+108 108 Pressure deviation from ground to level (Pa)
+109 pv Potential vorticity (K m-2 kg-1 s-1)
+110 110 Geometrical height (m)
+111 111 Eta coordinate 
+112 112 Geopotential height (gpm)
+113 113 Logarithmic hybrid coordinate 
+# 114-159 Reserved 
+160 160 Depth below sea level (m)
+# 161-191 Reserved 
+# 192-254 Reserved for local use 
+255 255 Missing 
diff --git a/definitions/grib2/tables/22/4.10.table b/definitions/grib2/tables/22/4.10.table
new file mode 100644
index 000000000..1a92baaf6
--- /dev/null
+++ b/definitions/grib2/tables/22/4.10.table
@@ -0,0 +1,16 @@
+# Code table 4.10 - Type of statistical processing
+0 avg Average 
+1 accum Accumulation 
+2 max Maximum 
+3 min Minimum 
+4 diff Difference (value at the end of time range minus value at the beginning) 
+5 rms Root mean square 
+6 sd Standard deviation 
+7 cov Covariance (temporal variance) 
+8 8 Difference (value at the start of time range minus value at the end) 
+9 ratio Ratio 
+10 10 Standardized anomaly 
+11 11 Summation 
+# 12-191 Reserved 
+# 192-254 Reserved for local use 
+255 missing Missing 
diff --git a/definitions/grib2/tables/22/4.4.table b/definitions/grib2/tables/22/4.4.table
new file mode 100644
index 000000000..7087ebddb
--- /dev/null
+++ b/definitions/grib2/tables/22/4.4.table
@@ -0,0 +1,17 @@
+# Code table 4.4 - Indicator of unit of time range
+0 m Minute 
+1 h Hour 
+2 D Day 
+3 M Month 
+4 Y Year 
+5 10Y Decade (10 years) 
+6 30Y Normal (30 years) 
+7 C Century (100 years) 
+# 8-9 Reserved 
+10 3h 3 hours 
+11 6h 6 hours 
+12 12h 12 hours 
+13 s Second 
+# 14-191 Reserved 
+# 192-254 Reserved for local use 
+255 255 Missing 
diff --git a/definitions/grib2/tables/22/4.5.table b/definitions/grib2/tables/22/4.5.table
new file mode 100644
index 000000000..35df9e2aa
--- /dev/null
+++ b/definitions/grib2/tables/22/4.5.table
@@ -0,0 +1,72 @@
+# Code table 4.5 - Fixed surface types and units
+0 0 Reserved 
+1 sfc Ground or water surface (-)
+2 2 Cloud base level (-)
+3 3 Level of cloud tops (-)
+4 4 Level of 0 degree C isotherm (-)
+5 5 Level of adiabatic condensation lifted from the surface (-)
+6 6 Maximum wind level (-)
+7 7 Tropopause (-)
+8 sfc Nominal top of the atmosphere (-)
+9 9 Sea bottom (-)
+10 10 Entire atmosphere (-)
+11 11 Cumulonimbus [CB] base (m)
+12 12 Cumulonimbus [CB] top (m)
+13 13 Lowest level where vertically integrated cloud cover exceeds the specified percentage [cloud base for a given percentage cloud cover] (%)
+14 14 Level of free convection (LFC)
+15 15 Convective condensation level (CCL)
+16 16 Level of neutral buoyancy or equilibrium level (LNB)
+# 17-19 Reserved 
+20 20 Isothermal level (K)
+21 21 Lowest level where mass density exceeds the specified value [base for a given threshold of mass density] (kg m-3)
+22 22 Highest level where mass density exceeds the specified value [top for a given threshold of mass density] (kg m-3)
+23 23 Lowest level where air concentration exceeds the specified value [base for a given threshold of air concentration] (Bq m-3)
+24 24 Highest level where air concentration exceeds the specified value [top for a given threshold of air concentration] (Bq m-3)
+# 25-99 Reserved 
+100 pl Isobaric surface (Pa)
+101 sfc Mean sea level 
+102 102 Specific altitude above mean sea level (m)
+103 sfc Specified height level above ground (m)
+104 104 Sigma level (sigma value)
+105 ml Hybrid level (-)
+106 sfc Depth below land surface (m)
+107 pt Isentropic [theta] level (K)
+108 108 Level at specified pressure difference from ground to level (Pa)
+109 pv Potential vorticity surface (K m2 kg-1 s-1)
+110 110 Reserved 
+111 111 Eta level (-)
+112 112 Reserved 
+113 113 Logarithmic hybrid level 
+114 114 Snow level (Numeric)
+115 115 Sigma height level
+# 116 Reserved
+117 117 Mixed layer depth (m)
+118 hhl Hybrid height level (-)
+119 hpl Hybrid pressure level (-)
+# 120-149 Reserved 
+150 150 Generalized vertical height coordinate 
+151 sol Soil level (Numeric)
+# 152-159 Reserved 
+160 160 Depth below sea level (m)
+161 161 Depth below water surface (m)
+162 162 Lake or river bottom (-)
+163 163 Bottom of sediment layer (-)
+164 164 Bottom of thermally active sediment layer (-)
+165 165 Bottom of sediment layer penetrated by thermal wave (-)
+166 166 Mixing layer (-)
+167 167 Bottom of root zone (-)
+# 168-173 Reserved 
+174 174 Top surface of ice on sea, lake or river
+175 175 Top surface of ice, under snow cover, on sea, lake or river
+176 176 Bottom surface (underside) ice on sea, lake or river
+177 sfc Deep soil (of indefinite depth)
+# 178 Reserved
+179 179 Top surface of glacier ice and inland ice
+180 180 Deep inland or glacier ice (of indefinite depth)
+181 181 Grid tile land fraction as a model surface
+182 182 Grid tile water fraction as a model surface
+183 183 Grid tile ice fraction on sea, lake or river as a model surface
+184 184 Grid tile glacier ice and inland ice fraction as a model surface
+# 185-191 Reserved 
+# 192-254 Reserved for local use 
+255 255 Missing 
diff --git a/definitions/grib2/tables/22/4.91.table b/definitions/grib2/tables/22/4.91.table
new file mode 100644
index 000000000..44cf25f44
--- /dev/null
+++ b/definitions/grib2/tables/22/4.91.table
@@ -0,0 +1,16 @@
+# Code table 4.91 - Type of Interval
+0 0 Smaller than first limit 
+1 1 Greater than second limit 
+2 2 Between first and second limit. The range includes the first limit but not the second limit 
+3 3 Greater than first limit 
+4 4 Smaller than second limit 
+5 5 Smaller or equal first limit 
+6 6 Greater or equal second limit 
+7 7 Between first and second. The range includes the first limit and the second limit 
+8 8 Greater or equal first limit 
+9 9 Smaller or equal second limit 
+10 10 Between first and second limit. The range includes the second limit but not the first limit 
+11 11 Equal to first limit 
+# 12-191 Reserved 
+# 192-254 Reserved for local use 
+255 missing Missing 

From bac506519bf460bba2ad123ea2652cc27abfdc9e Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Fri, 22 Nov 2019 12:06:46 +0000
Subject: [PATCH 23/38] Definitions: cleanup

---
 definitions/grib2/tables/0/3.7.table        |  9 +--------
 definitions/grib2/tables/0/4.2.1.0.table    |  5 -----
 definitions/grib2/tables/1/3.7.table        |  9 +--------
 definitions/grib2/tables/1/4.2.1.0.table    |  5 -----
 definitions/grib2/tables/2/3.7.table        |  9 +--------
 definitions/grib2/tables/2/4.2.1.0.table    |  5 -----
 definitions/grib2/tables/3/3.7.table        |  6 ------
 definitions/grib2/tables/3/4.2.1.0.table    |  5 -----
 definitions/grib2/tables/4/3.7.table        |  6 ------
 definitions/grib2/tables/4/4.2.0.0.table    |  2 +-
 definitions/grib2/tables/4/4.2.0.1.table    |  6 +++---
 definitions/grib2/tables/4/4.2.0.15.table   |  6 +++---
 definitions/grib2/tables/4/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/4/4.2.0.2.table    |  4 ++--
 definitions/grib2/tables/4/4.2.0.20.table   | 20 ++++++++++----------
 definitions/grib2/tables/4/4.2.0.4.table    |  8 ++++----
 definitions/grib2/tables/4/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/4/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/4/4.2.1.0.table    |  9 ++-------
 definitions/grib2/tables/4/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/4/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/4/4.2.2.0.table    |  2 +-
 definitions/grib2/tables/4/4.2.2.3.table    |  8 ++++----
 definitions/grib2/tables/5/3.7.table        |  6 ------
 definitions/grib2/tables/5/4.2.0.0.table    |  2 +-
 definitions/grib2/tables/5/4.2.0.1.table    | 12 ++++++------
 definitions/grib2/tables/5/4.2.0.15.table   |  6 +++---
 definitions/grib2/tables/5/4.2.0.19.table   |  4 ++--
 definitions/grib2/tables/5/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/5/4.2.0.2.table    | 10 +++++-----
 definitions/grib2/tables/5/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/5/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/5/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/5/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/5/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/5/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/5/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/5/4.2.2.0.table    |  2 +-
 definitions/grib2/tables/5/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/6/3.7.table        |  7 -------
 definitions/grib2/tables/6/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/6/4.2.0.1.table    | 12 ++++++------
 definitions/grib2/tables/6/4.2.0.15.table   |  6 +++---
 definitions/grib2/tables/6/4.2.0.19.table   |  6 +++---
 definitions/grib2/tables/6/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/6/4.2.0.2.table    | 10 +++++-----
 definitions/grib2/tables/6/4.2.0.20.table   | 14 +++++++-------
 definitions/grib2/tables/6/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/6/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/6/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/6/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/6/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/6/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/6/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/6/4.2.10.191.table |  2 +-
 definitions/grib2/tables/6/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/6/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/7/3.7.table        |  7 -------
 definitions/grib2/tables/7/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/7/4.2.0.1.table    | 12 ++++++------
 definitions/grib2/tables/7/4.2.0.15.table   |  6 +++---
 definitions/grib2/tables/7/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/7/4.2.0.19.table   |  4 ++--
 definitions/grib2/tables/7/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/7/4.2.0.2.table    | 10 +++++-----
 definitions/grib2/tables/7/4.2.0.20.table   | 14 +++++++-------
 definitions/grib2/tables/7/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/7/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/7/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/7/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/7/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/7/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/7/4.2.10.0.table   |  6 +++---
 definitions/grib2/tables/7/4.2.10.191.table |  2 +-
 definitions/grib2/tables/7/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/7/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/7/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/8/3.7.table        | 10 ++--------
 definitions/grib2/tables/8/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/8/4.2.0.1.table    | 16 ++++++++--------
 definitions/grib2/tables/8/4.2.0.15.table   |  6 +++---
 definitions/grib2/tables/8/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/8/4.2.0.19.table   |  4 ++--
 definitions/grib2/tables/8/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/8/4.2.0.2.table    | 10 +++++-----
 definitions/grib2/tables/8/4.2.0.20.table   | 10 +++++-----
 definitions/grib2/tables/8/4.2.0.4.table    | 10 +++++-----
 definitions/grib2/tables/8/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/8/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/8/4.2.0.7.table    |  6 +++---
 definitions/grib2/tables/8/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/8/4.2.1.1.table    |  6 +++---
 definitions/grib2/tables/8/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/8/4.2.10.0.table   | 16 ++++++++--------
 definitions/grib2/tables/8/4.2.10.1.table   |  2 +-
 definitions/grib2/tables/8/4.2.10.191.table |  2 +-
 definitions/grib2/tables/8/4.2.10.2.table   |  2 +-
 definitions/grib2/tables/8/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/8/4.2.2.3.table    | 16 ++++++++--------
 definitions/grib2/tables/8/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/9/3.7.table        |  8 +-------
 101 files changed, 277 insertions(+), 367 deletions(-)

diff --git a/definitions/grib2/tables/0/3.7.table b/definitions/grib2/tables/0/3.7.table
index 3aaf30bf9..fa8fe356b 100644
--- a/definitions/grib2/tables/0/3.7.table
+++ b/definitions/grib2/tables/0/3.7.table
@@ -1,11 +1,4 @@
 # Code Table 3.7: Spectral data representation mode
 0 0 Reserved
-1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
-# 2-254 Reserved
+1 1 The complex numbers Fnm
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/0/4.2.1.0.table b/definitions/grib2/tables/0/4.2.1.0.table
index 97efaa8cc..1e867e1cb 100644
--- a/definitions/grib2/tables/0/4.2.1.0.table
+++ b/definitions/grib2/tables/0/4.2.1.0.table
@@ -9,8 +9,3 @@
 # 7-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Remotely sensed snow cover is expressed as a field of dimensionless, thematic values. The currently accepted values are for no-snow/no-cloud, 50, for clouds, 100, and for snow, 250. See code table 4.215.
-# (2) A data field representing snow coverage by elevation portrays at which elevations there is a snow pack. The elevation values typically range from 0 to 90 in 100 m increments. A value of 253 is used to represent a no-snow/no-cloud data point. A value of 254 is used to represent a data point at which snow elevation could not be estimated because of clouds obscuring the remote sensor (when using aircraft or satellite measurements).
-# (3) Snow water equivalent percent of normal is stored in percent of normal units. For example, a value of 110 indicates 110 percent of the normal snow water equivalent for a given depth of snow.
-
diff --git a/definitions/grib2/tables/1/3.7.table b/definitions/grib2/tables/1/3.7.table
index 3aaf30bf9..fa8fe356b 100644
--- a/definitions/grib2/tables/1/3.7.table
+++ b/definitions/grib2/tables/1/3.7.table
@@ -1,11 +1,4 @@
 # Code Table 3.7: Spectral data representation mode
 0 0 Reserved
-1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
-# 2-254 Reserved
+1 1 The complex numbers Fnm
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/1/4.2.1.0.table b/definitions/grib2/tables/1/4.2.1.0.table
index 97efaa8cc..1e867e1cb 100644
--- a/definitions/grib2/tables/1/4.2.1.0.table
+++ b/definitions/grib2/tables/1/4.2.1.0.table
@@ -9,8 +9,3 @@
 # 7-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Remotely sensed snow cover is expressed as a field of dimensionless, thematic values. The currently accepted values are for no-snow/no-cloud, 50, for clouds, 100, and for snow, 250. See code table 4.215.
-# (2) A data field representing snow coverage by elevation portrays at which elevations there is a snow pack. The elevation values typically range from 0 to 90 in 100 m increments. A value of 253 is used to represent a no-snow/no-cloud data point. A value of 254 is used to represent a data point at which snow elevation could not be estimated because of clouds obscuring the remote sensor (when using aircraft or satellite measurements).
-# (3) Snow water equivalent percent of normal is stored in percent of normal units. For example, a value of 110 indicates 110 percent of the normal snow water equivalent for a given depth of snow.
-
diff --git a/definitions/grib2/tables/2/3.7.table b/definitions/grib2/tables/2/3.7.table
index 3aaf30bf9..fa8fe356b 100644
--- a/definitions/grib2/tables/2/3.7.table
+++ b/definitions/grib2/tables/2/3.7.table
@@ -1,11 +1,4 @@
 # Code Table 3.7: Spectral data representation mode
 0 0 Reserved
-1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
-# 2-254 Reserved
+1 1 The complex numbers Fnm
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/2/4.2.1.0.table b/definitions/grib2/tables/2/4.2.1.0.table
index 97efaa8cc..1e867e1cb 100644
--- a/definitions/grib2/tables/2/4.2.1.0.table
+++ b/definitions/grib2/tables/2/4.2.1.0.table
@@ -9,8 +9,3 @@
 # 7-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Remotely sensed snow cover is expressed as a field of dimensionless, thematic values. The currently accepted values are for no-snow/no-cloud, 50, for clouds, 100, and for snow, 250. See code table 4.215.
-# (2) A data field representing snow coverage by elevation portrays at which elevations there is a snow pack. The elevation values typically range from 0 to 90 in 100 m increments. A value of 253 is used to represent a no-snow/no-cloud data point. A value of 254 is used to represent a data point at which snow elevation could not be estimated because of clouds obscuring the remote sensor (when using aircraft or satellite measurements).
-# (3) Snow water equivalent percent of normal is stored in percent of normal units. For example, a value of 110 indicates 110 percent of the normal snow water equivalent for a given depth of snow.
-
diff --git a/definitions/grib2/tables/3/3.7.table b/definitions/grib2/tables/3/3.7.table
index 3aaf30bf9..af874fb8f 100644
--- a/definitions/grib2/tables/3/3.7.table
+++ b/definitions/grib2/tables/3/3.7.table
@@ -3,9 +3,3 @@
 1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
 # 2-254 Reserved
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/3/4.2.1.0.table b/definitions/grib2/tables/3/4.2.1.0.table
index 97efaa8cc..1e867e1cb 100644
--- a/definitions/grib2/tables/3/4.2.1.0.table
+++ b/definitions/grib2/tables/3/4.2.1.0.table
@@ -9,8 +9,3 @@
 # 7-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Remotely sensed snow cover is expressed as a field of dimensionless, thematic values. The currently accepted values are for no-snow/no-cloud, 50, for clouds, 100, and for snow, 250. See code table 4.215.
-# (2) A data field representing snow coverage by elevation portrays at which elevations there is a snow pack. The elevation values typically range from 0 to 90 in 100 m increments. A value of 253 is used to represent a no-snow/no-cloud data point. A value of 254 is used to represent a data point at which snow elevation could not be estimated because of clouds obscuring the remote sensor (when using aircraft or satellite measurements).
-# (3) Snow water equivalent percent of normal is stored in percent of normal units. For example, a value of 110 indicates 110 percent of the normal snow water equivalent for a given depth of snow.
-
diff --git a/definitions/grib2/tables/4/3.7.table b/definitions/grib2/tables/4/3.7.table
index 3aaf30bf9..af874fb8f 100644
--- a/definitions/grib2/tables/4/3.7.table
+++ b/definitions/grib2/tables/4/3.7.table
@@ -3,9 +3,3 @@
 1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
 # 2-254 Reserved
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/4/4.2.0.0.table b/definitions/grib2/tables/4/4.2.0.0.table
index 0386b8cd2..5330f55a8 100644
--- a/definitions/grib2/tables/4/4.2.0.0.table
+++ b/definitions/grib2/tables/4/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression (or deficit) (K)
+7 7 Dew point depression [or deficit] (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
diff --git a/definitions/grib2/tables/4/4.2.0.1.table b/definitions/grib2/tables/4/4.2.0.1.table
index b321579f0..32b55a178 100644
--- a/definitions/grib2/tables/4/4.2.0.1.table
+++ b/definitions/grib2/tables/4/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation (non-convective) (kg m-2)
+9 9 Large scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -29,9 +29,9 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category code table (4.202)
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg kg-1)
+32 32 Graupel [snow pellets] (kg kg-1)
 33 33 Categorical rain (Code table 4.222)
 34 34 Categorical freezing rain (Code table 4.222)
 35 35 Categorical ice pellets (Code table 4.222)
diff --git a/definitions/grib2/tables/4/4.2.0.15.table b/definitions/grib2/tables/4/4.2.0.15.table
index bb419178b..a053a9aea 100644
--- a/definitions/grib2/tables/4/4.2.0.15.table
+++ b/definitions/grib2/tables/4/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 # 9-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/4/4.2.0.191.table b/definitions/grib2/tables/4/4.2.0.191.table
index affb98f42..4c5f401cd 100644
--- a/definitions/grib2/tables/4/4.2.0.191.table
+++ b/definitions/grib2/tables/4/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Product Discipline 0: Meteorological products, Parameter Category 191: Miscellaneous
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 # 1-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/4/4.2.0.2.table b/definitions/grib2/tables/4/4.2.0.2.table
index f45206bff..c06eff682 100644
--- a/definitions/grib2/tables/4/4.2.0.2.table
+++ b/definitions/grib2/tables/4/4.2.0.2.table
@@ -22,8 +22,8 @@
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
 22 22 Wind speed [gust] (m s-1)
-23 23 u-component of wind (gust) (m s-1)
-24 24 v-component of wind (gust) (m s-1)
+23 23 u-component of wind [gust] (m s-1)
+24 24 v-component of wind [gust] (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/4/4.2.0.20.table b/definitions/grib2/tables/4/4.2.0.20.table
index 4e7f45db4..d57c9a208 100644
--- a/definitions/grib2/tables/4/4.2.0.20.table
+++ b/definitions/grib2/tables/4/4.2.0.20.table
@@ -1,13 +1,13 @@
-0 0	Mass density (concentration)	kg.m-3
-1 1	Total column (integrated mass density)	kg.m-2
-2 2	Volume mixing ratio (mole fraction in air)	mole.mole-1
-3 3	Mass mixing ratio (mass fraction in air)	kg.kg-1
-4 4	Surface dry deposition mass flux	kg.m-2.s-1
-5 5	Surface wet deposition mass flux	kg.m-2.s-1
-6 6	Atmosphere emission mass flux	kg.m-2.s-1
-7 7	Chemical gross production rate of mole concentration	mole.m-3.s-1
-8 8	Chemical gross destruction rate of mole concentration	mole.m-3.s-1
-9 9	Surface dry deposition mass flux into stomata	kg.m-2.s-1
+0 0	Mass density [concentration]	(kg.m-3)
+1 1	Total column [integrated mass density]	(kg.m-2)
+2 2	Volume mixing ratio [mole fraction in air]	(mole.mole-1)
+3 3	Mass mixing ratio [mass fraction in air]	(kg.kg-1)
+4 4	Surface dry deposition mass flux	(kg.m-2.s-1)
+5 5	Surface wet deposition mass flux	(kg.m-2.s-1)
+6 6	Atmosphere emission mass flux	(kg.m-2.s-1)
+7 7	Chemical gross production rate of mole concentration	(mole.m-3.s-1)
+8 8	Chemical gross destruction rate of mole concentration	(mole.m-3.s-1)
+9 9	Surface dry deposition mass flux into stomata	(kg.m-2.s-1)
 #10-191	Reserved	
 #192-254	Reserved for local use	
 255 255	Missing	
diff --git a/definitions/grib2/tables/4/4.2.0.4.table b/definitions/grib2/tables/4/4.2.0.4.table
index 815c184a2..882750d0c 100644
--- a/definitions/grib2/tables/4/4.2.0.4.table
+++ b/definitions/grib2/tables/4/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Product Discipline 0: Meteorological products, Parameter Category 4: Short-wave Radiation
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 9 8 Upward short-wave radiation flux (W m-2)
 # 9-191 Reserved
diff --git a/definitions/grib2/tables/4/4.2.0.5.table b/definitions/grib2/tables/4/4.2.0.5.table
index 1b57fa301..1965e7925 100644
--- a/definitions/grib2/tables/4/4.2.0.5.table
+++ b/definitions/grib2/tables/4/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Product Discipline 0: Meteorological products, Parameter Category 5: Long-wave Radiation
-0 0 Net long wave radiation flux (surface) (W m-2)
-1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long wave radiation flux [surface] (W m-2)
+1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/4/4.2.0.7.table b/definitions/grib2/tables/4/4.2.0.7.table
index 78374fde5..c44aebf0b 100644
--- a/definitions/grib2/tables/4/4.2.0.7.table
+++ b/definitions/grib2/tables/4/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Product Discipline 0: Meteorological products, Parameter Category 7: Thermodynamic Stability Indices
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 #13-191 Reserved
 #192-254 Reserved for local use
diff --git a/definitions/grib2/tables/4/4.2.1.0.table b/definitions/grib2/tables/4/4.2.1.0.table
index 97efaa8cc..7b47afa5a 100644
--- a/definitions/grib2/tables/4/4.2.1.0.table
+++ b/definitions/grib2/tables/4/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Product Discipline 1: Hydrologic products, Parameter Category 0: Hydrology basic products
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely sensed snow cover (Code table 4.215)
 3 3 Elevation of snow covered terrain (Code table 4.216)
 4 4 Snow water equivalent percent of normal (%)
@@ -9,8 +9,3 @@
 # 7-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Remotely sensed snow cover is expressed as a field of dimensionless, thematic values. The currently accepted values are for no-snow/no-cloud, 50, for clouds, 100, and for snow, 250. See code table 4.215.
-# (2) A data field representing snow coverage by elevation portrays at which elevations there is a snow pack. The elevation values typically range from 0 to 90 in 100 m increments. A value of 253 is used to represent a no-snow/no-cloud data point. A value of 254 is used to represent a data point at which snow elevation could not be estimated because of clouds obscuring the remote sensor (when using aircraft or satellite measurements).
-# (3) Snow water equivalent percent of normal is stored in percent of normal units. For example, a value of 110 indicates 110 percent of the normal snow water equivalent for a given depth of snow.
-
diff --git a/definitions/grib2/tables/4/4.2.1.1.table b/definitions/grib2/tables/4/4.2.1.1.table
index b7342ef2f..1255eaa81 100644
--- a/definitions/grib2/tables/4/4.2.1.1.table
+++ b/definitions/grib2/tables/4/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Product Discipline 1: Hydrologic products, Parameter Category 1: Hydrology probabilities 
-0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 #3-191 Reserved
 #192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/4/4.2.10.0.table b/definitions/grib2/tables/4/4.2.10.0.table
index 479e26d51..532ff2baf 100644
--- a/definitions/grib2/tables/4/4.2.10.0.table
+++ b/definitions/grib2/tables/4/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Product Discipline 10: Oceanographic products, Parameter Category 0: Waves
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/4/4.2.2.0.table b/definitions/grib2/tables/4/4.2.2.0.table
index 67ad39b6c..8e7e74d66 100644
--- a/definitions/grib2/tables/4/4.2.2.0.table
+++ b/definitions/grib2/tables/4/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Product Discipline 2: Land surface products, Parameter Category 0: Vegetation/Biomass
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
diff --git a/definitions/grib2/tables/4/4.2.2.3.table b/definitions/grib2/tables/4/4.2.2.3.table
index d6376fecb..988d3edae 100644
--- a/definitions/grib2/tables/4/4.2.2.3.table
+++ b/definitions/grib2/tables/4/4.2.2.3.table
@@ -4,12 +4,12 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
 # 11-191 Reserved
 #192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/5/3.7.table b/definitions/grib2/tables/5/3.7.table
index 3aaf30bf9..af874fb8f 100644
--- a/definitions/grib2/tables/5/3.7.table
+++ b/definitions/grib2/tables/5/3.7.table
@@ -3,9 +3,3 @@
 1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
 # 2-254 Reserved
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/5/4.2.0.0.table b/definitions/grib2/tables/5/4.2.0.0.table
index bf1638d8a..a224897a7 100644
--- a/definitions/grib2/tables/5/4.2.0.0.table
+++ b/definitions/grib2/tables/5/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression (or deficit) (K)
+7 7 Dew point depression [or deficit] (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
diff --git a/definitions/grib2/tables/5/4.2.0.1.table b/definitions/grib2/tables/5/4.2.0.1.table
index 022ad5bc3..ba0b9a131 100644
--- a/definitions/grib2/tables/5/4.2.0.1.table
+++ b/definitions/grib2/tables/5/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation (non-convective) (kg m-2)
+9 9 Large scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (day)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type (code table (4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg kg-1)
 22 22 Cloud mixing ratio (kg kg-1)
@@ -29,9 +29,9 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category (code table (4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg kg-1)
+32 32 Graupel [snow pellets] (kg kg-1)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/5/4.2.0.15.table b/definitions/grib2/tables/5/4.2.0.15.table
index 796fc2a83..b242517b3 100644
--- a/definitions/grib2/tables/5/4.2.0.15.table
+++ b/definitions/grib2/tables/5/4.2.0.15.table
@@ -5,7 +5,7 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.19.table b/definitions/grib2/tables/5/4.2.0.19.table
index 2ed0264d6..532651b54 100644
--- a/definitions/grib2/tables/5/4.2.0.19.table
+++ b/definitions/grib2/tables/5/4.2.0.19.table
@@ -21,6 +21,6 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
-23 23 Supercooled large droplet probability (see Note 4) (%)
+22 22 Clear air turbulence [CAT] (%)
+23 23 Supercooled large droplet probability [see Note 4] (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.191.table b/definitions/grib2/tables/5/4.2.0.191.table
index 27ad3815d..cb194bb78 100644
--- a/definitions/grib2/tables/5/4.2.0.191.table
+++ b/definitions/grib2/tables/5/4.2.0.191.table
@@ -1,3 +1,3 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.2.table b/definitions/grib2/tables/5/4.2.0.2.table
index 3d57cf508..36ee8b04a 100644
--- a/definitions/grib2/tables/5/4.2.0.2.table
+++ b/definitions/grib2/tables/5/4.2.0.2.table
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity (pressure) (Pa s-1)
-9 9 Vertical velocity (geometric) (m s-1)
+8 8 Vertical velocity [pressure] (Pa s-1)
+9 9 Vertical velocity [geometric] (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed (gust) (m s-1)
-23 23 u-component of wind (gust) (m s-1)
-24 24 v-component of wind (gust) (m s-1)
+22 22 Wind speed [gust] (m s-1)
+23 23 u-component of wind [gust] (m s-1)
+24 24 v-component of wind [gust] (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/5/4.2.0.4.table b/definitions/grib2/tables/5/4.2.0.4.table
index 365fd98a1..8813abb8a 100644
--- a/definitions/grib2/tables/5/4.2.0.4.table
+++ b/definitions/grib2/tables/5/4.2.0.4.table
@@ -1,17 +1,17 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
 10 10 Photosynthetically active radiation (W m-2)
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index  (Numeric)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.5.table b/definitions/grib2/tables/5/4.2.0.5.table
index 719325746..8961eb233 100644
--- a/definitions/grib2/tables/5/4.2.0.5.table
+++ b/definitions/grib2/tables/5/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long wave radiation flux (surface) (W m-2)
-1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long wave radiation flux [surface] (W m-2)
+1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/5/4.2.0.6.table b/definitions/grib2/tables/5/4.2.0.6.table
index 58ad17ca7..b5f098634 100644
--- a/definitions/grib2/tables/5/4.2.0.6.table
+++ b/definitions/grib2/tables/5/4.2.0.6.table
@@ -24,5 +24,5 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.7.table b/definitions/grib2/tables/5/4.2.0.7.table
index 34b082d94..933cf3d28 100644
--- a/definitions/grib2/tables/5/4.2.0.7.table
+++ b/definitions/grib2/tables/5/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,6 +10,6 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.1.0.table b/definitions/grib2/tables/5/4.2.1.0.table
index 9d1f78180..dd64515d5 100644
--- a/definitions/grib2/tables/5/4.2.1.0.table
+++ b/definitions/grib2/tables/5/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely sensed snow cover ((code table 4.215))
 3 3 Elevation of snow covered terrain ((code table 4.216))
 4 4 Snow water equivalent percent of normal (%)
diff --git a/definitions/grib2/tables/5/4.2.1.1.table b/definitions/grib2/tables/5/4.2.1.1.table
index 56bf798d4..1a600f493 100644
--- a/definitions/grib2/tables/5/4.2.1.1.table
+++ b/definitions/grib2/tables/5/4.2.1.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation). (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation]. (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.10.0.table b/definitions/grib2/tables/5/4.2.10.0.table
index a8d4a5bf8..78aad8664 100644
--- a/definitions/grib2/tables/5/4.2.10.0.table
+++ b/definitions/grib2/tables/5/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/5/4.2.2.0.table b/definitions/grib2/tables/5/4.2.2.0.table
index 77b9faac3..a6de785ba 100644
--- a/definitions/grib2/tables/5/4.2.2.0.table
+++ b/definitions/grib2/tables/5/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover (1=land, 0=sea) (Proportion)
+0 0 Land cover [1=land, 0=sea] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
diff --git a/definitions/grib2/tables/5/4.2.2.3.table b/definitions/grib2/tables/5/4.2.2.3.table
index c5dea241d..658c3691c 100644
--- a/definitions/grib2/tables/5/4.2.2.3.table
+++ b/definitions/grib2/tables/5/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/6/3.7.table b/definitions/grib2/tables/6/3.7.table
index 3aaf30bf9..4faf00003 100644
--- a/definitions/grib2/tables/6/3.7.table
+++ b/definitions/grib2/tables/6/3.7.table
@@ -1,11 +1,4 @@
 # Code Table 3.7: Spectral data representation mode
 0 0 Reserved
 1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
-# 2-254 Reserved
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/6/4.2.0.0.table b/definitions/grib2/tables/6/4.2.0.0.table
index 98fc9552d..29f504fc1 100644
--- a/definitions/grib2/tables/6/4.2.0.0.table
+++ b/definitions/grib2/tables/6/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression (or deficit) (K)
+7 7 Dew point depression [or deficit] (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) - validation (K)
+18 18 Snow temperature [top of snow] - validation (K)
 19 19 Turbulent transfer coefficient for heat - validation (Numeric)
 20 20 Turbulent diffusion coefficient for heat - validation (m2 s-1)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.1.table b/definitions/grib2/tables/6/4.2.0.1.table
index 60a934b70..52ce6c31d 100644
--- a/definitions/grib2/tables/6/4.2.0.1.table
+++ b/definitions/grib2/tables/6/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation (non-convective) (kg m-2)
+9 9 Large scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category (code table (4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg kg-1)
+32 32 Graupel [snow pellets] (kg kg-1)
 33 33 Categorical rain (Code table 4.222)
 34 34 Categorical freezing rain (Code table 4.222)
 35 35 Categorical ice pellets (Code table 4.222)
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail - validation (kg m-2)
 73 73 Hail precipitation rate - validation (kg m-2 s-1)
 74 74 Total column integrated graupel - validation (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate - validation (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate - validation (kg m-2 s-1)
 76 76 Convective rain rate - validation (kg m-2 s-1)
 77 77 Large scale rain rate - validation (kg m-2 s-1)
-78 78 Total column integrated water (all components incl. precipitation) - validation (kg m-2)
+78 78 Total column integrated water [all components incl. precipitation] - validation (kg m-2)
 79 79 Evaporation rate - validation (kg m-2 s-1)
 80 80 Total Condensate - validation (kg kg-1)
 81 81 Total Column-Integrated Condensate - validation (kg m-2)
diff --git a/definitions/grib2/tables/6/4.2.0.15.table b/definitions/grib2/tables/6/4.2.0.15.table
index 51ea2499f..e4f61f192 100644
--- a/definitions/grib2/tables/6/4.2.0.15.table
+++ b/definitions/grib2/tables/6/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets - validation (dB)
 10 10 Reflectivity of cloud ice - validation (dB)
 11 11 Reflectivity of snow - validation (dB)
diff --git a/definitions/grib2/tables/6/4.2.0.19.table b/definitions/grib2/tables/6/4.2.0.19.table
index a710602e2..fb889dde0 100644
--- a/definitions/grib2/tables/6/4.2.0.19.table
+++ b/definitions/grib2/tables/6/4.2.0.19.table
@@ -21,8 +21,8 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
-23 23 Supercooled large droplet probability (see Note 4) (%)
+22 22 Clear air turbulence [CAT] (%)
+23 23 Supercooled large droplet probability [see Note 4] (%)
 24 24 Convective turbulent kinetic energy - validation (J kg-1)
-25 25 Weather Interpretation ww (WMO) - validation (-)
+25 25 Weather Interpretation ww [WMO] - validation (-)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.191.table b/definitions/grib2/tables/6/4.2.0.191.table
index feef9300e..d83e8d840 100644
--- a/definitions/grib2/tables/6/4.2.0.191.table
+++ b/definitions/grib2/tables/6/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude - validation (deg N)
 2 2 Geographical longitude - validation (deg E)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.2.table b/definitions/grib2/tables/6/4.2.0.2.table
index 09a4d28ab..f30a63f6c 100644
--- a/definitions/grib2/tables/6/4.2.0.2.table
+++ b/definitions/grib2/tables/6/4.2.0.2.table
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity (pressure) (Pa s-1)
-9 9 Vertical velocity (geometric) (m s-1)
+8 8 Vertical velocity [pressure] (Pa s-1)
+9 9 Vertical velocity [geometric] (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed (gust) (m s-1)
-23 23 u-component of wind (gust) (m s-1)
-24 24 v-component of wind (gust) (m s-1)
+22 22 Wind speed [gust] (m s-1)
+23 23 u-component of wind [gust] (m s-1)
+24 24 v-component of wind [gust] (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/6/4.2.0.20.table b/definitions/grib2/tables/6/4.2.0.20.table
index e28466561..8a96abd2d 100644
--- a/definitions/grib2/tables/6/4.2.0.20.table
+++ b/definitions/grib2/tables/6/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density (concentration) (kg m-3)
-1 1 Column-integrated mass density (see Note 1) (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg kg-1)
+0 0 Mass density [concentration] (kg m-3)
+1 1 Column-integrated mass density [see Note 1] (kg m-2)
+2 2 Mass mixing ratio [mass fraction in air] (kg kg-1)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -10,13 +10,13 @@
 8 8 Atmosphere re-emission mass flux (kg m-2 s-1)
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol mol-1)
+52 52 Volume mixing ratio [fraction in air] (mol mol-1)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
-56 56 Changes of amount in atmosphere (see Note 1) (mol s-1)
+56 56 Changes of amount in atmosphere [see Note 1] (mol s-1)
 57 57 Total yearly average burden of the atmosphere (mol)
-58 58 Total yearly averaged atmospheric loss (see Note 1) (mol s-1)
-100 100 Surface area density (aerosol) (m-1)
+58 58 Total yearly averaged atmospheric loss [see Note 1] (mol s-1)
+100 100 Surface area density [aerosol] (m-1)
 101 101 Atmosphere optical thickness (m)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.4.table b/definitions/grib2/tables/6/4.2.0.4.table
index 365fd98a1..8813abb8a 100644
--- a/definitions/grib2/tables/6/4.2.0.4.table
+++ b/definitions/grib2/tables/6/4.2.0.4.table
@@ -1,17 +1,17 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
 10 10 Photosynthetically active radiation (W m-2)
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index  (Numeric)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.5.table b/definitions/grib2/tables/6/4.2.0.5.table
index 719325746..8961eb233 100644
--- a/definitions/grib2/tables/6/4.2.0.5.table
+++ b/definitions/grib2/tables/6/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long wave radiation flux (surface) (W m-2)
-1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long wave radiation flux [surface] (W m-2)
+1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/6/4.2.0.6.table b/definitions/grib2/tables/6/4.2.0.6.table
index 9555b7496..65b0a0c98 100644
--- a/definitions/grib2/tables/6/4.2.0.6.table
+++ b/definitions/grib2/tables/6/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base - validation (m)
 27 27 Height of convective cloud top - validation (m)
 28 28 Number concentration of cloud droplets - validation (kg-1)
diff --git a/definitions/grib2/tables/6/4.2.0.7.table b/definitions/grib2/tables/6/4.2.0.7.table
index 7370541fb..a0e5093aa 100644
--- a/definitions/grib2/tables/6/4.2.0.7.table
+++ b/definitions/grib2/tables/6/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index - validation (K)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.1.0.table b/definitions/grib2/tables/6/4.2.1.0.table
index 9d1f78180..dd64515d5 100644
--- a/definitions/grib2/tables/6/4.2.1.0.table
+++ b/definitions/grib2/tables/6/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely sensed snow cover ((code table 4.215))
 3 3 Elevation of snow covered terrain ((code table 4.216))
 4 4 Snow water equivalent percent of normal (%)
diff --git a/definitions/grib2/tables/6/4.2.1.1.table b/definitions/grib2/tables/6/4.2.1.1.table
index 56bf798d4..1a600f493 100644
--- a/definitions/grib2/tables/6/4.2.1.1.table
+++ b/definitions/grib2/tables/6/4.2.1.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation). (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation]. (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.10.0.table b/definitions/grib2/tables/6/4.2.10.0.table
index b40fa4313..df2114df3 100644
--- a/definitions/grib2/tables/6/4.2.10.0.table
+++ b/definitions/grib2/tables/6/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/6/4.2.10.191.table b/definitions/grib2/tables/6/4.2.10.191.table
index 72cf1ce97..a938fcbb6 100644
--- a/definitions/grib2/tables/6/4.2.10.191.table
+++ b/definitions/grib2/tables/6/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Product discipline 10 - Oceanographic products, parameter category 191: miscellaneous
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3 s-1)
 #2-191 Reserved
 #192-254 Reserved for local use
diff --git a/definitions/grib2/tables/6/4.2.2.0.table b/definitions/grib2/tables/6/4.2.2.0.table
index 900206620..72e953254 100644
--- a/definitions/grib2/tables/6/4.2.2.0.table
+++ b/definitions/grib2/tables/6/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover (1=land, 0=sea) (Proportion)
+0 0 Land cover [1=land, 0=sea] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,6 +30,6 @@
 28 28 Leaf area index - validation (Numeric)
 29 29 Evergreen forest - validation (Numeric)
 30 30 Deciduous forest - validation (Numeric)
-31 31 Normalized differential vegetation index (NDVI) - validation (Numeric)
+31 31 Normalized differential vegetation index [NDVI] - validation (Numeric)
 32 32 Root depth of vegetation - validation (M)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.2.3.table b/definitions/grib2/tables/6/4.2.2.3.table
index e5b989239..2b83070ca 100644
--- a/definitions/grib2/tables/6/4.2.2.3.table
+++ b/definitions/grib2/tables/6/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/7/3.7.table b/definitions/grib2/tables/7/3.7.table
index 3aaf30bf9..4faf00003 100644
--- a/definitions/grib2/tables/7/3.7.table
+++ b/definitions/grib2/tables/7/3.7.table
@@ -1,11 +1,4 @@
 # Code Table 3.7: Spectral data representation mode
 0 0 Reserved
 1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m³0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
-# 2-254 Reserved
 255 255 Missing
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
diff --git a/definitions/grib2/tables/7/4.2.0.0.table b/definitions/grib2/tables/7/4.2.0.0.table
index 6ed6b944a..836bbf336 100644
--- a/definitions/grib2/tables/7/4.2.0.0.table
+++ b/definitions/grib2/tables/7/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression (or deficit) (K)
+7 7 Dew point depression [or deficit] (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) - validation (K)
+18 18 Snow temperature [top of snow] - validation (K)
 19 19 Turbulent transfer coefficient for heat - validation (Numeric)
 20 20 Turbulent diffusion coefficient for heat - validation (m2 s-1)
 #21-191 21-191 Reserved (-)
diff --git a/definitions/grib2/tables/7/4.2.0.1.table b/definitions/grib2/tables/7/4.2.0.1.table
index 0ab8ef361..6fcd1bcf0 100644
--- a/definitions/grib2/tables/7/4.2.0.1.table
+++ b/definitions/grib2/tables/7/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation (non-convective) (kg m-2)
+9 9 Large scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category (code table (4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg kg-1)
+32 32 Graupel [snow pellets] (kg kg-1)
 33 33 Categorical rain (Code table 4.222)
 34 34 Categorical freezing rain (Code table 4.222)
 35 35 Categorical ice pellets (Code table 4.222)
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate - validation (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate - validation (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate - validation (kg m-2 s-1)
 76 76 Convective rain rate - validation (kg m-2 s-1)
 77 77 Large scale rain rate - validation (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate - validation (kg m-2 s-1)
 80 80 Total Condensate - validation (kg kg-1)
 81 81 Total Column-Integrated Condensate - validation (kg m-2)
diff --git a/definitions/grib2/tables/7/4.2.0.15.table b/definitions/grib2/tables/7/4.2.0.15.table
index a42e5b7d9..c458e895f 100644
--- a/definitions/grib2/tables/7/4.2.0.15.table
+++ b/definitions/grib2/tables/7/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets - validation (dB)
 10 10 Reflectivity of cloud ice - validation (dB)
 11 11 Reflectivity of snow - validation (dB)
diff --git a/definitions/grib2/tables/7/4.2.0.18.table b/definitions/grib2/tables/7/4.2.0.18.table
index e6b3ab049..725ac8a31 100644
--- a/definitions/grib2/tables/7/4.2.0.18.table
+++ b/definitions/grib2/tables/7/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 #14-191 9-191 Reserved
 #192-254 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/7/4.2.0.19.table b/definitions/grib2/tables/7/4.2.0.19.table
index 10df7506a..8e677e616 100644
--- a/definitions/grib2/tables/7/4.2.0.19.table
+++ b/definitions/grib2/tables/7/4.2.0.19.table
@@ -21,8 +21,8 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
-23 23 Supercooled large droplet probability (see Note 4) (%)
+22 22 Clear air turbulence [CAT] (%)
+23 23 Supercooled large droplet probability [see Note 4] (%)
 24 24 Convective turbulent kinetic energy - validation (J kg-1)
 25 25 Weather Interpretation ww (WMO) - validation
 26 26 Convective outlook (code table (4.224))
diff --git a/definitions/grib2/tables/7/4.2.0.191.table b/definitions/grib2/tables/7/4.2.0.191.table
index 6c40c61ce..0cfd33f22 100644
--- a/definitions/grib2/tables/7/4.2.0.191.table
+++ b/definitions/grib2/tables/7/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude - validation (deg N)
 2 2 Geographical longitude - validation (deg E)
 #3-191 3-191 Reserved (-)
diff --git a/definitions/grib2/tables/7/4.2.0.2.table b/definitions/grib2/tables/7/4.2.0.2.table
index ecd7d825d..c2794c6cf 100644
--- a/definitions/grib2/tables/7/4.2.0.2.table
+++ b/definitions/grib2/tables/7/4.2.0.2.table
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity (pressure) (Pa s-1)
-9 9 Vertical velocity (geometric) (m s-1)
+8 8 Vertical velocity [pressure] (Pa s-1)
+9 9 Vertical velocity [geometric] (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed (gust) (m s-1)
-23 23 u-component of wind (gust) (m s-1)
-24 24 v-component of wind (gust) (m s-1)
+22 22 Wind speed [gust] (m s-1)
+23 23 u-component of wind [gust] (m s-1)
+24 24 v-component of wind [gust] (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/7/4.2.0.20.table b/definitions/grib2/tables/7/4.2.0.20.table
index ca4189468..8ed9faf64 100644
--- a/definitions/grib2/tables/7/4.2.0.20.table
+++ b/definitions/grib2/tables/7/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density (concentration) (kg m-3)
-1 1 Column-integrated mass density (see Note 1) (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg kg-1)
+0 0 Mass density [concentration] (kg m-3)
+1 1 Column-integrated mass density [see Note 1] (kg m-2)
+2 2 Mass mixing ratio [mass fraction in air] (kg kg-1)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -11,15 +11,15 @@
 #9-49 9-49 Reserved (-)
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol mol-1)
+52 52 Volume mixing ratio [fraction in air] (mol mol-1)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
-56 56 Changes of amount in atmosphere (see Note 1) (mol s-1)
+56 56 Changes of amount in atmosphere [see Note 1] (mol s-1)
 57 57 Total yearly average burden of the atmosphere (mol)
-58 58 Total yearly averaged atmospheric loss (see Note 1) (mol s-1)
+58 58 Total yearly averaged atmospheric loss [see Note 1] (mol s-1)
 #59-99 59-99 Reserved (-)
-100 100 Surface area density (aerosol) (m-1)
+100 100 Surface area density [aerosol] (m-1)
 101 101 Atmosphere optical thickness (m)
 #102-191 102-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
diff --git a/definitions/grib2/tables/7/4.2.0.4.table b/definitions/grib2/tables/7/4.2.0.4.table
index d22ce42d3..e3033b3b7 100644
--- a/definitions/grib2/tables/7/4.2.0.4.table
+++ b/definitions/grib2/tables/7/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 #13-49 13-49 Reserved (-)
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index  (Numeric)
 #52-191 52-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
diff --git a/definitions/grib2/tables/7/4.2.0.5.table b/definitions/grib2/tables/7/4.2.0.5.table
index 6128eb9c0..27ea8ec29 100644
--- a/definitions/grib2/tables/7/4.2.0.5.table
+++ b/definitions/grib2/tables/7/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long wave radiation flux (surface) (W m-2)
-1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long wave radiation flux [surface] (W m-2)
+1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/7/4.2.0.6.table b/definitions/grib2/tables/7/4.2.0.6.table
index f46fbc253..d5102e727 100644
--- a/definitions/grib2/tables/7/4.2.0.6.table
+++ b/definitions/grib2/tables/7/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base - validation (m)
 #26-31 26-31 Reserved (-)
 27 27 Height of convective cloud top - validation (m)
diff --git a/definitions/grib2/tables/7/4.2.0.7.table b/definitions/grib2/tables/7/4.2.0.7.table
index bced218f0..ad3c0e45a 100644
--- a/definitions/grib2/tables/7/4.2.0.7.table
+++ b/definitions/grib2/tables/7/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index - validation (K)
 14 14 Reserved
diff --git a/definitions/grib2/tables/7/4.2.1.0.table b/definitions/grib2/tables/7/4.2.1.0.table
index f8efa7a12..a5ab6c2e2 100644
--- a/definitions/grib2/tables/7/4.2.1.0.table
+++ b/definitions/grib2/tables/7/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely sensed snow cover ((code table 4.215))
 3 3 Elevation of snow covered terrain ((code table 4.216))
 4 4 Snow water equivalent percent of normal (%)
diff --git a/definitions/grib2/tables/7/4.2.1.1.table b/definitions/grib2/tables/7/4.2.1.1.table
index 979e94557..67035a3ce 100644
--- a/definitions/grib2/tables/7/4.2.1.1.table
+++ b/definitions/grib2/tables/7/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation). (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation]. (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 #3-191 3-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/7/4.2.10.0.table b/definitions/grib2/tables/7/4.2.10.0.table
index 7671a7a5c..d5b9b1592 100644
--- a/definitions/grib2/tables/7/4.2.10.0.table
+++ b/definitions/grib2/tables/7/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/7/4.2.10.191.table b/definitions/grib2/tables/7/4.2.10.191.table
index 72cf1ce97..a938fcbb6 100644
--- a/definitions/grib2/tables/7/4.2.10.191.table
+++ b/definitions/grib2/tables/7/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Product discipline 10 - Oceanographic products, parameter category 191: miscellaneous
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3 s-1)
 #2-191 Reserved
 #192-254 Reserved for local use
diff --git a/definitions/grib2/tables/7/4.2.2.0.table b/definitions/grib2/tables/7/4.2.2.0.table
index 5970dfff1..c852db956 100644
--- a/definitions/grib2/tables/7/4.2.2.0.table
+++ b/definitions/grib2/tables/7/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover (1=land, 0=sea) (Proportion)
+0 0 Land cover [1=land, 0=sea] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index - validation (Numeric)
 29 29 Evergreen forest - validation (Numeric)
 30 30 Deciduous forest - validation (Numeric)
-31 31 Normalized differential vegetation index (NDVI) - validation (Numeric)
+31 31 Normalized differential vegetation index [NDVI] - validation (Numeric)
 32 32 Root depth of vegetation - validation (M)
 #33-191 33-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
diff --git a/definitions/grib2/tables/7/4.2.2.3.table b/definitions/grib2/tables/7/4.2.2.3.table
index 52574791a..02b373d71 100644
--- a/definitions/grib2/tables/7/4.2.2.3.table
+++ b/definitions/grib2/tables/7/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/7/4.2.3.1.table b/definitions/grib2/tables/7/4.2.3.1.table
index d0a16c127..01e474d8b 100644
--- a/definitions/grib2/tables/7/4.2.3.1.table
+++ b/definitions/grib2/tables/7/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (s-1)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved (-)
 19 19 Wind speed (m s-1)
 20 20 Aerosol optical thickness at 0.635 um (-)
diff --git a/definitions/grib2/tables/8/3.7.table b/definitions/grib2/tables/8/3.7.table
index f5e6dc301..41bba8329 100644
--- a/definitions/grib2/tables/8/3.7.table
+++ b/definitions/grib2/tables/8/3.7.table
@@ -1,11 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Reserved 
+0 0 Reserved
 1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m>=0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
 # 2-254 Reserved 
-255 255 Missing 
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
+255 255 Missing
diff --git a/definitions/grib2/tables/8/4.2.0.0.table b/definitions/grib2/tables/8/4.2.0.0.table
index debc0a6f4..13adadb70 100644
--- a/definitions/grib2/tables/8/4.2.0.0.table
+++ b/definitions/grib2/tables/8/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew-point temperature (K)
-7 7 Dew-point depression (or deficit) (K)
+7 7 Dew-point depression [or deficit] (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature (top of snow) (K)
+18 18 Snow temperature [top of snow] (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/8/4.2.0.1.table b/definitions/grib2/tables/8/4.2.0.1.table
index 319d5c17c..e4837ea9b 100644
--- a/definitions/grib2/tables/8/4.2.0.1.table
+++ b/definitions/grib2/tables/8/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation (non-convective) (kg m-2)
+9 9 Large-scale precipitation [non-convective] (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel (snow pellets) (kg/kg)
+32 32 Graupel [snow pellets] (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation (non-convective) (kg m-2)
+47 47 Large scale water precipitation [non-convective] (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
+51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
+75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water (all components including precipitation) (kg m-2)
+78 78 Total column integrated water [all components including precipitation] (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total Condensate (kg/kg)
 81 81 Total Column-Integrated Condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/8/4.2.0.15.table b/definitions/grib2/tables/8/4.2.0.15.table
index a7fa034b0..979a8173e 100644
--- a/definitions/grib2/tables/8/4.2.0.15.table
+++ b/definitions/grib2/tables/8/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg/m)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra (1) (-)
-7 7 Radar spectra (2) (-)
-8 8 Radar spectra (3) (-)
+6 6 Radar spectra [1] (-)
+7 7 Radar spectra [2] (-)
+8 8 Radar spectra [3] (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/8/4.2.0.18.table b/definitions/grib2/tables/8/4.2.0.18.table
index 30060fd2d..aa2e3d1fb 100644
--- a/definitions/grib2/tables/8/4.2.0.18.table
+++ b/definitions/grib2/tables/8/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition (wet + dry) (Bq m-2)
+13 13 Total deposition [wet + dry] (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/8/4.2.0.19.table b/definitions/grib2/tables/8/4.2.0.19.table
index a2adb1d1e..0865d5a30 100644
--- a/definitions/grib2/tables/8/4.2.0.19.table
+++ b/definitions/grib2/tables/8/4.2.0.19.table
@@ -21,10 +21,10 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence (CAT) (%)
+22 22 Clear air turbulence [CAT] (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather Interpretation ww (WMO) (-)
+25 25 Weather Interpretation ww [WMO] (-)
 26 26 Convective outlook (Code table 4.224)
 # 27-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.0.191.table b/definitions/grib2/tables/8/4.2.0.191.table
index 81230c0e0..4833f8f88 100644
--- a/definitions/grib2/tables/8/4.2.0.191.table
+++ b/definitions/grib2/tables/8/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/8/4.2.0.2.table b/definitions/grib2/tables/8/4.2.0.2.table
index dbd39702e..19cda83c7 100644
--- a/definitions/grib2/tables/8/4.2.0.2.table
+++ b/definitions/grib2/tables/8/4.2.0.2.table
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity (pressure) (Pa/s)
-9 9 Vertical velocity (geometric) (m/s)
+8 8 Vertical velocity [pressure] (Pa/s)
+9 9 Vertical velocity [geometric] (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed (gust) (m/s)
-23 23 u-component of wind (gust) (m/s)
-24 24 v-component of wind (gust) (m/s)
+22 22 Wind speed [gust] (m/s)
+23 23 u-component of wind [gust] (m/s)
+24 24 v-component of wind [gust] (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/8/4.2.0.20.table b/definitions/grib2/tables/8/4.2.0.20.table
index d0ef4b3a0..59d61255c 100644
--- a/definitions/grib2/tables/8/4.2.0.20.table
+++ b/definitions/grib2/tables/8/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density (concentration) (kg m-3)
+0 0 Mass density [concentration] (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
+2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 (Sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
+14 14 Transfer from SO2 [Sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio (fraction in air) (mol/mol)
+52 52 Volume mixing ratio [fraction in air] (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density (aerosol) (/m)
+100 100 Surface area density [aerosol] (/m)
 101 101 Atmosphere optical thickness (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/8/4.2.0.4.table b/definitions/grib2/tables/8/4.2.0.4.table
index fea4cafc3..0b83187b4 100644
--- a/definitions/grib2/tables/8/4.2.0.4.table
+++ b/definitions/grib2/tables/8/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux (surface) (W m-2)
-1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net short-wave radiation flux [surface] (W m-2)
+1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance (with respect to wave number) (W m-1 sr-1)
-6 6 Radiance (with respect to wave length) (W m-3 sr-1)
+5 5 Radiance [with respect to wave number] (W m-1 sr-1)
+6 6 Radiance [with respect to wave length] (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index (under clear sky) (Numeric)
+50 50 UV index [under clear sky] (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.0.5.table b/definitions/grib2/tables/8/4.2.0.5.table
index aae853bf9..6a861331c 100644
--- a/definitions/grib2/tables/8/4.2.0.5.table
+++ b/definitions/grib2/tables/8/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long-wave radiation flux (surface) (W m-2)
-1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
+0 0 Net long-wave radiation flux [surface] (W m-2)
+1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/8/4.2.0.6.table b/definitions/grib2/tables/8/4.2.0.6.table
index 72394191f..8a6cf61c2 100644
--- a/definitions/grib2/tables/8/4.2.0.6.table
+++ b/definitions/grib2/tables/8/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus (CB) (%)
+25 25 Horizontal extent of cumulonimbus [CB] (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number concentration of cloud droplets (/kg)
diff --git a/definitions/grib2/tables/8/4.2.0.7.table b/definitions/grib2/tables/8/4.2.0.7.table
index 7a7d2008b..244272e58 100644
--- a/definitions/grib2/tables/8/4.2.0.7.table
+++ b/definitions/grib2/tables/8/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index (to 500 hPa) (K)
-1 1 Best lifted index (to 500 hPa) (K)
+0 0 Parcel lifted index [to 500 hPa] (K)
+1 1 Best lifted index [to 500 hPa] (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best (4-layer) lifted index (K)
+11 11 Best [4-layer] lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/8/4.2.1.0.table b/definitions/grib2/tables/8/4.2.1.0.table
index 4e72e1ab3..00b032310 100644
--- a/definitions/grib2/tables/8/4.2.1.0.table
+++ b/definitions/grib2/tables/8/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
-1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
+0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
+1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/8/4.2.1.1.table b/definitions/grib2/tables/8/4.2.1.1.table
index cb5117dc8..3b95971a9 100644
--- a/definitions/grib2/tables/8/4.2.1.1.table
+++ b/definitions/grib2/tables/8/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
-2 2 Probability of 0.01 inch of precipitation (POP) (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
+2 2 Probability of 0.01 inch of precipitation [POP] (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/8/4.2.1.2.table b/definitions/grib2/tables/8/4.2.1.2.table
index 499991d58..b9a179026 100644
--- a/definitions/grib2/tables/8/4.2.1.2.table
+++ b/definitions/grib2/tables/8/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover (0 = water, 1 = land) (Proportion)
+8 8 Land cover [0 = water, 1 = land] (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/8/4.2.10.0.table b/definitions/grib2/tables/8/4.2.10.0.table
index eb9d1fa65..13b389989 100644
--- a/definitions/grib2/tables/8/4.2.10.0.table
+++ b/definitions/grib2/tables/8/4.2.10.0.table
@@ -1,19 +1,19 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra (1) (-)
-1 1 Wave spectra (2) (-)
-2 2 Wave spectra (3) (-)
+0 0 Wave spectra [1] (-)
+1 1 Wave spectra [2] (-)
+2 2 Wave spectra [3] (-)
 3 3 Significant height of combined wind waves and swell (m)
-4 4 Direction of wind waves (degree true) (deg)
+4 4 Direction of wind waves [degree true] (deg)
 5 5 Significant height of wind waves (m)
 6 6 Mean period of wind waves (s)
-7 7 Direction of swell waves (degree true) (deg)
+7 7 Direction of swell waves [degree true] (deg)
 8 8 Significant height of swell waves (m)
 9 9 Mean period of swell waves (s)
-10 10 Primary wave direction (degree true) (deg)
+10 10 Primary wave direction [degree true] (deg)
 11 11 Primary wave mean period (s)
-12 12 Secondary wave direction (degree true) (deg)
+12 12 Secondary wave direction [degree true] (deg)
 13 13 Secondary wave mean period (s)
-14 14 Direction of combined wind waves and swell (degree true) (deg)
+14 14 Direction of combined wind waves and swell [degree true] (deg)
 15 15 Mean period of combined wind waves and swell (s)
 16 16 Coefficient of drag with waves (-)
 17 17 Friction velocity (m s-1)
diff --git a/definitions/grib2/tables/8/4.2.10.1.table b/definitions/grib2/tables/8/4.2.10.1.table
index 5a33bac5d..f9486e6a4 100644
--- a/definitions/grib2/tables/8/4.2.10.1.table
+++ b/definitions/grib2/tables/8/4.2.10.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Current direction (degree true) (deg)
+0 0 Current direction [degree true] (deg)
 1 1 Current speed (m/s)
 2 2 u-component of current (m/s)
 3 3 v-component of current (m/s)
diff --git a/definitions/grib2/tables/8/4.2.10.191.table b/definitions/grib2/tables/8/4.2.10.191.table
index 14085ac9a..f0936614f 100644
--- a/definitions/grib2/tables/8/4.2.10.191.table
+++ b/definitions/grib2/tables/8/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time (defined in Section 1) (s)
+0 0 Seconds prior to initial reference time [defined in Section 1] (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.10.2.table b/definitions/grib2/tables/8/4.2.10.2.table
index a69b2622c..cb84cbbb2 100644
--- a/definitions/grib2/tables/8/4.2.10.2.table
+++ b/definitions/grib2/tables/8/4.2.10.2.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Ice cover (Proportion)
 1 1 Ice thickness (m)
-2 2 Direction of ice drift (degree true) (deg)
+2 2 Direction of ice drift [degree true] (deg)
 3 3 Speed of ice drift (m/s)
 4 4 u-component of ice drift (m/s)
 5 5 v-component of ice drift (m/s)
diff --git a/definitions/grib2/tables/8/4.2.2.0.table b/definitions/grib2/tables/8/4.2.2.0.table
index 359a12e62..855867737 100644
--- a/definitions/grib2/tables/8/4.2.2.0.table
+++ b/definitions/grib2/tables/8/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover (0 = sea, 1 = land) (Proportion)
+0 0 Land cover [0 = sea, 1 = land] (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest (Numeric)
 30 30 Deciduous forest (Numeric)
-31 31 Normalized differential vegetation index (NDVI) (Numeric)
+31 31 Normalized differential vegetation index [NDVI] (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.2.3.table b/definitions/grib2/tables/8/4.2.2.3.table
index 6c135b8cd..ab50b98b0 100644
--- a/definitions/grib2/tables/8/4.2.2.3.table
+++ b/definitions/grib2/tables/8/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
+5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset (soil moisture) (Proportion)
-8 8 Direct evaporation cease (soil moisture) (Proportion)
+7 7 Transpiration stress-onset [soil moisture] (Proportion)
+8 8 Direct evaporation cease [soil moisture] (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
-11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
-12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
-14 14 Direct evaporation cease (soil moisture) (kg m-3)
+10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
+11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
+12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
+14 14 Direct evaporation cease [soil moisture] (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/8/4.2.3.1.table b/definitions/grib2/tables/8/4.2.3.1.table
index 16eee69c4..5a49942d6 100644
--- a/definitions/grib2/tables/8/4.2.3.1.table
+++ b/definitions/grib2/tables/8/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
-17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
+16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
+17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/9/3.7.table b/definitions/grib2/tables/9/3.7.table
index f5e6dc301..65693989a 100644
--- a/definitions/grib2/tables/9/3.7.table
+++ b/definitions/grib2/tables/9/3.7.table
@@ -2,10 +2,4 @@
 0 0 Reserved 
 1 1 The complex numbers Fnm (see code figure 1 in Code Table 3.6 above) are stored for m>=0 as pairs of real numbers Re(Fnm), Im(Fnm) ordered with n increasing from m to N(m), first for m=0 and then for m=1, 2, ... M. (see Note 1)
 # 2-254 Reserved 
-255 255 Missing 
-# Note:
-#
-#(1) Values of N(m) for common truncations cases:
-# Triangular M = J = K, N(m) = J
-# Rhomboidal K = J + M, N(m) = J+m
-# Trapezoidal K = J, K > M, N(m) = J
+255 255 Missing

From 07c405593da6a67b9c2d87f388265b94ad320e45 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 25 Nov 2019 13:25:59 +0000
Subject: [PATCH 24/38] ECC-1022: parameterUnits are displayed incorrectly if
 it includes parentheses

---
 definitions/grib2/tables/0/4.2.0.2.table     |  8 +++----
 definitions/grib2/tables/1/4.2.0.2.table     |  8 +++----
 definitions/grib2/tables/10/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/10/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/10/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/10/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/10/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/10/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/10/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/10/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/10/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/10/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/10/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/10/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/10/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/10/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/10/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/10/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/10/4.2.10.191.table |  2 +-
 definitions/grib2/tables/10/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/10/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/10/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/11/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/11/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/11/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/11/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/11/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/11/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/11/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/11/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/11/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/11/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/11/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/11/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/11/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/11/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/11/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/11/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/11/4.2.10.191.table |  2 +-
 definitions/grib2/tables/11/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/11/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/11/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/12/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/12/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/12/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/12/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/12/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/12/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/12/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/12/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/12/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/12/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/12/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/12/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/12/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/12/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/12/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/12/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/12/4.2.10.191.table |  2 +-
 definitions/grib2/tables/12/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/12/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/12/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/13/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/13/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/13/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/13/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/13/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/13/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/13/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/13/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/13/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/13/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/13/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/13/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/13/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/13/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/13/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/13/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/13/4.2.10.191.table |  2 +-
 definitions/grib2/tables/13/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/13/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/13/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/14/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/14/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/14/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/14/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/14/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/14/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/14/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/14/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/14/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/14/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/14/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/14/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/14/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/14/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/14/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/14/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/14/4.2.10.191.table |  2 +-
 definitions/grib2/tables/14/4.2.2.0.table    |  4 ++--
 definitions/grib2/tables/14/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/14/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/15/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/15/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/15/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/15/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/15/4.2.0.19.table   |  2 +-
 definitions/grib2/tables/15/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/15/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/15/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/15/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/15/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/15/4.2.0.6.table    |  2 +-
 definitions/grib2/tables/15/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/15/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/15/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/15/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/15/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/15/4.2.10.191.table |  2 +-
 definitions/grib2/tables/15/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/15/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/15/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/16/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/16/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/16/4.2.0.19.table   |  4 ++--
 definitions/grib2/tables/16/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/16/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/16/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/16/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/16/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/16/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/16/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/16/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/16/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/16/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/16/4.2.10.191.table |  2 +-
 definitions/grib2/tables/16/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/16/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/16/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/16/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/17/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/17/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/17/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/17/4.2.0.19.table   |  6 ++---
 definitions/grib2/tables/17/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/17/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/17/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/17/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/17/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/17/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/17/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/17/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/17/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/17/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/17/4.2.10.191.table |  2 +-
 definitions/grib2/tables/17/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/17/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/17/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/17/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/18/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/18/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/18/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/18/4.2.0.19.table   |  6 ++---
 definitions/grib2/tables/18/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/18/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/18/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/18/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/18/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/18/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/18/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/18/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/18/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/18/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/18/4.2.10.191.table |  2 +-
 definitions/grib2/tables/18/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/18/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/18/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/18/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/19/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/19/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/19/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/19/4.2.0.19.table   |  6 ++---
 definitions/grib2/tables/19/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/19/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/19/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/19/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/19/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/19/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/19/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/19/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/19/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/19/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/19/4.2.10.191.table |  2 +-
 definitions/grib2/tables/19/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/19/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/19/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/19/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/2/4.2.0.2.table     |  8 +++----
 definitions/grib2/tables/20/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/20/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/20/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/20/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/20/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/20/4.2.0.19.table   |  6 ++---
 definitions/grib2/tables/20/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/20/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/20/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/20/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/20/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/20/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/20/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/20/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/20/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/20/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/20/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/20/4.2.10.191.table |  2 +-
 definitions/grib2/tables/20/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/20/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/20/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/20/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/21/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/21/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/21/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/21/4.2.0.19.table   |  6 ++---
 definitions/grib2/tables/21/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/21/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/21/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/21/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/21/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/21/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/21/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/21/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/21/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/21/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/21/4.2.10.191.table |  2 +-
 definitions/grib2/tables/21/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/21/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/21/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/21/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/22/4.5.table        | 16 ++++++-------
 definitions/grib2/tables/23/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/23/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/23/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/23/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/23/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/23/4.2.0.19.table   |  6 ++---
 definitions/grib2/tables/23/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/23/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/23/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/23/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/23/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/23/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/23/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/23/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/23/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/23/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/23/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/23/4.2.10.191.table |  2 +-
 definitions/grib2/tables/23/4.2.10.4.table   | 10 ++++----
 definitions/grib2/tables/23/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/23/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/23/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/23/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.0.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.1.table    | 16 ++++++-------
 definitions/grib2/tables/24/4.2.0.15.table   |  8 +++----
 definitions/grib2/tables/24/4.2.0.17.table   |  2 +-
 definitions/grib2/tables/24/4.2.0.18.table   |  2 +-
 definitions/grib2/tables/24/4.2.0.19.table   |  6 ++---
 definitions/grib2/tables/24/4.2.0.191.table  |  2 +-
 definitions/grib2/tables/24/4.2.0.2.table    | 12 +++++-----
 definitions/grib2/tables/24/4.2.0.20.table   | 10 ++++----
 definitions/grib2/tables/24/4.2.0.4.table    | 10 ++++----
 definitions/grib2/tables/24/4.2.0.5.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.6.table    |  4 ++--
 definitions/grib2/tables/24/4.2.0.7.table    |  6 ++---
 definitions/grib2/tables/24/4.2.1.0.table    |  4 ++--
 definitions/grib2/tables/24/4.2.1.1.table    |  6 ++---
 definitions/grib2/tables/24/4.2.1.2.table    |  2 +-
 definitions/grib2/tables/24/4.2.10.0.table   |  6 ++---
 definitions/grib2/tables/24/4.2.10.191.table |  2 +-
 definitions/grib2/tables/24/4.2.10.4.table   | 10 ++++----
 definitions/grib2/tables/24/4.2.2.0.table    |  6 ++---
 definitions/grib2/tables/24/4.2.2.3.table    | 16 ++++++-------
 definitions/grib2/tables/24/4.2.2.4.table    | 14 +++++------
 definitions/grib2/tables/24/4.2.3.1.table    |  4 ++--
 definitions/grib2/tables/3/4.2.0.2.table     |  8 +++----
 definitions/grib2/tables/4/4.2.0.0.table     |  2 +-
 definitions/grib2/tables/4/4.2.0.1.table     |  4 ++--
 definitions/grib2/tables/4/4.2.0.15.table    |  6 ++---
 definitions/grib2/tables/4/4.2.0.191.table   |  2 +-
 definitions/grib2/tables/4/4.2.0.2.table     | 12 +++++-----
 definitions/grib2/tables/4/4.2.0.20.table    |  8 +++----
 definitions/grib2/tables/4/4.2.0.4.table     |  8 +++----
 definitions/grib2/tables/4/4.2.0.5.table     |  4 ++--
 definitions/grib2/tables/4/4.2.0.7.table     |  6 ++---
 definitions/grib2/tables/4/4.2.1.0.table     |  4 ++--
 definitions/grib2/tables/4/4.2.1.1.table     |  6 ++---
 definitions/grib2/tables/4/4.2.10.0.table    |  6 ++---
 definitions/grib2/tables/4/4.2.2.0.table     |  2 +-
 definitions/grib2/tables/4/4.2.2.3.table     |  8 +++----
 definitions/grib2/tables/5/4.2.0.0.table     |  2 +-
 definitions/grib2/tables/5/4.2.0.1.table     |  8 +++----
 definitions/grib2/tables/5/4.2.0.15.table    |  6 ++---
 definitions/grib2/tables/5/4.2.0.19.table    |  4 ++--
 definitions/grib2/tables/5/4.2.0.191.table   |  2 +-
 definitions/grib2/tables/5/4.2.0.2.table     | 12 +++++-----
 definitions/grib2/tables/5/4.2.0.4.table     | 10 ++++----
 definitions/grib2/tables/5/4.2.0.5.table     |  4 ++--
 definitions/grib2/tables/5/4.2.0.6.table     |  2 +-
 definitions/grib2/tables/5/4.2.0.7.table     |  6 ++---
 definitions/grib2/tables/5/4.2.1.0.table     |  4 ++--
 definitions/grib2/tables/5/4.2.1.1.table     |  6 ++---
 definitions/grib2/tables/5/4.2.10.0.table    |  6 ++---
 definitions/grib2/tables/5/4.2.2.0.table     |  2 +-
 definitions/grib2/tables/5/4.2.2.3.table     | 16 ++++++-------
 definitions/grib2/tables/6/4.2.0.0.table     |  4 ++--
 definitions/grib2/tables/6/4.2.0.1.table     | 12 +++++-----
 definitions/grib2/tables/6/4.2.0.15.table    |  6 ++---
 definitions/grib2/tables/6/4.2.0.19.table    |  6 ++---
 definitions/grib2/tables/6/4.2.0.191.table   |  2 +-
 definitions/grib2/tables/6/4.2.0.2.table     | 12 +++++-----
 definitions/grib2/tables/6/4.2.0.20.table    | 14 +++++------
 definitions/grib2/tables/6/4.2.0.4.table     | 10 ++++----
 definitions/grib2/tables/6/4.2.0.5.table     |  4 ++--
 definitions/grib2/tables/6/4.2.0.6.table     |  2 +-
 definitions/grib2/tables/6/4.2.0.7.table     |  6 ++---
 definitions/grib2/tables/6/4.2.1.0.table     |  4 ++--
 definitions/grib2/tables/6/4.2.1.1.table     |  6 ++---
 definitions/grib2/tables/6/4.2.10.0.table    |  6 ++---
 definitions/grib2/tables/6/4.2.10.191.table  |  2 +-
 definitions/grib2/tables/6/4.2.2.0.table     |  4 ++--
 definitions/grib2/tables/6/4.2.2.3.table     | 16 ++++++-------
 definitions/grib2/tables/7/4.2.0.0.table     |  4 ++--
 definitions/grib2/tables/7/4.2.0.1.table     | 12 +++++-----
 definitions/grib2/tables/7/4.2.0.15.table    |  6 ++---
 definitions/grib2/tables/7/4.2.0.18.table    |  2 +-
 definitions/grib2/tables/7/4.2.0.19.table    |  4 ++--
 definitions/grib2/tables/7/4.2.0.191.table   |  2 +-
 definitions/grib2/tables/7/4.2.0.2.table     | 12 +++++-----
 definitions/grib2/tables/7/4.2.0.20.table    | 14 +++++------
 definitions/grib2/tables/7/4.2.0.4.table     | 10 ++++----
 definitions/grib2/tables/7/4.2.0.5.table     |  4 ++--
 definitions/grib2/tables/7/4.2.0.6.table     |  2 +-
 definitions/grib2/tables/7/4.2.0.7.table     |  6 ++---
 definitions/grib2/tables/7/4.2.1.0.table     |  4 ++--
 definitions/grib2/tables/7/4.2.1.1.table     |  6 ++---
 definitions/grib2/tables/7/4.2.10.0.table    |  6 ++---
 definitions/grib2/tables/7/4.2.10.191.table  |  2 +-
 definitions/grib2/tables/7/4.2.2.0.table     |  4 ++--
 definitions/grib2/tables/7/4.2.2.3.table     | 16 ++++++-------
 definitions/grib2/tables/7/4.2.3.1.table     |  4 ++--
 definitions/grib2/tables/8/4.2.0.0.table     |  4 ++--
 definitions/grib2/tables/8/4.2.0.1.table     | 16 ++++++-------
 definitions/grib2/tables/8/4.2.0.15.table    |  6 ++---
 definitions/grib2/tables/8/4.2.0.18.table    |  2 +-
 definitions/grib2/tables/8/4.2.0.19.table    |  4 ++--
 definitions/grib2/tables/8/4.2.0.191.table   |  2 +-
 definitions/grib2/tables/8/4.2.0.2.table     | 12 +++++-----
 definitions/grib2/tables/8/4.2.0.20.table    | 10 ++++----
 definitions/grib2/tables/8/4.2.0.4.table     | 10 ++++----
 definitions/grib2/tables/8/4.2.0.5.table     |  4 ++--
 definitions/grib2/tables/8/4.2.0.6.table     |  2 +-
 definitions/grib2/tables/8/4.2.0.7.table     |  6 ++---
 definitions/grib2/tables/8/4.2.1.0.table     |  4 ++--
 definitions/grib2/tables/8/4.2.1.1.table     |  6 ++---
 definitions/grib2/tables/8/4.2.1.2.table     |  2 +-
 definitions/grib2/tables/8/4.2.10.0.table    | 16 ++++++-------
 definitions/grib2/tables/8/4.2.10.1.table    |  2 +-
 definitions/grib2/tables/8/4.2.10.191.table  |  2 +-
 definitions/grib2/tables/8/4.2.10.2.table    |  2 +-
 definitions/grib2/tables/8/4.2.2.0.table     |  4 ++--
 definitions/grib2/tables/8/4.2.2.3.table     | 16 ++++++-------
 definitions/grib2/tables/8/4.2.3.1.table     |  4 ++--
 definitions/grib2/tables/9/4.2.0.0.table     |  4 ++--
 definitions/grib2/tables/9/4.2.0.1.table     | 16 ++++++-------
 definitions/grib2/tables/9/4.2.0.15.table    |  8 +++----
 definitions/grib2/tables/9/4.2.0.18.table    |  2 +-
 definitions/grib2/tables/9/4.2.0.19.table    |  2 +-
 definitions/grib2/tables/9/4.2.0.191.table   |  2 +-
 definitions/grib2/tables/9/4.2.0.2.table     | 12 +++++-----
 definitions/grib2/tables/9/4.2.0.20.table    | 10 ++++----
 definitions/grib2/tables/9/4.2.0.4.table     | 10 ++++----
 definitions/grib2/tables/9/4.2.0.5.table     |  4 ++--
 definitions/grib2/tables/9/4.2.0.6.table     |  2 +-
 definitions/grib2/tables/9/4.2.0.7.table     |  6 ++---
 definitions/grib2/tables/9/4.2.1.0.table     |  4 ++--
 definitions/grib2/tables/9/4.2.1.1.table     |  6 ++---
 definitions/grib2/tables/9/4.2.1.2.table     |  2 +-
 definitions/grib2/tables/9/4.2.10.0.table    | 16 ++++++-------
 definitions/grib2/tables/9/4.2.10.1.table    |  2 +-
 definitions/grib2/tables/9/4.2.10.191.table  |  2 +-
 definitions/grib2/tables/9/4.2.10.2.table    |  2 +-
 definitions/grib2/tables/9/4.2.2.0.table     |  4 ++--
 definitions/grib2/tables/9/4.2.2.3.table     | 16 ++++++-------
 definitions/grib2/tables/9/4.2.3.1.table     |  4 ++--
 src/grib_accessor_class_codetable.c          | 25 +++++++++++++-------
 412 files changed, 1338 insertions(+), 1329 deletions(-)

diff --git a/definitions/grib2/tables/0/4.2.0.2.table b/definitions/grib2/tables/0/4.2.0.2.table
index f45206bff..1ec945102 100644
--- a/definitions/grib2/tables/0/4.2.0.2.table
+++ b/definitions/grib2/tables/0/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Product Discipline 0: Meteorological products, Parameter Category 2: Momentum
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,7 +21,7 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
 23 23 u-component of wind (gust) (m s-1)
 24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
diff --git a/definitions/grib2/tables/1/4.2.0.2.table b/definitions/grib2/tables/1/4.2.0.2.table
index f45206bff..1ec945102 100644
--- a/definitions/grib2/tables/1/4.2.0.2.table
+++ b/definitions/grib2/tables/1/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Product Discipline 0: Meteorological products, Parameter Category 2: Momentum
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,7 +21,7 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
 23 23 u-component of wind (gust) (m s-1)
 24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
diff --git a/definitions/grib2/tables/10/4.2.0.0.table b/definitions/grib2/tables/10/4.2.0.0.table
index 13adadb70..debc0a6f4 100644
--- a/definitions/grib2/tables/10/4.2.0.0.table
+++ b/definitions/grib2/tables/10/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew-point temperature (K)
-7 7 Dew-point depression [or deficit] (K)
+7 7 Dew-point depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/10/4.2.0.1.table b/definitions/grib2/tables/10/4.2.0.1.table
index d8c498d7a..fbebb792d 100644
--- a/definitions/grib2/tables/10/4.2.0.1.table
+++ b/definitions/grib2/tables/10/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/10/4.2.0.15.table b/definitions/grib2/tables/10/4.2.0.15.table
index 004d02950..895892f86 100644
--- a/definitions/grib2/tables/10/4.2.0.15.table
+++ b/definitions/grib2/tables/10/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically-integrated liquid water [VIL] (kg m-2)
+3 3 Vertically-integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/10/4.2.0.18.table b/definitions/grib2/tables/10/4.2.0.18.table
index aa2e3d1fb..30060fd2d 100644
--- a/definitions/grib2/tables/10/4.2.0.18.table
+++ b/definitions/grib2/tables/10/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/10/4.2.0.19.table b/definitions/grib2/tables/10/4.2.0.19.table
index 922efb1ed..e6c97e5f9 100644
--- a/definitions/grib2/tables/10/4.2.0.19.table
+++ b/definitions/grib2/tables/10/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather (Code table 4.225)
diff --git a/definitions/grib2/tables/10/4.2.0.191.table b/definitions/grib2/tables/10/4.2.0.191.table
index 4833f8f88..81230c0e0 100644
--- a/definitions/grib2/tables/10/4.2.0.191.table
+++ b/definitions/grib2/tables/10/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/10/4.2.0.2.table b/definitions/grib2/tables/10/4.2.0.2.table
index 3251431dd..a3b08a8f0 100644
--- a/definitions/grib2/tables/10/4.2.0.2.table
+++ b/definitions/grib2/tables/10/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 2: momentum
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/10/4.2.0.20.table b/definitions/grib2/tables/10/4.2.0.20.table
index e636a5ee9..cc2dbcc52 100644
--- a/definitions/grib2/tables/10/4.2.0.20.table
+++ b/definitions/grib2/tables/10/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [Sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (Sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/10/4.2.0.4.table b/definitions/grib2/tables/10/4.2.0.4.table
index 0b83187b4..fea4cafc3 100644
--- a/definitions/grib2/tables/10/4.2.0.4.table
+++ b/definitions/grib2/tables/10/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/10/4.2.0.5.table b/definitions/grib2/tables/10/4.2.0.5.table
index 032d152ad..b0c93dd3a 100644
--- a/definitions/grib2/tables/10/4.2.0.5.table
+++ b/definitions/grib2/tables/10/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 5: long-wave radiation
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/10/4.2.0.6.table b/definitions/grib2/tables/10/4.2.0.6.table
index 0f60b71b6..055df76a5 100644
--- a/definitions/grib2/tables/10/4.2.0.6.table
+++ b/definitions/grib2/tables/10/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/10/4.2.0.7.table b/definitions/grib2/tables/10/4.2.0.7.table
index 244272e58..7a7d2008b 100644
--- a/definitions/grib2/tables/10/4.2.0.7.table
+++ b/definitions/grib2/tables/10/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/10/4.2.1.0.table b/definitions/grib2/tables/10/4.2.1.0.table
index 00b032310..4e72e1ab3 100644
--- a/definitions/grib2/tables/10/4.2.1.0.table
+++ b/definitions/grib2/tables/10/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/10/4.2.1.1.table b/definitions/grib2/tables/10/4.2.1.1.table
index 3b95971a9..cb5117dc8 100644
--- a/definitions/grib2/tables/10/4.2.1.1.table
+++ b/definitions/grib2/tables/10/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/10/4.2.1.2.table b/definitions/grib2/tables/10/4.2.1.2.table
index 842b8da1a..2c70c6bd0 100644
--- a/definitions/grib2/tables/10/4.2.1.2.table
+++ b/definitions/grib2/tables/10/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/10/4.2.10.0.table b/definitions/grib2/tables/10/4.2.10.0.table
index 0319fb0b5..a620c36ba 100644
--- a/definitions/grib2/tables/10/4.2.10.0.table
+++ b/definitions/grib2/tables/10/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 10 - Oceanographic products, parameter category 0: waves
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/10/4.2.10.191.table b/definitions/grib2/tables/10/4.2.10.191.table
index f0936614f..14085ac9a 100644
--- a/definitions/grib2/tables/10/4.2.10.191.table
+++ b/definitions/grib2/tables/10/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/10/4.2.2.0.table b/definitions/grib2/tables/10/4.2.2.0.table
index 83547c3c8..d9498c4fc 100644
--- a/definitions/grib2/tables/10/4.2.2.0.table
+++ b/definitions/grib2/tables/10/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 2 - Land surface products, parameter category 0: vegetation/biomass
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/10/4.2.2.3.table b/definitions/grib2/tables/10/4.2.2.3.table
index 4a900111e..4c5e2a4b4 100644
--- a/definitions/grib2/tables/10/4.2.2.3.table
+++ b/definitions/grib2/tables/10/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/10/4.2.3.1.table b/definitions/grib2/tables/10/4.2.3.1.table
index beae6d7c5..176ac35fb 100644
--- a/definitions/grib2/tables/10/4.2.3.1.table
+++ b/definitions/grib2/tables/10/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/11/4.2.0.0.table b/definitions/grib2/tables/11/4.2.0.0.table
index 8cda6d39e..f7784cc33 100644
--- a/definitions/grib2/tables/11/4.2.0.0.table
+++ b/definitions/grib2/tables/11/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/11/4.2.0.1.table b/definitions/grib2/tables/11/4.2.0.1.table
index a7b5e08bb..2d8fbed8c 100644
--- a/definitions/grib2/tables/11/4.2.0.1.table
+++ b/definitions/grib2/tables/11/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/11/4.2.0.15.table b/definitions/grib2/tables/11/4.2.0.15.table
index 470d3ba3d..9a178ceb7 100644
--- a/definitions/grib2/tables/11/4.2.0.15.table
+++ b/definitions/grib2/tables/11/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/11/4.2.0.18.table b/definitions/grib2/tables/11/4.2.0.18.table
index af78a53f3..82fd13da1 100644
--- a/definitions/grib2/tables/11/4.2.0.18.table
+++ b/definitions/grib2/tables/11/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/11/4.2.0.19.table b/definitions/grib2/tables/11/4.2.0.19.table
index 922efb1ed..e6c97e5f9 100644
--- a/definitions/grib2/tables/11/4.2.0.19.table
+++ b/definitions/grib2/tables/11/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather (Code table 4.225)
diff --git a/definitions/grib2/tables/11/4.2.0.191.table b/definitions/grib2/tables/11/4.2.0.191.table
index 4833f8f88..81230c0e0 100644
--- a/definitions/grib2/tables/11/4.2.0.191.table
+++ b/definitions/grib2/tables/11/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/11/4.2.0.2.table b/definitions/grib2/tables/11/4.2.0.2.table
index b969e0634..d587f84e9 100644
--- a/definitions/grib2/tables/11/4.2.0.2.table
+++ b/definitions/grib2/tables/11/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 2: momentum
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/11/4.2.0.20.table b/definitions/grib2/tables/11/4.2.0.20.table
index e1dcea60a..22cea6061 100644
--- a/definitions/grib2/tables/11/4.2.0.20.table
+++ b/definitions/grib2/tables/11/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/11/4.2.0.4.table b/definitions/grib2/tables/11/4.2.0.4.table
index 0b83187b4..fea4cafc3 100644
--- a/definitions/grib2/tables/11/4.2.0.4.table
+++ b/definitions/grib2/tables/11/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/11/4.2.0.5.table b/definitions/grib2/tables/11/4.2.0.5.table
index 032d152ad..b0c93dd3a 100644
--- a/definitions/grib2/tables/11/4.2.0.5.table
+++ b/definitions/grib2/tables/11/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 0 - Meteorological products, parameter category 5: long-wave radiation
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/11/4.2.0.6.table b/definitions/grib2/tables/11/4.2.0.6.table
index bacbbdfbf..051830aff 100644
--- a/definitions/grib2/tables/11/4.2.0.6.table
+++ b/definitions/grib2/tables/11/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/11/4.2.0.7.table b/definitions/grib2/tables/11/4.2.0.7.table
index 244272e58..7a7d2008b 100644
--- a/definitions/grib2/tables/11/4.2.0.7.table
+++ b/definitions/grib2/tables/11/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/11/4.2.1.0.table b/definitions/grib2/tables/11/4.2.1.0.table
index 00b032310..4e72e1ab3 100644
--- a/definitions/grib2/tables/11/4.2.1.0.table
+++ b/definitions/grib2/tables/11/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/11/4.2.1.1.table b/definitions/grib2/tables/11/4.2.1.1.table
index 3b95971a9..cb5117dc8 100644
--- a/definitions/grib2/tables/11/4.2.1.1.table
+++ b/definitions/grib2/tables/11/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/11/4.2.1.2.table b/definitions/grib2/tables/11/4.2.1.2.table
index 842b8da1a..2c70c6bd0 100644
--- a/definitions/grib2/tables/11/4.2.1.2.table
+++ b/definitions/grib2/tables/11/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/11/4.2.10.0.table b/definitions/grib2/tables/11/4.2.10.0.table
index 8eb807f78..b820364fa 100644
--- a/definitions/grib2/tables/11/4.2.10.0.table
+++ b/definitions/grib2/tables/11/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 10 - Oceanographic products, parameter category 0: waves
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/11/4.2.10.191.table b/definitions/grib2/tables/11/4.2.10.191.table
index f0936614f..14085ac9a 100644
--- a/definitions/grib2/tables/11/4.2.10.191.table
+++ b/definitions/grib2/tables/11/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/11/4.2.2.0.table b/definitions/grib2/tables/11/4.2.2.0.table
index 83547c3c8..d9498c4fc 100644
--- a/definitions/grib2/tables/11/4.2.2.0.table
+++ b/definitions/grib2/tables/11/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 2 - Land surface products, parameter category 0: vegetation/biomass
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/11/4.2.2.3.table b/definitions/grib2/tables/11/4.2.2.3.table
index 4a900111e..4c5e2a4b4 100644
--- a/definitions/grib2/tables/11/4.2.2.3.table
+++ b/definitions/grib2/tables/11/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/11/4.2.3.1.table b/definitions/grib2/tables/11/4.2.3.1.table
index beae6d7c5..176ac35fb 100644
--- a/definitions/grib2/tables/11/4.2.3.1.table
+++ b/definitions/grib2/tables/11/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/12/4.2.0.0.table b/definitions/grib2/tables/12/4.2.0.0.table
index 2516c23fb..ce91fe429 100644
--- a/definitions/grib2/tables/12/4.2.0.0.table
+++ b/definitions/grib2/tables/12/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/12/4.2.0.1.table b/definitions/grib2/tables/12/4.2.0.1.table
index 4b2cccd18..bb0ff7c42 100644
--- a/definitions/grib2/tables/12/4.2.0.1.table
+++ b/definitions/grib2/tables/12/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.0.15.table b/definitions/grib2/tables/12/4.2.0.15.table
index f40608676..d74fa7234 100644
--- a/definitions/grib2/tables/12/4.2.0.15.table
+++ b/definitions/grib2/tables/12/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/12/4.2.0.18.table b/definitions/grib2/tables/12/4.2.0.18.table
index 0a26caf85..18c41aa48 100644
--- a/definitions/grib2/tables/12/4.2.0.18.table
+++ b/definitions/grib2/tables/12/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.0.19.table b/definitions/grib2/tables/12/4.2.0.19.table
index ff90cfb21..0478ef16f 100644
--- a/definitions/grib2/tables/12/4.2.0.19.table
+++ b/definitions/grib2/tables/12/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/12/4.2.0.191.table b/definitions/grib2/tables/12/4.2.0.191.table
index b1bb14e3d..1f949f149 100644
--- a/definitions/grib2/tables/12/4.2.0.191.table
+++ b/definitions/grib2/tables/12/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/12/4.2.0.2.table b/definitions/grib2/tables/12/4.2.0.2.table
index 9fcd7cde7..84882e8b8 100644
--- a/definitions/grib2/tables/12/4.2.0.2.table
+++ b/definitions/grib2/tables/12/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/12/4.2.0.20.table b/definitions/grib2/tables/12/4.2.0.20.table
index 1f730fd67..ac97b0b39 100644
--- a/definitions/grib2/tables/12/4.2.0.20.table
+++ b/definitions/grib2/tables/12/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/12/4.2.0.4.table b/definitions/grib2/tables/12/4.2.0.4.table
index 85b51e85e..dbfcbddb7 100644
--- a/definitions/grib2/tables/12/4.2.0.4.table
+++ b/definitions/grib2/tables/12/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/12/4.2.0.5.table b/definitions/grib2/tables/12/4.2.0.5.table
index 344336b0b..f1c04650d 100644
--- a/definitions/grib2/tables/12/4.2.0.5.table
+++ b/definitions/grib2/tables/12/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/12/4.2.0.6.table b/definitions/grib2/tables/12/4.2.0.6.table
index a21a99552..b97357194 100644
--- a/definitions/grib2/tables/12/4.2.0.6.table
+++ b/definitions/grib2/tables/12/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/12/4.2.0.7.table b/definitions/grib2/tables/12/4.2.0.7.table
index 9c0180d7b..db47d0113 100644
--- a/definitions/grib2/tables/12/4.2.0.7.table
+++ b/definitions/grib2/tables/12/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/12/4.2.1.0.table b/definitions/grib2/tables/12/4.2.1.0.table
index b83e223d7..77b25fa24 100644
--- a/definitions/grib2/tables/12/4.2.1.0.table
+++ b/definitions/grib2/tables/12/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/12/4.2.1.1.table b/definitions/grib2/tables/12/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/12/4.2.1.1.table
+++ b/definitions/grib2/tables/12/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.1.2.table b/definitions/grib2/tables/12/4.2.1.2.table
index 7f65cbf94..2d08d44f4 100644
--- a/definitions/grib2/tables/12/4.2.1.2.table
+++ b/definitions/grib2/tables/12/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/12/4.2.10.0.table b/definitions/grib2/tables/12/4.2.10.0.table
index 3df4946bf..761b6395c 100644
--- a/definitions/grib2/tables/12/4.2.10.0.table
+++ b/definitions/grib2/tables/12/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/12/4.2.10.191.table b/definitions/grib2/tables/12/4.2.10.191.table
index 3938fcc28..18e56f930 100644
--- a/definitions/grib2/tables/12/4.2.10.191.table
+++ b/definitions/grib2/tables/12/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/12/4.2.2.0.table b/definitions/grib2/tables/12/4.2.2.0.table
index bfcae567f..bf3574834 100644
--- a/definitions/grib2/tables/12/4.2.2.0.table
+++ b/definitions/grib2/tables/12/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/12/4.2.2.3.table b/definitions/grib2/tables/12/4.2.2.3.table
index 68282148c..28284d4d4 100644
--- a/definitions/grib2/tables/12/4.2.2.3.table
+++ b/definitions/grib2/tables/12/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/12/4.2.3.1.table b/definitions/grib2/tables/12/4.2.3.1.table
index b7dcf5335..0c0fc8d37 100644
--- a/definitions/grib2/tables/12/4.2.3.1.table
+++ b/definitions/grib2/tables/12/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/13/4.2.0.0.table b/definitions/grib2/tables/13/4.2.0.0.table
index 73c97bf34..6de8a23c8 100644
--- a/definitions/grib2/tables/13/4.2.0.0.table
+++ b/definitions/grib2/tables/13/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/13/4.2.0.1.table b/definitions/grib2/tables/13/4.2.0.1.table
index 4b2cccd18..bb0ff7c42 100644
--- a/definitions/grib2/tables/13/4.2.0.1.table
+++ b/definitions/grib2/tables/13/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.0.15.table b/definitions/grib2/tables/13/4.2.0.15.table
index f40608676..d74fa7234 100644
--- a/definitions/grib2/tables/13/4.2.0.15.table
+++ b/definitions/grib2/tables/13/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/13/4.2.0.18.table b/definitions/grib2/tables/13/4.2.0.18.table
index 0a26caf85..18c41aa48 100644
--- a/definitions/grib2/tables/13/4.2.0.18.table
+++ b/definitions/grib2/tables/13/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.0.19.table b/definitions/grib2/tables/13/4.2.0.19.table
index ff90cfb21..0478ef16f 100644
--- a/definitions/grib2/tables/13/4.2.0.19.table
+++ b/definitions/grib2/tables/13/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/13/4.2.0.191.table b/definitions/grib2/tables/13/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/13/4.2.0.191.table
+++ b/definitions/grib2/tables/13/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/13/4.2.0.2.table b/definitions/grib2/tables/13/4.2.0.2.table
index 246b99fe9..c83b07300 100644
--- a/definitions/grib2/tables/13/4.2.0.2.table
+++ b/definitions/grib2/tables/13/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/13/4.2.0.20.table b/definitions/grib2/tables/13/4.2.0.20.table
index 3e01fd6b9..9584f7c7f 100644
--- a/definitions/grib2/tables/13/4.2.0.20.table
+++ b/definitions/grib2/tables/13/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/13/4.2.0.4.table b/definitions/grib2/tables/13/4.2.0.4.table
index 85b51e85e..dbfcbddb7 100644
--- a/definitions/grib2/tables/13/4.2.0.4.table
+++ b/definitions/grib2/tables/13/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/13/4.2.0.5.table b/definitions/grib2/tables/13/4.2.0.5.table
index 344336b0b..f1c04650d 100644
--- a/definitions/grib2/tables/13/4.2.0.5.table
+++ b/definitions/grib2/tables/13/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/13/4.2.0.6.table b/definitions/grib2/tables/13/4.2.0.6.table
index a21a99552..b97357194 100644
--- a/definitions/grib2/tables/13/4.2.0.6.table
+++ b/definitions/grib2/tables/13/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/13/4.2.0.7.table b/definitions/grib2/tables/13/4.2.0.7.table
index 9c0180d7b..db47d0113 100644
--- a/definitions/grib2/tables/13/4.2.0.7.table
+++ b/definitions/grib2/tables/13/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/13/4.2.1.0.table b/definitions/grib2/tables/13/4.2.1.0.table
index ed367ebc2..989c4ae28 100644
--- a/definitions/grib2/tables/13/4.2.1.0.table
+++ b/definitions/grib2/tables/13/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/13/4.2.1.1.table b/definitions/grib2/tables/13/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/13/4.2.1.1.table
+++ b/definitions/grib2/tables/13/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.1.2.table b/definitions/grib2/tables/13/4.2.1.2.table
index b0a920d00..8daf51efd 100644
--- a/definitions/grib2/tables/13/4.2.1.2.table
+++ b/definitions/grib2/tables/13/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/13/4.2.10.0.table b/definitions/grib2/tables/13/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/13/4.2.10.0.table
+++ b/definitions/grib2/tables/13/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/13/4.2.10.191.table b/definitions/grib2/tables/13/4.2.10.191.table
index 200150e86..dc0e23d7b 100644
--- a/definitions/grib2/tables/13/4.2.10.191.table
+++ b/definitions/grib2/tables/13/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/13/4.2.2.0.table b/definitions/grib2/tables/13/4.2.2.0.table
index d38eb9285..ed9e43eb7 100644
--- a/definitions/grib2/tables/13/4.2.2.0.table
+++ b/definitions/grib2/tables/13/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
diff --git a/definitions/grib2/tables/13/4.2.2.3.table b/definitions/grib2/tables/13/4.2.2.3.table
index 68282148c..28284d4d4 100644
--- a/definitions/grib2/tables/13/4.2.2.3.table
+++ b/definitions/grib2/tables/13/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/13/4.2.3.1.table b/definitions/grib2/tables/13/4.2.3.1.table
index b7dcf5335..0c0fc8d37 100644
--- a/definitions/grib2/tables/13/4.2.3.1.table
+++ b/definitions/grib2/tables/13/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/14/4.2.0.0.table b/definitions/grib2/tables/14/4.2.0.0.table
index 582c08a9e..41e5291a9 100644
--- a/definitions/grib2/tables/14/4.2.0.0.table
+++ b/definitions/grib2/tables/14/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/14/4.2.0.1.table b/definitions/grib2/tables/14/4.2.0.1.table
index 9607d6b65..0af12c3c3 100644
--- a/definitions/grib2/tables/14/4.2.0.1.table
+++ b/definitions/grib2/tables/14/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 # 95-191 Reserved 
diff --git a/definitions/grib2/tables/14/4.2.0.15.table b/definitions/grib2/tables/14/4.2.0.15.table
index f40608676..d74fa7234 100644
--- a/definitions/grib2/tables/14/4.2.0.15.table
+++ b/definitions/grib2/tables/14/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/14/4.2.0.18.table b/definitions/grib2/tables/14/4.2.0.18.table
index 0a26caf85..18c41aa48 100644
--- a/definitions/grib2/tables/14/4.2.0.18.table
+++ b/definitions/grib2/tables/14/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/14/4.2.0.19.table b/definitions/grib2/tables/14/4.2.0.19.table
index ff90cfb21..0478ef16f 100644
--- a/definitions/grib2/tables/14/4.2.0.19.table
+++ b/definitions/grib2/tables/14/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/14/4.2.0.191.table b/definitions/grib2/tables/14/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/14/4.2.0.191.table
+++ b/definitions/grib2/tables/14/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/14/4.2.0.2.table b/definitions/grib2/tables/14/4.2.0.2.table
index 246b99fe9..c83b07300 100644
--- a/definitions/grib2/tables/14/4.2.0.2.table
+++ b/definitions/grib2/tables/14/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/14/4.2.0.20.table b/definitions/grib2/tables/14/4.2.0.20.table
index 3e01fd6b9..9584f7c7f 100644
--- a/definitions/grib2/tables/14/4.2.0.20.table
+++ b/definitions/grib2/tables/14/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/14/4.2.0.4.table b/definitions/grib2/tables/14/4.2.0.4.table
index 85b51e85e..dbfcbddb7 100644
--- a/definitions/grib2/tables/14/4.2.0.4.table
+++ b/definitions/grib2/tables/14/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/14/4.2.0.5.table b/definitions/grib2/tables/14/4.2.0.5.table
index 344336b0b..f1c04650d 100644
--- a/definitions/grib2/tables/14/4.2.0.5.table
+++ b/definitions/grib2/tables/14/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/14/4.2.0.6.table b/definitions/grib2/tables/14/4.2.0.6.table
index 849315b98..cb160fa0b 100644
--- a/definitions/grib2/tables/14/4.2.0.6.table
+++ b/definitions/grib2/tables/14/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/14/4.2.0.7.table b/definitions/grib2/tables/14/4.2.0.7.table
index 9c0180d7b..db47d0113 100644
--- a/definitions/grib2/tables/14/4.2.0.7.table
+++ b/definitions/grib2/tables/14/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/14/4.2.1.0.table b/definitions/grib2/tables/14/4.2.1.0.table
index ed367ebc2..989c4ae28 100644
--- a/definitions/grib2/tables/14/4.2.1.0.table
+++ b/definitions/grib2/tables/14/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/14/4.2.1.1.table b/definitions/grib2/tables/14/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/14/4.2.1.1.table
+++ b/definitions/grib2/tables/14/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/14/4.2.1.2.table b/definitions/grib2/tables/14/4.2.1.2.table
index b0a920d00..8daf51efd 100644
--- a/definitions/grib2/tables/14/4.2.1.2.table
+++ b/definitions/grib2/tables/14/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/14/4.2.10.0.table b/definitions/grib2/tables/14/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/14/4.2.10.0.table
+++ b/definitions/grib2/tables/14/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/14/4.2.10.191.table b/definitions/grib2/tables/14/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/14/4.2.10.191.table
+++ b/definitions/grib2/tables/14/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/14/4.2.2.0.table b/definitions/grib2/tables/14/4.2.2.0.table
index 93f3ce12f..958c4bf64 100644
--- a/definitions/grib2/tables/14/4.2.2.0.table
+++ b/definitions/grib2/tables/14/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
diff --git a/definitions/grib2/tables/14/4.2.2.3.table b/definitions/grib2/tables/14/4.2.2.3.table
index 68282148c..28284d4d4 100644
--- a/definitions/grib2/tables/14/4.2.2.3.table
+++ b/definitions/grib2/tables/14/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/14/4.2.3.1.table b/definitions/grib2/tables/14/4.2.3.1.table
index b7dcf5335..0c0fc8d37 100644
--- a/definitions/grib2/tables/14/4.2.3.1.table
+++ b/definitions/grib2/tables/14/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/15/4.2.0.0.table b/definitions/grib2/tables/15/4.2.0.0.table
index 582c08a9e..41e5291a9 100644
--- a/definitions/grib2/tables/15/4.2.0.0.table
+++ b/definitions/grib2/tables/15/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/15/4.2.0.1.table b/definitions/grib2/tables/15/4.2.0.1.table
index 8c3528b59..c90ade1c5 100644
--- a/definitions/grib2/tables/15/4.2.0.1.table
+++ b/definitions/grib2/tables/15/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/15/4.2.0.15.table b/definitions/grib2/tables/15/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/15/4.2.0.15.table
+++ b/definitions/grib2/tables/15/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/15/4.2.0.18.table b/definitions/grib2/tables/15/4.2.0.18.table
index 0a26caf85..18c41aa48 100644
--- a/definitions/grib2/tables/15/4.2.0.18.table
+++ b/definitions/grib2/tables/15/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.0.19.table b/definitions/grib2/tables/15/4.2.0.19.table
index ff90cfb21..0478ef16f 100644
--- a/definitions/grib2/tables/15/4.2.0.19.table
+++ b/definitions/grib2/tables/15/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
diff --git a/definitions/grib2/tables/15/4.2.0.191.table b/definitions/grib2/tables/15/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/15/4.2.0.191.table
+++ b/definitions/grib2/tables/15/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/15/4.2.0.2.table b/definitions/grib2/tables/15/4.2.0.2.table
index 246b99fe9..c83b07300 100644
--- a/definitions/grib2/tables/15/4.2.0.2.table
+++ b/definitions/grib2/tables/15/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/15/4.2.0.20.table b/definitions/grib2/tables/15/4.2.0.20.table
index 3e01fd6b9..9584f7c7f 100644
--- a/definitions/grib2/tables/15/4.2.0.20.table
+++ b/definitions/grib2/tables/15/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/15/4.2.0.4.table b/definitions/grib2/tables/15/4.2.0.4.table
index 85b51e85e..dbfcbddb7 100644
--- a/definitions/grib2/tables/15/4.2.0.4.table
+++ b/definitions/grib2/tables/15/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/15/4.2.0.5.table b/definitions/grib2/tables/15/4.2.0.5.table
index 047688ba4..932a12fbd 100644
--- a/definitions/grib2/tables/15/4.2.0.5.table
+++ b/definitions/grib2/tables/15/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/15/4.2.0.6.table b/definitions/grib2/tables/15/4.2.0.6.table
index 2abb7f599..906eeb9ac 100644
--- a/definitions/grib2/tables/15/4.2.0.6.table
+++ b/definitions/grib2/tables/15/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/15/4.2.0.7.table b/definitions/grib2/tables/15/4.2.0.7.table
index 9c0180d7b..db47d0113 100644
--- a/definitions/grib2/tables/15/4.2.0.7.table
+++ b/definitions/grib2/tables/15/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/15/4.2.1.0.table b/definitions/grib2/tables/15/4.2.1.0.table
index ed367ebc2..989c4ae28 100644
--- a/definitions/grib2/tables/15/4.2.1.0.table
+++ b/definitions/grib2/tables/15/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/15/4.2.1.1.table b/definitions/grib2/tables/15/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/15/4.2.1.1.table
+++ b/definitions/grib2/tables/15/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.1.2.table b/definitions/grib2/tables/15/4.2.1.2.table
index b0a920d00..8daf51efd 100644
--- a/definitions/grib2/tables/15/4.2.1.2.table
+++ b/definitions/grib2/tables/15/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/15/4.2.10.0.table b/definitions/grib2/tables/15/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/15/4.2.10.0.table
+++ b/definitions/grib2/tables/15/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/15/4.2.10.191.table b/definitions/grib2/tables/15/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/15/4.2.10.191.table
+++ b/definitions/grib2/tables/15/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/15/4.2.2.0.table b/definitions/grib2/tables/15/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/15/4.2.2.0.table
+++ b/definitions/grib2/tables/15/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.2.3.table b/definitions/grib2/tables/15/4.2.2.3.table
index a9462256d..56e66c83a 100644
--- a/definitions/grib2/tables/15/4.2.2.3.table
+++ b/definitions/grib2/tables/15/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/15/4.2.3.1.table b/definitions/grib2/tables/15/4.2.3.1.table
index ae2871304..0bda53063 100644
--- a/definitions/grib2/tables/15/4.2.3.1.table
+++ b/definitions/grib2/tables/15/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/16/4.2.0.0.table b/definitions/grib2/tables/16/4.2.0.0.table
index dbd90dc79..cfadd2d07 100644
--- a/definitions/grib2/tables/16/4.2.0.0.table
+++ b/definitions/grib2/tables/16/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/16/4.2.0.1.table b/definitions/grib2/tables/16/4.2.0.1.table
index 33bff15fe..b0127980c 100644
--- a/definitions/grib2/tables/16/4.2.0.1.table
+++ b/definitions/grib2/tables/16/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/16/4.2.0.15.table b/definitions/grib2/tables/16/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/16/4.2.0.15.table
+++ b/definitions/grib2/tables/16/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/16/4.2.0.18.table b/definitions/grib2/tables/16/4.2.0.18.table
index 0a26caf85..18c41aa48 100644
--- a/definitions/grib2/tables/16/4.2.0.18.table
+++ b/definitions/grib2/tables/16/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.0.19.table b/definitions/grib2/tables/16/4.2.0.19.table
index e64cdd7bc..35b9deb7f 100644
--- a/definitions/grib2/tables/16/4.2.0.19.table
+++ b/definitions/grib2/tables/16/4.2.0.19.table
@@ -21,13 +21,13 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 # 29-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.0.191.table b/definitions/grib2/tables/16/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/16/4.2.0.191.table
+++ b/definitions/grib2/tables/16/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/16/4.2.0.2.table b/definitions/grib2/tables/16/4.2.0.2.table
index 01e540d47..46b0774aa 100644
--- a/definitions/grib2/tables/16/4.2.0.2.table
+++ b/definitions/grib2/tables/16/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/16/4.2.0.20.table b/definitions/grib2/tables/16/4.2.0.20.table
index 3e01fd6b9..9584f7c7f 100644
--- a/definitions/grib2/tables/16/4.2.0.20.table
+++ b/definitions/grib2/tables/16/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/16/4.2.0.4.table b/definitions/grib2/tables/16/4.2.0.4.table
index 9e53f608c..bd37ea3f5 100644
--- a/definitions/grib2/tables/16/4.2.0.4.table
+++ b/definitions/grib2/tables/16/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short wave radiation flux (W m-2)
 14 14 Diffuse short wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/16/4.2.0.5.table b/definitions/grib2/tables/16/4.2.0.5.table
index 047688ba4..932a12fbd 100644
--- a/definitions/grib2/tables/16/4.2.0.5.table
+++ b/definitions/grib2/tables/16/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/16/4.2.0.6.table b/definitions/grib2/tables/16/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/16/4.2.0.6.table
+++ b/definitions/grib2/tables/16/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.0.7.table b/definitions/grib2/tables/16/4.2.0.7.table
index 77fd5bd67..23a1a82da 100644
--- a/definitions/grib2/tables/16/4.2.0.7.table
+++ b/definitions/grib2/tables/16/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/16/4.2.1.0.table b/definitions/grib2/tables/16/4.2.1.0.table
index 6840add5b..89083fa27 100644
--- a/definitions/grib2/tables/16/4.2.1.0.table
+++ b/definitions/grib2/tables/16/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/16/4.2.1.1.table b/definitions/grib2/tables/16/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/16/4.2.1.1.table
+++ b/definitions/grib2/tables/16/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.1.2.table b/definitions/grib2/tables/16/4.2.1.2.table
index ec4148a81..02979ecb2 100644
--- a/definitions/grib2/tables/16/4.2.1.2.table
+++ b/definitions/grib2/tables/16/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/16/4.2.10.0.table b/definitions/grib2/tables/16/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/16/4.2.10.0.table
+++ b/definitions/grib2/tables/16/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/16/4.2.10.191.table b/definitions/grib2/tables/16/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/16/4.2.10.191.table
+++ b/definitions/grib2/tables/16/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/16/4.2.2.0.table b/definitions/grib2/tables/16/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/16/4.2.2.0.table
+++ b/definitions/grib2/tables/16/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.2.3.table b/definitions/grib2/tables/16/4.2.2.3.table
index bd021d038..9dd57a190 100644
--- a/definitions/grib2/tables/16/4.2.2.3.table
+++ b/definitions/grib2/tables/16/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/16/4.2.2.4.table b/definitions/grib2/tables/16/4.2.2.4.table
index c4fd16747..b9383fe10 100644
--- a/definitions/grib2/tables/16/4.2.2.4.table
+++ b/definitions/grib2/tables/16/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Fire weather index [Canadian forest service] (Numeric)
-6 6 Fine fuel moisture code [Canadian forest service] (Numeric)
-7 7 Duff moisture code [Canadian forest service] (Numeric)
-8 8 Drought code [Canadian forest service] (Numeric)
-9 9 Initial fire spread index [Canadian forest service] (Numeric)
-10 10 Fire build up index [Canadian forest service] (Numeric)
-11 11 Fire daily severity rating [Canadian forest service] (Numeric)
+5 5 Fire weather index (Canadian forest service) (Numeric)
+6 6 Fine fuel moisture code (Canadian forest service) (Numeric)
+7 7 Duff moisture code (Canadian forest service) (Numeric)
+8 8 Drought code (Canadian forest service) (Numeric)
+9 9 Initial fire spread index (Canadian forest service) (Numeric)
+10 10 Fire build up index (Canadian forest service) (Numeric)
+11 11 Fire daily severity rating (Canadian forest service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.3.1.table b/definitions/grib2/tables/16/4.2.3.1.table
index 4b758cdb7..75911ee32 100644
--- a/definitions/grib2/tables/16/4.2.3.1.table
+++ b/definitions/grib2/tables/16/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um 
diff --git a/definitions/grib2/tables/17/4.2.0.0.table b/definitions/grib2/tables/17/4.2.0.0.table
index b8984706f..f24b8832c 100644
--- a/definitions/grib2/tables/17/4.2.0.0.table
+++ b/definitions/grib2/tables/17/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/17/4.2.0.1.table b/definitions/grib2/tables/17/4.2.0.1.table
index 1edff015a..490297d22 100644
--- a/definitions/grib2/tables/17/4.2.0.1.table
+++ b/definitions/grib2/tables/17/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/17/4.2.0.15.table b/definitions/grib2/tables/17/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/17/4.2.0.15.table
+++ b/definitions/grib2/tables/17/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/17/4.2.0.17.table b/definitions/grib2/tables/17/4.2.0.17.table
index 913a5ab37..a6799631f 100644
--- a/definitions/grib2/tables/17/4.2.0.17.table
+++ b/definitions/grib2/tables/17/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index [LPI] (J kg-1)
+1 1 Lightning potential index (LPI) (J kg-1)
diff --git a/definitions/grib2/tables/17/4.2.0.18.table b/definitions/grib2/tables/17/4.2.0.18.table
index b87b481b2..9ae3539ca 100644
--- a/definitions/grib2/tables/17/4.2.0.18.table
+++ b/definitions/grib2/tables/17/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/17/4.2.0.19.table b/definitions/grib2/tables/17/4.2.0.19.table
index 5b5063c70..d2a4338d6 100644
--- a/definitions/grib2/tables/17/4.2.0.19.table
+++ b/definitions/grib2/tables/17/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
-29 29 Clear air turbulence [CAT] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of Eddy dissipation parameter in layer (m2/3 s-1)
 # 32-191 Reserved 
diff --git a/definitions/grib2/tables/17/4.2.0.191.table b/definitions/grib2/tables/17/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/17/4.2.0.191.table
+++ b/definitions/grib2/tables/17/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/17/4.2.0.2.table b/definitions/grib2/tables/17/4.2.0.2.table
index 5f351ce69..8ebc75124 100644
--- a/definitions/grib2/tables/17/4.2.0.2.table
+++ b/definitions/grib2/tables/17/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/17/4.2.0.20.table b/definitions/grib2/tables/17/4.2.0.20.table
index 9295d786a..983539bd2 100644
--- a/definitions/grib2/tables/17/4.2.0.20.table
+++ b/definitions/grib2/tables/17/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -29,7 +29,7 @@
 61 61 Maximum of mass density in layer (kg m-3)
 62 62 Height of maximum mass density (m)
 # 63-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/17/4.2.0.4.table b/definitions/grib2/tables/17/4.2.0.4.table
index 4d2f8d900..0a5ded2b5 100644
--- a/definitions/grib2/tables/17/4.2.0.4.table
+++ b/definitions/grib2/tables/17/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/17/4.2.0.5.table b/definitions/grib2/tables/17/4.2.0.5.table
index d28169fe1..4550220b6 100644
--- a/definitions/grib2/tables/17/4.2.0.5.table
+++ b/definitions/grib2/tables/17/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/17/4.2.0.6.table b/definitions/grib2/tables/17/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/17/4.2.0.6.table
+++ b/definitions/grib2/tables/17/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.0.7.table b/definitions/grib2/tables/17/4.2.0.7.table
index 84b320b0b..6d0d87a46 100644
--- a/definitions/grib2/tables/17/4.2.0.7.table
+++ b/definitions/grib2/tables/17/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/17/4.2.1.0.table b/definitions/grib2/tables/17/4.2.1.0.table
index 4f6c5ea69..e906af726 100644
--- a/definitions/grib2/tables/17/4.2.1.0.table
+++ b/definitions/grib2/tables/17/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/17/4.2.1.1.table b/definitions/grib2/tables/17/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/17/4.2.1.1.table
+++ b/definitions/grib2/tables/17/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.1.2.table b/definitions/grib2/tables/17/4.2.1.2.table
index ca130e960..ec9b11d41 100644
--- a/definitions/grib2/tables/17/4.2.1.2.table
+++ b/definitions/grib2/tables/17/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/17/4.2.10.0.table b/definitions/grib2/tables/17/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/17/4.2.10.0.table
+++ b/definitions/grib2/tables/17/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/17/4.2.10.191.table b/definitions/grib2/tables/17/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/17/4.2.10.191.table
+++ b/definitions/grib2/tables/17/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/17/4.2.2.0.table b/definitions/grib2/tables/17/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/17/4.2.2.0.table
+++ b/definitions/grib2/tables/17/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.2.3.table b/definitions/grib2/tables/17/4.2.2.3.table
index 7c5614cdb..447e4f9cb 100644
--- a/definitions/grib2/tables/17/4.2.2.3.table
+++ b/definitions/grib2/tables/17/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/17/4.2.2.4.table b/definitions/grib2/tables/17/4.2.2.4.table
index 5edfd3b7e..bb54fac22 100644
--- a/definitions/grib2/tables/17/4.2.2.4.table
+++ b/definitions/grib2/tables/17/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
-6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
-7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
-8 8 Drought Code [Canadian Forest Service] (Numeric)
-9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
-10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
-11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
+5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
+8 8 Drought Code (Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.3.1.table b/definitions/grib2/tables/17/4.2.3.1.table
index 71f896fd7..8e0793fe0 100644
--- a/definitions/grib2/tables/17/4.2.3.1.table
+++ b/definitions/grib2/tables/17/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/18/4.2.0.0.table b/definitions/grib2/tables/18/4.2.0.0.table
index 1682411de..7201a8667 100644
--- a/definitions/grib2/tables/18/4.2.0.0.table
+++ b/definitions/grib2/tables/18/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/18/4.2.0.1.table b/definitions/grib2/tables/18/4.2.0.1.table
index 53499c529..8f96bcd60 100644
--- a/definitions/grib2/tables/18/4.2.0.1.table
+++ b/definitions/grib2/tables/18/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/18/4.2.0.15.table b/definitions/grib2/tables/18/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/18/4.2.0.15.table
+++ b/definitions/grib2/tables/18/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/18/4.2.0.17.table b/definitions/grib2/tables/18/4.2.0.17.table
index 913a5ab37..a6799631f 100644
--- a/definitions/grib2/tables/18/4.2.0.17.table
+++ b/definitions/grib2/tables/18/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index [LPI] (J kg-1)
+1 1 Lightning potential index (LPI) (J kg-1)
diff --git a/definitions/grib2/tables/18/4.2.0.18.table b/definitions/grib2/tables/18/4.2.0.18.table
index 35e23577f..9d106f419 100644
--- a/definitions/grib2/tables/18/4.2.0.18.table
+++ b/definitions/grib2/tables/18/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/18/4.2.0.19.table b/definitions/grib2/tables/18/4.2.0.19.table
index 5b5063c70..d2a4338d6 100644
--- a/definitions/grib2/tables/18/4.2.0.19.table
+++ b/definitions/grib2/tables/18/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
-29 29 Clear air turbulence [CAT] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of Eddy dissipation parameter in layer (m2/3 s-1)
 # 32-191 Reserved 
diff --git a/definitions/grib2/tables/18/4.2.0.191.table b/definitions/grib2/tables/18/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/18/4.2.0.191.table
+++ b/definitions/grib2/tables/18/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/18/4.2.0.2.table b/definitions/grib2/tables/18/4.2.0.2.table
index fc169f9ba..5446262e6 100644
--- a/definitions/grib2/tables/18/4.2.0.2.table
+++ b/definitions/grib2/tables/18/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/18/4.2.0.20.table b/definitions/grib2/tables/18/4.2.0.20.table
index 19db8a604..efc427a19 100644
--- a/definitions/grib2/tables/18/4.2.0.20.table
+++ b/definitions/grib2/tables/18/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,7 +30,7 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/18/4.2.0.4.table b/definitions/grib2/tables/18/4.2.0.4.table
index 4d2f8d900..0a5ded2b5 100644
--- a/definitions/grib2/tables/18/4.2.0.4.table
+++ b/definitions/grib2/tables/18/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/18/4.2.0.5.table b/definitions/grib2/tables/18/4.2.0.5.table
index d28169fe1..4550220b6 100644
--- a/definitions/grib2/tables/18/4.2.0.5.table
+++ b/definitions/grib2/tables/18/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/18/4.2.0.6.table b/definitions/grib2/tables/18/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/18/4.2.0.6.table
+++ b/definitions/grib2/tables/18/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.0.7.table b/definitions/grib2/tables/18/4.2.0.7.table
index 84b320b0b..6d0d87a46 100644
--- a/definitions/grib2/tables/18/4.2.0.7.table
+++ b/definitions/grib2/tables/18/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/18/4.2.1.0.table b/definitions/grib2/tables/18/4.2.1.0.table
index 4f6c5ea69..e906af726 100644
--- a/definitions/grib2/tables/18/4.2.1.0.table
+++ b/definitions/grib2/tables/18/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/18/4.2.1.1.table b/definitions/grib2/tables/18/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/18/4.2.1.1.table
+++ b/definitions/grib2/tables/18/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.1.2.table b/definitions/grib2/tables/18/4.2.1.2.table
index ca130e960..ec9b11d41 100644
--- a/definitions/grib2/tables/18/4.2.1.2.table
+++ b/definitions/grib2/tables/18/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/18/4.2.10.0.table b/definitions/grib2/tables/18/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/18/4.2.10.0.table
+++ b/definitions/grib2/tables/18/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/18/4.2.10.191.table b/definitions/grib2/tables/18/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/18/4.2.10.191.table
+++ b/definitions/grib2/tables/18/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/18/4.2.2.0.table b/definitions/grib2/tables/18/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/18/4.2.2.0.table
+++ b/definitions/grib2/tables/18/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.2.3.table b/definitions/grib2/tables/18/4.2.2.3.table
index 7c5614cdb..447e4f9cb 100644
--- a/definitions/grib2/tables/18/4.2.2.3.table
+++ b/definitions/grib2/tables/18/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/18/4.2.2.4.table b/definitions/grib2/tables/18/4.2.2.4.table
index 5edfd3b7e..bb54fac22 100644
--- a/definitions/grib2/tables/18/4.2.2.4.table
+++ b/definitions/grib2/tables/18/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
-6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
-7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
-8 8 Drought Code [Canadian Forest Service] (Numeric)
-9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
-10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
-11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
+5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
+8 8 Drought Code (Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.3.1.table b/definitions/grib2/tables/18/4.2.3.1.table
index 71f896fd7..8e0793fe0 100644
--- a/definitions/grib2/tables/18/4.2.3.1.table
+++ b/definitions/grib2/tables/18/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/19/4.2.0.0.table b/definitions/grib2/tables/19/4.2.0.0.table
index 1682411de..7201a8667 100644
--- a/definitions/grib2/tables/19/4.2.0.0.table
+++ b/definitions/grib2/tables/19/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/19/4.2.0.1.table b/definitions/grib2/tables/19/4.2.0.1.table
index 53499c529..8f96bcd60 100644
--- a/definitions/grib2/tables/19/4.2.0.1.table
+++ b/definitions/grib2/tables/19/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/19/4.2.0.15.table b/definitions/grib2/tables/19/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/19/4.2.0.15.table
+++ b/definitions/grib2/tables/19/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/19/4.2.0.17.table b/definitions/grib2/tables/19/4.2.0.17.table
index 913a5ab37..a6799631f 100644
--- a/definitions/grib2/tables/19/4.2.0.17.table
+++ b/definitions/grib2/tables/19/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index [LPI] (J kg-1)
+1 1 Lightning potential index (LPI) (J kg-1)
diff --git a/definitions/grib2/tables/19/4.2.0.18.table b/definitions/grib2/tables/19/4.2.0.18.table
index 35e23577f..9d106f419 100644
--- a/definitions/grib2/tables/19/4.2.0.18.table
+++ b/definitions/grib2/tables/19/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/19/4.2.0.19.table b/definitions/grib2/tables/19/4.2.0.19.table
index d0f098912..0e49286a7 100644
--- a/definitions/grib2/tables/19/4.2.0.19.table
+++ b/definitions/grib2/tables/19/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
-29 29 Clear air turbulence [CAT] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 # 32-191 Reserved 
diff --git a/definitions/grib2/tables/19/4.2.0.191.table b/definitions/grib2/tables/19/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/19/4.2.0.191.table
+++ b/definitions/grib2/tables/19/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/19/4.2.0.2.table b/definitions/grib2/tables/19/4.2.0.2.table
index fc169f9ba..5446262e6 100644
--- a/definitions/grib2/tables/19/4.2.0.2.table
+++ b/definitions/grib2/tables/19/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/19/4.2.0.20.table b/definitions/grib2/tables/19/4.2.0.20.table
index 6f3ba9810..3278506dd 100644
--- a/definitions/grib2/tables/19/4.2.0.20.table
+++ b/definitions/grib2/tables/19/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,7 +30,7 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density [aerosol] (m-1)
+100 100 Surface area density (aerosol) (m-1)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/19/4.2.0.4.table b/definitions/grib2/tables/19/4.2.0.4.table
index 4d2f8d900..0a5ded2b5 100644
--- a/definitions/grib2/tables/19/4.2.0.4.table
+++ b/definitions/grib2/tables/19/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/19/4.2.0.5.table b/definitions/grib2/tables/19/4.2.0.5.table
index d28169fe1..4550220b6 100644
--- a/definitions/grib2/tables/19/4.2.0.5.table
+++ b/definitions/grib2/tables/19/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/19/4.2.0.6.table b/definitions/grib2/tables/19/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/19/4.2.0.6.table
+++ b/definitions/grib2/tables/19/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.0.7.table b/definitions/grib2/tables/19/4.2.0.7.table
index 5e86b2b7a..aff6a6516 100644
--- a/definitions/grib2/tables/19/4.2.0.7.table
+++ b/definitions/grib2/tables/19/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/19/4.2.1.0.table b/definitions/grib2/tables/19/4.2.1.0.table
index 4f6c5ea69..e906af726 100644
--- a/definitions/grib2/tables/19/4.2.1.0.table
+++ b/definitions/grib2/tables/19/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/19/4.2.1.1.table b/definitions/grib2/tables/19/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/19/4.2.1.1.table
+++ b/definitions/grib2/tables/19/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.1.2.table b/definitions/grib2/tables/19/4.2.1.2.table
index ca130e960..ec9b11d41 100644
--- a/definitions/grib2/tables/19/4.2.1.2.table
+++ b/definitions/grib2/tables/19/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/19/4.2.10.0.table b/definitions/grib2/tables/19/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/19/4.2.10.0.table
+++ b/definitions/grib2/tables/19/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/19/4.2.10.191.table b/definitions/grib2/tables/19/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/19/4.2.10.191.table
+++ b/definitions/grib2/tables/19/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/19/4.2.2.0.table b/definitions/grib2/tables/19/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/19/4.2.2.0.table
+++ b/definitions/grib2/tables/19/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.2.3.table b/definitions/grib2/tables/19/4.2.2.3.table
index 7c5614cdb..447e4f9cb 100644
--- a/definitions/grib2/tables/19/4.2.2.3.table
+++ b/definitions/grib2/tables/19/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/19/4.2.2.4.table b/definitions/grib2/tables/19/4.2.2.4.table
index 5edfd3b7e..bb54fac22 100644
--- a/definitions/grib2/tables/19/4.2.2.4.table
+++ b/definitions/grib2/tables/19/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
-6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
-7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
-8 8 Drought Code [Canadian Forest Service] (Numeric)
-9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
-10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
-11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
+5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
+8 8 Drought Code (Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.3.1.table b/definitions/grib2/tables/19/4.2.3.1.table
index 71f896fd7..8e0793fe0 100644
--- a/definitions/grib2/tables/19/4.2.3.1.table
+++ b/definitions/grib2/tables/19/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/2/4.2.0.2.table b/definitions/grib2/tables/2/4.2.0.2.table
index f45206bff..1ec945102 100644
--- a/definitions/grib2/tables/2/4.2.0.2.table
+++ b/definitions/grib2/tables/2/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Product Discipline 0: Meteorological products, Parameter Category 2: Momentum
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,7 +21,7 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
 23 23 u-component of wind (gust) (m s-1)
 24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
diff --git a/definitions/grib2/tables/20/4.2.0.0.table b/definitions/grib2/tables/20/4.2.0.0.table
index 1682411de..7201a8667 100644
--- a/definitions/grib2/tables/20/4.2.0.0.table
+++ b/definitions/grib2/tables/20/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/20/4.2.0.1.table b/definitions/grib2/tables/20/4.2.0.1.table
index d83267a4c..75df7d4ea 100644
--- a/definitions/grib2/tables/20/4.2.0.1.table
+++ b/definitions/grib2/tables/20/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/20/4.2.0.15.table b/definitions/grib2/tables/20/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/20/4.2.0.15.table
+++ b/definitions/grib2/tables/20/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/20/4.2.0.17.table b/definitions/grib2/tables/20/4.2.0.17.table
index 913a5ab37..a6799631f 100644
--- a/definitions/grib2/tables/20/4.2.0.17.table
+++ b/definitions/grib2/tables/20/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index [LPI] (J kg-1)
+1 1 Lightning potential index (LPI) (J kg-1)
diff --git a/definitions/grib2/tables/20/4.2.0.18.table b/definitions/grib2/tables/20/4.2.0.18.table
index 35e23577f..9d106f419 100644
--- a/definitions/grib2/tables/20/4.2.0.18.table
+++ b/definitions/grib2/tables/20/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/20/4.2.0.19.table b/definitions/grib2/tables/20/4.2.0.19.table
index 182f1400e..e4a4e2d04 100644
--- a/definitions/grib2/tables/20/4.2.0.19.table
+++ b/definitions/grib2/tables/20/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
-29 29 Clear air turbulence [CAT] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/20/4.2.0.191.table b/definitions/grib2/tables/20/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/20/4.2.0.191.table
+++ b/definitions/grib2/tables/20/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/20/4.2.0.2.table b/definitions/grib2/tables/20/4.2.0.2.table
index fc169f9ba..5446262e6 100644
--- a/definitions/grib2/tables/20/4.2.0.2.table
+++ b/definitions/grib2/tables/20/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/20/4.2.0.20.table b/definitions/grib2/tables/20/4.2.0.20.table
index 19db8a604..efc427a19 100644
--- a/definitions/grib2/tables/20/4.2.0.20.table
+++ b/definitions/grib2/tables/20/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,7 +30,7 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/20/4.2.0.4.table b/definitions/grib2/tables/20/4.2.0.4.table
index 4d2f8d900..0a5ded2b5 100644
--- a/definitions/grib2/tables/20/4.2.0.4.table
+++ b/definitions/grib2/tables/20/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/20/4.2.0.5.table b/definitions/grib2/tables/20/4.2.0.5.table
index d28169fe1..4550220b6 100644
--- a/definitions/grib2/tables/20/4.2.0.5.table
+++ b/definitions/grib2/tables/20/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/20/4.2.0.6.table b/definitions/grib2/tables/20/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/20/4.2.0.6.table
+++ b/definitions/grib2/tables/20/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.0.7.table b/definitions/grib2/tables/20/4.2.0.7.table
index 5e86b2b7a..aff6a6516 100644
--- a/definitions/grib2/tables/20/4.2.0.7.table
+++ b/definitions/grib2/tables/20/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/20/4.2.1.0.table b/definitions/grib2/tables/20/4.2.1.0.table
index 4f6c5ea69..e906af726 100644
--- a/definitions/grib2/tables/20/4.2.1.0.table
+++ b/definitions/grib2/tables/20/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/20/4.2.1.1.table b/definitions/grib2/tables/20/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/20/4.2.1.1.table
+++ b/definitions/grib2/tables/20/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.1.2.table b/definitions/grib2/tables/20/4.2.1.2.table
index ca130e960..ec9b11d41 100644
--- a/definitions/grib2/tables/20/4.2.1.2.table
+++ b/definitions/grib2/tables/20/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/20/4.2.10.0.table b/definitions/grib2/tables/20/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/20/4.2.10.0.table
+++ b/definitions/grib2/tables/20/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/20/4.2.10.191.table b/definitions/grib2/tables/20/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/20/4.2.10.191.table
+++ b/definitions/grib2/tables/20/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/20/4.2.2.0.table b/definitions/grib2/tables/20/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/20/4.2.2.0.table
+++ b/definitions/grib2/tables/20/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.2.3.table b/definitions/grib2/tables/20/4.2.2.3.table
index 7c5614cdb..447e4f9cb 100644
--- a/definitions/grib2/tables/20/4.2.2.3.table
+++ b/definitions/grib2/tables/20/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/20/4.2.2.4.table b/definitions/grib2/tables/20/4.2.2.4.table
index 5edfd3b7e..bb54fac22 100644
--- a/definitions/grib2/tables/20/4.2.2.4.table
+++ b/definitions/grib2/tables/20/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
-6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
-7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
-8 8 Drought Code [Canadian Forest Service] (Numeric)
-9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
-10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
-11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
+5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
+8 8 Drought Code (Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.3.1.table b/definitions/grib2/tables/20/4.2.3.1.table
index 71f896fd7..8e0793fe0 100644
--- a/definitions/grib2/tables/20/4.2.3.1.table
+++ b/definitions/grib2/tables/20/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/21/4.2.0.0.table b/definitions/grib2/tables/21/4.2.0.0.table
index 1682411de..7201a8667 100644
--- a/definitions/grib2/tables/21/4.2.0.0.table
+++ b/definitions/grib2/tables/21/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/21/4.2.0.1.table b/definitions/grib2/tables/21/4.2.0.1.table
index d83267a4c..75df7d4ea 100644
--- a/definitions/grib2/tables/21/4.2.0.1.table
+++ b/definitions/grib2/tables/21/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/21/4.2.0.15.table b/definitions/grib2/tables/21/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/21/4.2.0.15.table
+++ b/definitions/grib2/tables/21/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/21/4.2.0.17.table b/definitions/grib2/tables/21/4.2.0.17.table
index 913a5ab37..a6799631f 100644
--- a/definitions/grib2/tables/21/4.2.0.17.table
+++ b/definitions/grib2/tables/21/4.2.0.17.table
@@ -1,3 +1,3 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index [LPI] (J kg-1)
+1 1 Lightning potential index (LPI) (J kg-1)
diff --git a/definitions/grib2/tables/21/4.2.0.18.table b/definitions/grib2/tables/21/4.2.0.18.table
index 35e23577f..9d106f419 100644
--- a/definitions/grib2/tables/21/4.2.0.18.table
+++ b/definitions/grib2/tables/21/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/21/4.2.0.19.table b/definitions/grib2/tables/21/4.2.0.19.table
index 182f1400e..e4a4e2d04 100644
--- a/definitions/grib2/tables/21/4.2.0.19.table
+++ b/definitions/grib2/tables/21/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
-29 29 Clear air turbulence [CAT] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/21/4.2.0.191.table b/definitions/grib2/tables/21/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/21/4.2.0.191.table
+++ b/definitions/grib2/tables/21/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/21/4.2.0.2.table b/definitions/grib2/tables/21/4.2.0.2.table
index fc169f9ba..5446262e6 100644
--- a/definitions/grib2/tables/21/4.2.0.2.table
+++ b/definitions/grib2/tables/21/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/21/4.2.0.20.table b/definitions/grib2/tables/21/4.2.0.20.table
index 19db8a604..efc427a19 100644
--- a/definitions/grib2/tables/21/4.2.0.20.table
+++ b/definitions/grib2/tables/21/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -30,7 +30,7 @@
 62 62 Height of maximum mass density (m)
 63 63 Column-averaged mass density in layer (kg m-3)
 # 64-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/21/4.2.0.4.table b/definitions/grib2/tables/21/4.2.0.4.table
index 4d2f8d900..0a5ded2b5 100644
--- a/definitions/grib2/tables/21/4.2.0.4.table
+++ b/definitions/grib2/tables/21/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/21/4.2.0.5.table b/definitions/grib2/tables/21/4.2.0.5.table
index d28169fe1..4550220b6 100644
--- a/definitions/grib2/tables/21/4.2.0.5.table
+++ b/definitions/grib2/tables/21/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/21/4.2.0.6.table b/definitions/grib2/tables/21/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/21/4.2.0.6.table
+++ b/definitions/grib2/tables/21/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.0.7.table b/definitions/grib2/tables/21/4.2.0.7.table
index 5e86b2b7a..aff6a6516 100644
--- a/definitions/grib2/tables/21/4.2.0.7.table
+++ b/definitions/grib2/tables/21/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/21/4.2.1.0.table b/definitions/grib2/tables/21/4.2.1.0.table
index 4f6c5ea69..e906af726 100644
--- a/definitions/grib2/tables/21/4.2.1.0.table
+++ b/definitions/grib2/tables/21/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/21/4.2.1.1.table b/definitions/grib2/tables/21/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/21/4.2.1.1.table
+++ b/definitions/grib2/tables/21/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.1.2.table b/definitions/grib2/tables/21/4.2.1.2.table
index ca130e960..ec9b11d41 100644
--- a/definitions/grib2/tables/21/4.2.1.2.table
+++ b/definitions/grib2/tables/21/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/21/4.2.10.0.table b/definitions/grib2/tables/21/4.2.10.0.table
index 48362c76a..095f51bdf 100644
--- a/definitions/grib2/tables/21/4.2.10.0.table
+++ b/definitions/grib2/tables/21/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/21/4.2.10.191.table b/definitions/grib2/tables/21/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/21/4.2.10.191.table
+++ b/definitions/grib2/tables/21/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/21/4.2.2.0.table b/definitions/grib2/tables/21/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/21/4.2.2.0.table
+++ b/definitions/grib2/tables/21/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.2.3.table b/definitions/grib2/tables/21/4.2.2.3.table
index 7c5614cdb..447e4f9cb 100644
--- a/definitions/grib2/tables/21/4.2.2.3.table
+++ b/definitions/grib2/tables/21/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/21/4.2.2.4.table b/definitions/grib2/tables/21/4.2.2.4.table
index 5edfd3b7e..bb54fac22 100644
--- a/definitions/grib2/tables/21/4.2.2.4.table
+++ b/definitions/grib2/tables/21/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
-6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
-7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
-8 8 Drought Code [Canadian Forest Service] (Numeric)
-9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
-10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
-11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
+5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
+8 8 Drought Code (Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.3.1.table b/definitions/grib2/tables/21/4.2.3.1.table
index 2467b58cb..9fdeb0385 100644
--- a/definitions/grib2/tables/21/4.2.3.1.table
+++ b/definitions/grib2/tables/21/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/22/4.5.table b/definitions/grib2/tables/22/4.5.table
index 35df9e2aa..c14343e74 100644
--- a/definitions/grib2/tables/22/4.5.table
+++ b/definitions/grib2/tables/22/4.5.table
@@ -10,18 +10,18 @@
 8 sfc Nominal top of the atmosphere (-)
 9 9 Sea bottom (-)
 10 10 Entire atmosphere (-)
-11 11 Cumulonimbus [CB] base (m)
-12 12 Cumulonimbus [CB] top (m)
-13 13 Lowest level where vertically integrated cloud cover exceeds the specified percentage [cloud base for a given percentage cloud cover] (%)
+11 11 Cumulonimbus (CB) base (m)
+12 12 Cumulonimbus (CB) top (m)
+13 13 Lowest level where vertically integrated cloud cover exceeds the specified percentage (cloud base for a given percentage cloud cover) (%)
 14 14 Level of free convection (LFC)
 15 15 Convective condensation level (CCL)
 16 16 Level of neutral buoyancy or equilibrium level (LNB)
 # 17-19 Reserved 
 20 20 Isothermal level (K)
-21 21 Lowest level where mass density exceeds the specified value [base for a given threshold of mass density] (kg m-3)
-22 22 Highest level where mass density exceeds the specified value [top for a given threshold of mass density] (kg m-3)
-23 23 Lowest level where air concentration exceeds the specified value [base for a given threshold of air concentration] (Bq m-3)
-24 24 Highest level where air concentration exceeds the specified value [top for a given threshold of air concentration] (Bq m-3)
+21 21 Lowest level where mass density exceeds the specified value (base for a given threshold of mass density) (kg m-3)
+22 22 Highest level where mass density exceeds the specified value (top for a given threshold of mass density) (kg m-3)
+23 23 Lowest level where air concentration exceeds the specified value (base for a given threshold of air concentration) (Bq m-3)
+24 24 Highest level where air concentration exceeds the specified value (top for a given threshold of air concentration) (Bq m-3)
 # 25-99 Reserved 
 100 pl Isobaric surface (Pa)
 101 sfc Mean sea level 
@@ -30,7 +30,7 @@
 104 104 Sigma level (sigma value)
 105 ml Hybrid level (-)
 106 sfc Depth below land surface (m)
-107 pt Isentropic [theta] level (K)
+107 pt Isentropic (theta) level (K)
 108 108 Level at specified pressure difference from ground to level (Pa)
 109 pv Potential vorticity surface (K m2 kg-1 s-1)
 110 110 Reserved 
diff --git a/definitions/grib2/tables/23/4.2.0.0.table b/definitions/grib2/tables/23/4.2.0.0.table
index 1682411de..7201a8667 100644
--- a/definitions/grib2/tables/23/4.2.0.0.table
+++ b/definitions/grib2/tables/23/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/23/4.2.0.1.table b/definitions/grib2/tables/23/4.2.0.1.table
index 90a3251a5..dee95505d 100644
--- a/definitions/grib2/tables/23/4.2.0.1.table
+++ b/definitions/grib2/tables/23/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/23/4.2.0.15.table b/definitions/grib2/tables/23/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/23/4.2.0.15.table
+++ b/definitions/grib2/tables/23/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/23/4.2.0.17.table b/definitions/grib2/tables/23/4.2.0.17.table
index 9cf729a7b..ce1867aca 100644
--- a/definitions/grib2/tables/23/4.2.0.17.table
+++ b/definitions/grib2/tables/23/4.2.0.17.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index [LPI] (J kg-1)
+1 1 Lightning potential index (LPI) (J kg-1)
 2 2 Cloud-to-ground Lightning flash density (km-2 day-1)
 3 3 Cloud-to-cloud Lightning flash density (km-2 day-1)
 4 4 Total Lightning flash density (km-2 day-1)
diff --git a/definitions/grib2/tables/23/4.2.0.18.table b/definitions/grib2/tables/23/4.2.0.18.table
index 35e23577f..9d106f419 100644
--- a/definitions/grib2/tables/23/4.2.0.18.table
+++ b/definitions/grib2/tables/23/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/23/4.2.0.19.table b/definitions/grib2/tables/23/4.2.0.19.table
index 182f1400e..e4a4e2d04 100644
--- a/definitions/grib2/tables/23/4.2.0.19.table
+++ b/definitions/grib2/tables/23/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
-29 29 Clear air turbulence [CAT] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/23/4.2.0.191.table b/definitions/grib2/tables/23/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/23/4.2.0.191.table
+++ b/definitions/grib2/tables/23/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/23/4.2.0.2.table b/definitions/grib2/tables/23/4.2.0.2.table
index fc169f9ba..5446262e6 100644
--- a/definitions/grib2/tables/23/4.2.0.2.table
+++ b/definitions/grib2/tables/23/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/23/4.2.0.20.table b/definitions/grib2/tables/23/4.2.0.20.table
index a79343cd1..9e6ac3c05 100644
--- a/definitions/grib2/tables/23/4.2.0.20.table
+++ b/definitions/grib2/tables/23/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,14 +13,14 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 15 15 Dry deposition velocity (m/s)
 16 16 Mass mixing ratio with respect to dry air (kg/kg)
 17 17 Mass mixing ratio with respect to wet air (kg/kg)
 # 18-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -45,7 +45,7 @@
 74 74 Column-integrated release rate from evaporating convective precipitation (kg m-2 s-1)
 75 75 Wildfire flux (kg m-2 s-1)
 # 76-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/23/4.2.0.4.table b/definitions/grib2/tables/23/4.2.0.4.table
index 4d2f8d900..0a5ded2b5 100644
--- a/definitions/grib2/tables/23/4.2.0.4.table
+++ b/definitions/grib2/tables/23/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/23/4.2.0.5.table b/definitions/grib2/tables/23/4.2.0.5.table
index d28169fe1..4550220b6 100644
--- a/definitions/grib2/tables/23/4.2.0.5.table
+++ b/definitions/grib2/tables/23/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/23/4.2.0.6.table b/definitions/grib2/tables/23/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/23/4.2.0.6.table
+++ b/definitions/grib2/tables/23/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.0.7.table b/definitions/grib2/tables/23/4.2.0.7.table
index 5e86b2b7a..aff6a6516 100644
--- a/definitions/grib2/tables/23/4.2.0.7.table
+++ b/definitions/grib2/tables/23/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/23/4.2.1.0.table b/definitions/grib2/tables/23/4.2.1.0.table
index 4f6c5ea69..e906af726 100644
--- a/definitions/grib2/tables/23/4.2.1.0.table
+++ b/definitions/grib2/tables/23/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/23/4.2.1.1.table b/definitions/grib2/tables/23/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/23/4.2.1.1.table
+++ b/definitions/grib2/tables/23/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.1.2.table b/definitions/grib2/tables/23/4.2.1.2.table
index ca130e960..ec9b11d41 100644
--- a/definitions/grib2/tables/23/4.2.1.2.table
+++ b/definitions/grib2/tables/23/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/23/4.2.10.0.table b/definitions/grib2/tables/23/4.2.10.0.table
index 57cdfcc15..6a60ba8aa 100644
--- a/definitions/grib2/tables/23/4.2.10.0.table
+++ b/definitions/grib2/tables/23/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/23/4.2.10.191.table b/definitions/grib2/tables/23/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/23/4.2.10.191.table
+++ b/definitions/grib2/tables/23/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/23/4.2.10.4.table b/definitions/grib2/tables/23/4.2.10.4.table
index 72f5ea3c8..69ba0cc66 100644
--- a/definitions/grib2/tables/23/4.2.10.4.table
+++ b/definitions/grib2/tables/23/4.2.10.4.table
@@ -13,11 +13,11 @@
 13 13 Attenuation coefficient of water with respect to solar radiation (/m)
 14 14 Water depth (m)
 15 15 Water temperature (K)
-16 16 Water density [rho] (kg m-3)
-17 17 Water density anomaly [sigma] (kg m-3)
-18 18 Water potential temperature [theta] (K)
-19 19 Water potential density [rho theta] (kg m-3)
-20 20 Water potential density anomaly [sigma theta] (kg m-3)
+16 16 Water density (rho) (kg m-3)
+17 17 Water density anomaly (sigma) (kg m-3)
+18 18 Water potential temperature (theta) (K)
+19 19 Water potential density (rho theta) (kg m-3)
+20 20 Water potential density anomaly (sigma theta) (kg m-3)
 21 21 Practical salinity (Numeric)
 # 22-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/23/4.2.2.0.table b/definitions/grib2/tables/23/4.2.2.0.table
index 318d2af45..f11616d7c 100644
--- a/definitions/grib2/tables/23/4.2.2.0.table
+++ b/definitions/grib2/tables/23/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 # 39-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.2.3.table b/definitions/grib2/tables/23/4.2.2.3.table
index 7c5614cdb..447e4f9cb 100644
--- a/definitions/grib2/tables/23/4.2.2.3.table
+++ b/definitions/grib2/tables/23/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/23/4.2.2.4.table b/definitions/grib2/tables/23/4.2.2.4.table
index 5edfd3b7e..bb54fac22 100644
--- a/definitions/grib2/tables/23/4.2.2.4.table
+++ b/definitions/grib2/tables/23/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
-6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
-7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
-8 8 Drought Code [Canadian Forest Service] (Numeric)
-9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
-10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
-11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
+5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
+8 8 Drought Code (Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.3.1.table b/definitions/grib2/tables/23/4.2.3.1.table
index 7c44965f4..7d4364f4d 100644
--- a/definitions/grib2/tables/23/4.2.3.1.table
+++ b/definitions/grib2/tables/23/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/24/4.2.0.0.table b/definitions/grib2/tables/24/4.2.0.0.table
index 1682411de..7201a8667 100644
--- a/definitions/grib2/tables/24/4.2.0.0.table
+++ b/definitions/grib2/tables/24/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dewpoint temperature (K)
-7 7 Dewpoint depression [or deficit] (K)
+7 7 Dewpoint depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 21 21 Apparent temperature (K)
diff --git a/definitions/grib2/tables/24/4.2.0.1.table b/definitions/grib2/tables/24/4.2.0.1.table
index 2b63c1eae..11c8c61c5 100644
--- a/definitions/grib2/tables/24/4.2.0.1.table
+++ b/definitions/grib2/tables/24/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water=vapour + cloud water/ice) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total condensate (kg/kg)
 81 81 Total column-integrated condensate (kg m-2)
@@ -90,8 +90,8 @@
 88 88 Categorical convective precipitation (Code table 4.222)
 # 89 Reserved
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 93 93 Relative humidity with respect to water (%)
 94 94 Relative humidity with respect to ice (%)
 95 95 Freezing or frozen precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/24/4.2.0.15.table b/definitions/grib2/tables/24/4.2.0.15.table
index 7805f9abc..dfbc4d12f 100644
--- a/definitions/grib2/tables/24/4.2.0.15.table
+++ b/definitions/grib2/tables/24/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically integrated liquid water [VIL] (kg m-2)
+3 3 Vertically integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/24/4.2.0.17.table b/definitions/grib2/tables/24/4.2.0.17.table
index 9cf729a7b..ce1867aca 100644
--- a/definitions/grib2/tables/24/4.2.0.17.table
+++ b/definitions/grib2/tables/24/4.2.0.17.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Lightning strike density (m-2 s-1)
-1 1 Lightning potential index [LPI] (J kg-1)
+1 1 Lightning potential index (LPI) (J kg-1)
 2 2 Cloud-to-ground Lightning flash density (km-2 day-1)
 3 3 Cloud-to-cloud Lightning flash density (km-2 day-1)
 4 4 Total Lightning flash density (km-2 day-1)
diff --git a/definitions/grib2/tables/24/4.2.0.18.table b/definitions/grib2/tables/24/4.2.0.18.table
index 35e23577f..9d106f419 100644
--- a/definitions/grib2/tables/24/4.2.0.18.table
+++ b/definitions/grib2/tables/24/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 14 14 Specific activity concentration (Bq kg-1)
 15 15 Maximum of air concentration in layer (Bq m-3)
 16 16 Height of maximum air concentration (m)
diff --git a/definitions/grib2/tables/24/4.2.0.19.table b/definitions/grib2/tables/24/4.2.0.19.table
index 956d74f58..c8d0f991e 100644
--- a/definitions/grib2/tables/24/4.2.0.19.table
+++ b/definitions/grib2/tables/24/4.2.0.19.table
@@ -21,14 +21,14 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather ((Code table 4.225))
 26 26 Convective outlook ((Code table 4.224))
 27 27 Icing scenario ((Code table 4.227))
-28 28 Mountain wave turbulence [eddy dissipation rate] (m2/3 s-1)
-29 29 Clear air turbulence [CAT] (m2/3 s-1)
+28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
+29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
 31 31 Maximum of eddy dissipation parameter in layer (m2/3 s-1)
 32 32 Highest freezing level (m)
diff --git a/definitions/grib2/tables/24/4.2.0.191.table b/definitions/grib2/tables/24/4.2.0.191.table
index aa2f7624c..e3bba0ebe 100644
--- a/definitions/grib2/tables/24/4.2.0.191.table
+++ b/definitions/grib2/tables/24/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/24/4.2.0.2.table b/definitions/grib2/tables/24/4.2.0.2.table
index fc169f9ba..5446262e6 100644
--- a/definitions/grib2/tables/24/4.2.0.2.table
+++ b/definitions/grib2/tables/24/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2/s)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/24/4.2.0.20.table b/definitions/grib2/tables/24/4.2.0.20.table
index e467dec0e..042732760 100644
--- a/definitions/grib2/tables/24/4.2.0.20.table
+++ b/definitions/grib2/tables/24/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,14 +13,14 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 15 15 Dry deposition velocity (m/s)
 16 16 Mass mixing ratio with respect to dry air (kg/kg)
 17 17 Mass mixing ratio with respect to wet air (kg/kg)
 # 18-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -47,7 +47,7 @@
 76 76 Emission rate (kg kg-1 s-1)
 77 77 Surface emission flux (kg m-2 s-1)
 # 78-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/24/4.2.0.4.table b/definitions/grib2/tables/24/4.2.0.4.table
index 4d2f8d900..0a5ded2b5 100644
--- a/definitions/grib2/tables/24/4.2.0.4.table
+++ b/definitions/grib2/tables/24/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wavelength] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wavelength) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -15,7 +15,7 @@
 13 13 Direct short-wave radiation flux (W m-2)
 14 14 Diffuse short-wave radiation flux (W m-2)
 # 15-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 52 52 Downward short-wave radiation flux, clear sky (W m-2)
 53 53 Upward short-wave radiation flux, clear sky (W m-2)
diff --git a/definitions/grib2/tables/24/4.2.0.5.table b/definitions/grib2/tables/24/4.2.0.5.table
index d28169fe1..4550220b6 100644
--- a/definitions/grib2/tables/24/4.2.0.5.table
+++ b/definitions/grib2/tables/24/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/24/4.2.0.6.table b/definitions/grib2/tables/24/4.2.0.6.table
index 462ea007f..1483d8cb3 100644
--- a/definitions/grib2/tables/24/4.2.0.6.table
+++ b/definitions/grib2/tables/24/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
@@ -43,7 +43,7 @@
 # 41-46 Reserved 
 47 47 Volume fraction of cloud water droplets (Numeric)
 48 48 Volume fraction of cloud ice particles (Numeric)
-49 49 Volume fraction of cloud [ice and/or water] (Numeric)
+49 49 Volume fraction of cloud (ice and/or water) (Numeric)
 # 50-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.0.7.table b/definitions/grib2/tables/24/4.2.0.7.table
index 5e86b2b7a..aff6a6516 100644
--- a/definitions/grib2/tables/24/4.2.0.7.table
+++ b/definitions/grib2/tables/24/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/24/4.2.1.0.table b/definitions/grib2/tables/24/4.2.1.0.table
index 4f6c5ea69..e906af726 100644
--- a/definitions/grib2/tables/24/4.2.1.0.table
+++ b/definitions/grib2/tables/24/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/24/4.2.1.1.table b/definitions/grib2/tables/24/4.2.1.1.table
index 28cccf8b4..b488eb0bd 100644
--- a/definitions/grib2/tables/24/4.2.1.1.table
+++ b/definitions/grib2/tables/24/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.1.2.table b/definitions/grib2/tables/24/4.2.1.2.table
index ca130e960..ec9b11d41 100644
--- a/definitions/grib2/tables/24/4.2.1.2.table
+++ b/definitions/grib2/tables/24/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (/m)
diff --git a/definitions/grib2/tables/24/4.2.10.0.table b/definitions/grib2/tables/24/4.2.10.0.table
index 607869974..53c9d2421 100644
--- a/definitions/grib2/tables/24/4.2.10.0.table
+++ b/definitions/grib2/tables/24/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/24/4.2.10.191.table b/definitions/grib2/tables/24/4.2.10.191.table
index 8428cbeb9..524929e78 100644
--- a/definitions/grib2/tables/24/4.2.10.191.table
+++ b/definitions/grib2/tables/24/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 2 2 Reserved 
 3 3 Days since last observation (d)
diff --git a/definitions/grib2/tables/24/4.2.10.4.table b/definitions/grib2/tables/24/4.2.10.4.table
index 72f5ea3c8..69ba0cc66 100644
--- a/definitions/grib2/tables/24/4.2.10.4.table
+++ b/definitions/grib2/tables/24/4.2.10.4.table
@@ -13,11 +13,11 @@
 13 13 Attenuation coefficient of water with respect to solar radiation (/m)
 14 14 Water depth (m)
 15 15 Water temperature (K)
-16 16 Water density [rho] (kg m-3)
-17 17 Water density anomaly [sigma] (kg m-3)
-18 18 Water potential temperature [theta] (K)
-19 19 Water potential density [rho theta] (kg m-3)
-20 20 Water potential density anomaly [sigma theta] (kg m-3)
+16 16 Water density (rho) (kg m-3)
+17 17 Water density anomaly (sigma) (kg m-3)
+18 18 Water potential temperature (theta) (K)
+19 19 Water potential density (rho theta) (kg m-3)
+20 20 Water potential density anomaly (sigma theta) (kg m-3)
 21 21 Practical salinity (Numeric)
 # 22-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/24/4.2.2.0.table b/definitions/grib2/tables/24/4.2.2.0.table
index 7702b3d3e..ca8651cba 100644
--- a/definitions/grib2/tables/24/4.2.2.0.table
+++ b/definitions/grib2/tables/24/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,14 +30,14 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 33 33 Water runoff and drainage (kg m-2)
 34 34 Surface water runoff (kg m-2)
 35 35 Tile class (Code table 4.243)
 36 36 Tile fraction (Proportion)
 37 37 Tile percentage (%)
-38 38 Soil volumetric ice content [water equivalent] (m3 m-3)
+38 38 Soil volumetric ice content (water equivalent) (m3 m-3)
 39 39 Evapotranspiration rate (kg m-2 s-1)
 # 40-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/24/4.2.2.3.table b/definitions/grib2/tables/24/4.2.2.3.table
index 7c5614cdb..447e4f9cb 100644
--- a/definitions/grib2/tables/24/4.2.2.3.table
+++ b/definitions/grib2/tables/24/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/24/4.2.2.4.table b/definitions/grib2/tables/24/4.2.2.4.table
index 5edfd3b7e..bb54fac22 100644
--- a/definitions/grib2/tables/24/4.2.2.4.table
+++ b/definitions/grib2/tables/24/4.2.2.4.table
@@ -4,13 +4,13 @@
 2 2 Haines index (Numeric)
 3 3 Fire burned area (%)
 4 4 Fosberg index (Numeric)
-5 5 Forest Fire Weather Index [Canadian Forest Service] (Numeric)
-6 6 Fine Fuel Moisture Code [Canadian Forest Service] (Numeric)
-7 7 Duff Moisture Code [Canadian Forest Service] (Numeric)
-8 8 Drought Code [Canadian Forest Service] (Numeric)
-9 9 Initial Fire Spread Index [Canadian Forest Service] (Numeric)
-10 10 Fire Buildup Index [Canadian Forest Service] (Numeric)
-11 11 Fire Daily Severity Rating [Canadian Forest Service] (Numeric)
+5 5 Forest Fire Weather Index (Canadian Forest Service) (Numeric)
+6 6 Fine Fuel Moisture Code (Canadian Forest Service) (Numeric)
+7 7 Duff Moisture Code (Canadian Forest Service) (Numeric)
+8 8 Drought Code (Canadian Forest Service) (Numeric)
+9 9 Initial Fire Spread Index (Canadian Forest Service) (Numeric)
+10 10 Fire Buildup Index (Canadian Forest Service) (Numeric)
+11 11 Fire Daily Severity Rating (Canadian Forest Service) (Numeric)
 # 12-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.3.1.table b/definitions/grib2/tables/24/4.2.3.1.table
index 7c44965f4..7d4364f4d 100644
--- a/definitions/grib2/tables/24/4.2.3.1.table
+++ b/definitions/grib2/tables/24/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/3/4.2.0.2.table b/definitions/grib2/tables/3/4.2.0.2.table
index f45206bff..1ec945102 100644
--- a/definitions/grib2/tables/3/4.2.0.2.table
+++ b/definitions/grib2/tables/3/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Product Discipline 0: Meteorological products, Parameter Category 2: Momentum
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,7 +21,7 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
 23 23 u-component of wind (gust) (m s-1)
 24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
diff --git a/definitions/grib2/tables/4/4.2.0.0.table b/definitions/grib2/tables/4/4.2.0.0.table
index 5330f55a8..0386b8cd2 100644
--- a/definitions/grib2/tables/4/4.2.0.0.table
+++ b/definitions/grib2/tables/4/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression [or deficit] (K)
+7 7 Dew point depression (or deficit) (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
diff --git a/definitions/grib2/tables/4/4.2.0.1.table b/definitions/grib2/tables/4/4.2.0.1.table
index 32b55a178..6012e4beb 100644
--- a/definitions/grib2/tables/4/4.2.0.1.table
+++ b/definitions/grib2/tables/4/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation [non-convective] (kg m-2)
+9 9 Large scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg kg-1)
+32 32 Graupel (snow pellets)   (kg kg-1)  
 33 33 Categorical rain (Code table 4.222)
 34 34 Categorical freezing rain (Code table 4.222)
 35 35 Categorical ice pellets (Code table 4.222)
diff --git a/definitions/grib2/tables/4/4.2.0.15.table b/definitions/grib2/tables/4/4.2.0.15.table
index a053a9aea..bb419178b 100644
--- a/definitions/grib2/tables/4/4.2.0.15.table
+++ b/definitions/grib2/tables/4/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 # 9-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/4/4.2.0.191.table b/definitions/grib2/tables/4/4.2.0.191.table
index 4c5f401cd..affb98f42 100644
--- a/definitions/grib2/tables/4/4.2.0.191.table
+++ b/definitions/grib2/tables/4/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Product Discipline 0: Meteorological products, Parameter Category 191: Miscellaneous
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 # 1-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/4/4.2.0.2.table b/definitions/grib2/tables/4/4.2.0.2.table
index c06eff682..1ec945102 100644
--- a/definitions/grib2/tables/4/4.2.0.2.table
+++ b/definitions/grib2/tables/4/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Product Discipline 0: Meteorological products, Parameter Category 2: Momentum
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
-23 23 u-component of wind [gust] (m s-1)
-24 24 v-component of wind [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
+23 23 u-component of wind (gust) (m s-1)
+24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/4/4.2.0.20.table b/definitions/grib2/tables/4/4.2.0.20.table
index d57c9a208..b72d5fe5e 100644
--- a/definitions/grib2/tables/4/4.2.0.20.table
+++ b/definitions/grib2/tables/4/4.2.0.20.table
@@ -1,7 +1,7 @@
-0 0	Mass density [concentration]	(kg.m-3)
-1 1	Total column [integrated mass density]	(kg.m-2)
-2 2	Volume mixing ratio [mole fraction in air]	(mole.mole-1)
-3 3	Mass mixing ratio [mass fraction in air]	(kg.kg-1)
+0 0	Mass density (concentration)	(kg.m-3)
+1 1	Total column (integrated mass density)	(kg.m-2)
+2 2	Volume mixing ratio (mole fraction in air)	(mole.mole-1)
+3 3	Mass mixing ratio (mass fraction in air)	(kg.kg-1)
 4 4	Surface dry deposition mass flux	(kg.m-2.s-1)
 5 5	Surface wet deposition mass flux	(kg.m-2.s-1)
 6 6	Atmosphere emission mass flux	(kg.m-2.s-1)
diff --git a/definitions/grib2/tables/4/4.2.0.4.table b/definitions/grib2/tables/4/4.2.0.4.table
index 882750d0c..815c184a2 100644
--- a/definitions/grib2/tables/4/4.2.0.4.table
+++ b/definitions/grib2/tables/4/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Product Discipline 0: Meteorological products, Parameter Category 4: Short-wave Radiation
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 9 8 Upward short-wave radiation flux (W m-2)
 # 9-191 Reserved
diff --git a/definitions/grib2/tables/4/4.2.0.5.table b/definitions/grib2/tables/4/4.2.0.5.table
index 1965e7925..1b57fa301 100644
--- a/definitions/grib2/tables/4/4.2.0.5.table
+++ b/definitions/grib2/tables/4/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Product Discipline 0: Meteorological products, Parameter Category 5: Long-wave Radiation
-0 0 Net long wave radiation flux [surface] (W m-2)
-1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long wave radiation flux (surface) (W m-2)
+1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/4/4.2.0.7.table b/definitions/grib2/tables/4/4.2.0.7.table
index c44aebf0b..78374fde5 100644
--- a/definitions/grib2/tables/4/4.2.0.7.table
+++ b/definitions/grib2/tables/4/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Product Discipline 0: Meteorological products, Parameter Category 7: Thermodynamic Stability Indices
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 #13-191 Reserved
 #192-254 Reserved for local use
diff --git a/definitions/grib2/tables/4/4.2.1.0.table b/definitions/grib2/tables/4/4.2.1.0.table
index 7b47afa5a..1e867e1cb 100644
--- a/definitions/grib2/tables/4/4.2.1.0.table
+++ b/definitions/grib2/tables/4/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Product Discipline 1: Hydrologic products, Parameter Category 0: Hydrology basic products
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely sensed snow cover (Code table 4.215)
 3 3 Elevation of snow covered terrain (Code table 4.216)
 4 4 Snow water equivalent percent of normal (%)
diff --git a/definitions/grib2/tables/4/4.2.1.1.table b/definitions/grib2/tables/4/4.2.1.1.table
index 1255eaa81..b7342ef2f 100644
--- a/definitions/grib2/tables/4/4.2.1.1.table
+++ b/definitions/grib2/tables/4/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Product Discipline 1: Hydrologic products, Parameter Category 1: Hydrology probabilities 
-0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 #3-191 Reserved
 #192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/4/4.2.10.0.table b/definitions/grib2/tables/4/4.2.10.0.table
index 532ff2baf..479e26d51 100644
--- a/definitions/grib2/tables/4/4.2.10.0.table
+++ b/definitions/grib2/tables/4/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Product Discipline 10: Oceanographic products, Parameter Category 0: Waves
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/4/4.2.2.0.table b/definitions/grib2/tables/4/4.2.2.0.table
index 8e7e74d66..67ad39b6c 100644
--- a/definitions/grib2/tables/4/4.2.2.0.table
+++ b/definitions/grib2/tables/4/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Product Discipline 2: Land surface products, Parameter Category 0: Vegetation/Biomass
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
diff --git a/definitions/grib2/tables/4/4.2.2.3.table b/definitions/grib2/tables/4/4.2.2.3.table
index 988d3edae..d6376fecb 100644
--- a/definitions/grib2/tables/4/4.2.2.3.table
+++ b/definitions/grib2/tables/4/4.2.2.3.table
@@ -4,12 +4,12 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
 # 11-191 Reserved
 #192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/5/4.2.0.0.table b/definitions/grib2/tables/5/4.2.0.0.table
index a224897a7..bf1638d8a 100644
--- a/definitions/grib2/tables/5/4.2.0.0.table
+++ b/definitions/grib2/tables/5/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression [or deficit] (K)
+7 7 Dew point depression (or deficit) (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
diff --git a/definitions/grib2/tables/5/4.2.0.1.table b/definitions/grib2/tables/5/4.2.0.1.table
index ba0b9a131..eff557718 100644
--- a/definitions/grib2/tables/5/4.2.0.1.table
+++ b/definitions/grib2/tables/5/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation [non-convective] (kg m-2)
+9 9 Large scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg kg-1)
+32 32 Graupel (snow pellets) (kg kg-1)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
diff --git a/definitions/grib2/tables/5/4.2.0.15.table b/definitions/grib2/tables/5/4.2.0.15.table
index b242517b3..796fc2a83 100644
--- a/definitions/grib2/tables/5/4.2.0.15.table
+++ b/definitions/grib2/tables/5/4.2.0.15.table
@@ -5,7 +5,7 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.19.table b/definitions/grib2/tables/5/4.2.0.19.table
index 532651b54..2ed0264d6 100644
--- a/definitions/grib2/tables/5/4.2.0.19.table
+++ b/definitions/grib2/tables/5/4.2.0.19.table
@@ -21,6 +21,6 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
-23 23 Supercooled large droplet probability [see Note 4] (%)
+22 22 Clear air turbulence (CAT) (%)
+23 23 Supercooled large droplet probability (see Note 4) (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.191.table b/definitions/grib2/tables/5/4.2.0.191.table
index cb194bb78..27ad3815d 100644
--- a/definitions/grib2/tables/5/4.2.0.191.table
+++ b/definitions/grib2/tables/5/4.2.0.191.table
@@ -1,3 +1,3 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.2.table b/definitions/grib2/tables/5/4.2.0.2.table
index 36ee8b04a..cf930adf5 100644
--- a/definitions/grib2/tables/5/4.2.0.2.table
+++ b/definitions/grib2/tables/5/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
-23 23 u-component of wind [gust] (m s-1)
-24 24 v-component of wind [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
+23 23 u-component of wind (gust) (m s-1)
+24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/5/4.2.0.4.table b/definitions/grib2/tables/5/4.2.0.4.table
index 8813abb8a..365fd98a1 100644
--- a/definitions/grib2/tables/5/4.2.0.4.table
+++ b/definitions/grib2/tables/5/4.2.0.4.table
@@ -1,17 +1,17 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
 10 10 Photosynthetically active radiation (W m-2)
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index  (Numeric)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.5.table b/definitions/grib2/tables/5/4.2.0.5.table
index 8961eb233..719325746 100644
--- a/definitions/grib2/tables/5/4.2.0.5.table
+++ b/definitions/grib2/tables/5/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long wave radiation flux [surface] (W m-2)
-1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long wave radiation flux (surface) (W m-2)
+1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/5/4.2.0.6.table b/definitions/grib2/tables/5/4.2.0.6.table
index b5f098634..58ad17ca7 100644
--- a/definitions/grib2/tables/5/4.2.0.6.table
+++ b/definitions/grib2/tables/5/4.2.0.6.table
@@ -24,5 +24,5 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.7.table b/definitions/grib2/tables/5/4.2.0.7.table
index 933cf3d28..34b082d94 100644
--- a/definitions/grib2/tables/5/4.2.0.7.table
+++ b/definitions/grib2/tables/5/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,6 +10,6 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.1.0.table b/definitions/grib2/tables/5/4.2.1.0.table
index dd64515d5..9d1f78180 100644
--- a/definitions/grib2/tables/5/4.2.1.0.table
+++ b/definitions/grib2/tables/5/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely sensed snow cover ((code table 4.215))
 3 3 Elevation of snow covered terrain ((code table 4.216))
 4 4 Snow water equivalent percent of normal (%)
diff --git a/definitions/grib2/tables/5/4.2.1.1.table b/definitions/grib2/tables/5/4.2.1.1.table
index 1a600f493..56bf798d4 100644
--- a/definitions/grib2/tables/5/4.2.1.1.table
+++ b/definitions/grib2/tables/5/4.2.1.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation]. (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation). (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.10.0.table b/definitions/grib2/tables/5/4.2.10.0.table
index 78aad8664..a8d4a5bf8 100644
--- a/definitions/grib2/tables/5/4.2.10.0.table
+++ b/definitions/grib2/tables/5/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/5/4.2.2.0.table b/definitions/grib2/tables/5/4.2.2.0.table
index a6de785ba..77b9faac3 100644
--- a/definitions/grib2/tables/5/4.2.2.0.table
+++ b/definitions/grib2/tables/5/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover [1=land, 0=sea] (Proportion)
+0 0 Land cover (1=land, 0=sea) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
diff --git a/definitions/grib2/tables/5/4.2.2.3.table b/definitions/grib2/tables/5/4.2.2.3.table
index 658c3691c..c5dea241d 100644
--- a/definitions/grib2/tables/5/4.2.2.3.table
+++ b/definitions/grib2/tables/5/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/6/4.2.0.0.table b/definitions/grib2/tables/6/4.2.0.0.table
index 29f504fc1..98fc9552d 100644
--- a/definitions/grib2/tables/6/4.2.0.0.table
+++ b/definitions/grib2/tables/6/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression [or deficit] (K)
+7 7 Dew point depression (or deficit) (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] - validation (K)
+18 18 Snow temperature (top of snow) - validation (K)
 19 19 Turbulent transfer coefficient for heat - validation (Numeric)
 20 20 Turbulent diffusion coefficient for heat - validation (m2 s-1)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.1.table b/definitions/grib2/tables/6/4.2.0.1.table
index 52ce6c31d..60a934b70 100644
--- a/definitions/grib2/tables/6/4.2.0.1.table
+++ b/definitions/grib2/tables/6/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation [non-convective] (kg m-2)
+9 9 Large scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category (code table (4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg kg-1)
+32 32 Graupel (snow pellets) (kg kg-1)
 33 33 Categorical rain (Code table 4.222)
 34 34 Categorical freezing rain (Code table 4.222)
 35 35 Categorical ice pellets (Code table 4.222)
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail - validation (kg m-2)
 73 73 Hail precipitation rate - validation (kg m-2 s-1)
 74 74 Total column integrated graupel - validation (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate - validation (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate - validation (kg m-2 s-1)
 76 76 Convective rain rate - validation (kg m-2 s-1)
 77 77 Large scale rain rate - validation (kg m-2 s-1)
-78 78 Total column integrated water [all components incl. precipitation] - validation (kg m-2)
+78 78 Total column integrated water (all components incl. precipitation) - validation (kg m-2)
 79 79 Evaporation rate - validation (kg m-2 s-1)
 80 80 Total Condensate - validation (kg kg-1)
 81 81 Total Column-Integrated Condensate - validation (kg m-2)
diff --git a/definitions/grib2/tables/6/4.2.0.15.table b/definitions/grib2/tables/6/4.2.0.15.table
index e4f61f192..51ea2499f 100644
--- a/definitions/grib2/tables/6/4.2.0.15.table
+++ b/definitions/grib2/tables/6/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets - validation (dB)
 10 10 Reflectivity of cloud ice - validation (dB)
 11 11 Reflectivity of snow - validation (dB)
diff --git a/definitions/grib2/tables/6/4.2.0.19.table b/definitions/grib2/tables/6/4.2.0.19.table
index fb889dde0..a710602e2 100644
--- a/definitions/grib2/tables/6/4.2.0.19.table
+++ b/definitions/grib2/tables/6/4.2.0.19.table
@@ -21,8 +21,8 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
-23 23 Supercooled large droplet probability [see Note 4] (%)
+22 22 Clear air turbulence (CAT) (%)
+23 23 Supercooled large droplet probability (see Note 4) (%)
 24 24 Convective turbulent kinetic energy - validation (J kg-1)
-25 25 Weather Interpretation ww [WMO] - validation (-)
+25 25 Weather Interpretation ww (WMO) - validation (-)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.191.table b/definitions/grib2/tables/6/4.2.0.191.table
index d83e8d840..feef9300e 100644
--- a/definitions/grib2/tables/6/4.2.0.191.table
+++ b/definitions/grib2/tables/6/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude - validation (deg N)
 2 2 Geographical longitude - validation (deg E)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.2.table b/definitions/grib2/tables/6/4.2.0.2.table
index f30a63f6c..efc60025d 100644
--- a/definitions/grib2/tables/6/4.2.0.2.table
+++ b/definitions/grib2/tables/6/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
-23 23 u-component of wind [gust] (m s-1)
-24 24 v-component of wind [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
+23 23 u-component of wind (gust) (m s-1)
+24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/6/4.2.0.20.table b/definitions/grib2/tables/6/4.2.0.20.table
index 8a96abd2d..e28466561 100644
--- a/definitions/grib2/tables/6/4.2.0.20.table
+++ b/definitions/grib2/tables/6/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density [concentration] (kg m-3)
-1 1 Column-integrated mass density [see Note 1] (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg kg-1)
+0 0 Mass density (concentration) (kg m-3)
+1 1 Column-integrated mass density (see Note 1) (kg m-2)
+2 2 Mass mixing ratio (mass fraction in air) (kg kg-1)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -10,13 +10,13 @@
 8 8 Atmosphere re-emission mass flux (kg m-2 s-1)
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol mol-1)
+52 52 Volume mixing ratio (fraction in air) (mol mol-1)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
-56 56 Changes of amount in atmosphere [see Note 1] (mol s-1)
+56 56 Changes of amount in atmosphere (see Note 1) (mol s-1)
 57 57 Total yearly average burden of the atmosphere (mol)
-58 58 Total yearly averaged atmospheric loss [see Note 1] (mol s-1)
-100 100 Surface area density [aerosol] (m-1)
+58 58 Total yearly averaged atmospheric loss (see Note 1) (mol s-1)
+100 100 Surface area density (aerosol) (m-1)
 101 101 Atmosphere optical thickness (m)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.4.table b/definitions/grib2/tables/6/4.2.0.4.table
index 8813abb8a..365fd98a1 100644
--- a/definitions/grib2/tables/6/4.2.0.4.table
+++ b/definitions/grib2/tables/6/4.2.0.4.table
@@ -1,17 +1,17 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
 10 10 Photosynthetically active radiation (W m-2)
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index  (Numeric)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.5.table b/definitions/grib2/tables/6/4.2.0.5.table
index 8961eb233..719325746 100644
--- a/definitions/grib2/tables/6/4.2.0.5.table
+++ b/definitions/grib2/tables/6/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long wave radiation flux [surface] (W m-2)
-1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long wave radiation flux (surface) (W m-2)
+1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/6/4.2.0.6.table b/definitions/grib2/tables/6/4.2.0.6.table
index 65b0a0c98..9555b7496 100644
--- a/definitions/grib2/tables/6/4.2.0.6.table
+++ b/definitions/grib2/tables/6/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base - validation (m)
 27 27 Height of convective cloud top - validation (m)
 28 28 Number concentration of cloud droplets - validation (kg-1)
diff --git a/definitions/grib2/tables/6/4.2.0.7.table b/definitions/grib2/tables/6/4.2.0.7.table
index a0e5093aa..7370541fb 100644
--- a/definitions/grib2/tables/6/4.2.0.7.table
+++ b/definitions/grib2/tables/6/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index - validation (K)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.1.0.table b/definitions/grib2/tables/6/4.2.1.0.table
index dd64515d5..9d1f78180 100644
--- a/definitions/grib2/tables/6/4.2.1.0.table
+++ b/definitions/grib2/tables/6/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely sensed snow cover ((code table 4.215))
 3 3 Elevation of snow covered terrain ((code table 4.216))
 4 4 Snow water equivalent percent of normal (%)
diff --git a/definitions/grib2/tables/6/4.2.1.1.table b/definitions/grib2/tables/6/4.2.1.1.table
index 1a600f493..56bf798d4 100644
--- a/definitions/grib2/tables/6/4.2.1.1.table
+++ b/definitions/grib2/tables/6/4.2.1.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation]. (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation). (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.10.0.table b/definitions/grib2/tables/6/4.2.10.0.table
index df2114df3..b40fa4313 100644
--- a/definitions/grib2/tables/6/4.2.10.0.table
+++ b/definitions/grib2/tables/6/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/6/4.2.10.191.table b/definitions/grib2/tables/6/4.2.10.191.table
index a938fcbb6..72cf1ce97 100644
--- a/definitions/grib2/tables/6/4.2.10.191.table
+++ b/definitions/grib2/tables/6/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Product discipline 10 - Oceanographic products, parameter category 191: miscellaneous
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3 s-1)
 #2-191 Reserved
 #192-254 Reserved for local use
diff --git a/definitions/grib2/tables/6/4.2.2.0.table b/definitions/grib2/tables/6/4.2.2.0.table
index 72e953254..900206620 100644
--- a/definitions/grib2/tables/6/4.2.2.0.table
+++ b/definitions/grib2/tables/6/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover [1=land, 0=sea] (Proportion)
+0 0 Land cover (1=land, 0=sea) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,6 +30,6 @@
 28 28 Leaf area index - validation (Numeric)
 29 29 Evergreen forest - validation (Numeric)
 30 30 Deciduous forest - validation (Numeric)
-31 31 Normalized differential vegetation index [NDVI] - validation (Numeric)
+31 31 Normalized differential vegetation index (NDVI) - validation (Numeric)
 32 32 Root depth of vegetation - validation (M)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.2.3.table b/definitions/grib2/tables/6/4.2.2.3.table
index 2b83070ca..e5b989239 100644
--- a/definitions/grib2/tables/6/4.2.2.3.table
+++ b/definitions/grib2/tables/6/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/7/4.2.0.0.table b/definitions/grib2/tables/7/4.2.0.0.table
index 836bbf336..6ed6b944a 100644
--- a/definitions/grib2/tables/7/4.2.0.0.table
+++ b/definitions/grib2/tables/7/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew point temperature (K)
-7 7 Dew point depression [or deficit] (K)
+7 7 Dew point depression (or deficit) (K)
 8 8 Lapse rate (K m-1)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] - validation (K)
+18 18 Snow temperature (top of snow) - validation (K)
 19 19 Turbulent transfer coefficient for heat - validation (Numeric)
 20 20 Turbulent diffusion coefficient for heat - validation (m2 s-1)
 #21-191 21-191 Reserved (-)
diff --git a/definitions/grib2/tables/7/4.2.0.1.table b/definitions/grib2/tables/7/4.2.0.1.table
index 6fcd1bcf0..0ab8ef361 100644
--- a/definitions/grib2/tables/7/4.2.0.1.table
+++ b/definitions/grib2/tables/7/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large scale precipitation [non-convective] (kg m-2)
+9 9 Large scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category (code table (4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg kg-1)
+32 32 Graupel (snow pellets) (kg kg-1)
 33 33 Categorical rain (Code table 4.222)
 34 34 Categorical freezing rain (Code table 4.222)
 35 35 Categorical ice pellets (Code table 4.222)
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate - validation (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate - validation (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate - validation (kg m-2 s-1)
 76 76 Convective rain rate - validation (kg m-2 s-1)
 77 77 Large scale rain rate - validation (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate - validation (kg m-2 s-1)
 80 80 Total Condensate - validation (kg kg-1)
 81 81 Total Column-Integrated Condensate - validation (kg m-2)
diff --git a/definitions/grib2/tables/7/4.2.0.15.table b/definitions/grib2/tables/7/4.2.0.15.table
index c458e895f..a42e5b7d9 100644
--- a/definitions/grib2/tables/7/4.2.0.15.table
+++ b/definitions/grib2/tables/7/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg m-1)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets - validation (dB)
 10 10 Reflectivity of cloud ice - validation (dB)
 11 11 Reflectivity of snow - validation (dB)
diff --git a/definitions/grib2/tables/7/4.2.0.18.table b/definitions/grib2/tables/7/4.2.0.18.table
index 725ac8a31..e6b3ab049 100644
--- a/definitions/grib2/tables/7/4.2.0.18.table
+++ b/definitions/grib2/tables/7/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 #14-191 9-191 Reserved
 #192-254 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/7/4.2.0.19.table b/definitions/grib2/tables/7/4.2.0.19.table
index 8e677e616..10df7506a 100644
--- a/definitions/grib2/tables/7/4.2.0.19.table
+++ b/definitions/grib2/tables/7/4.2.0.19.table
@@ -21,8 +21,8 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
-23 23 Supercooled large droplet probability [see Note 4] (%)
+22 22 Clear air turbulence (CAT) (%)
+23 23 Supercooled large droplet probability (see Note 4) (%)
 24 24 Convective turbulent kinetic energy - validation (J kg-1)
 25 25 Weather Interpretation ww (WMO) - validation
 26 26 Convective outlook (code table (4.224))
diff --git a/definitions/grib2/tables/7/4.2.0.191.table b/definitions/grib2/tables/7/4.2.0.191.table
index 0cfd33f22..6c40c61ce 100644
--- a/definitions/grib2/tables/7/4.2.0.191.table
+++ b/definitions/grib2/tables/7/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude - validation (deg N)
 2 2 Geographical longitude - validation (deg E)
 #3-191 3-191 Reserved (-)
diff --git a/definitions/grib2/tables/7/4.2.0.2.table b/definitions/grib2/tables/7/4.2.0.2.table
index c2794c6cf..8380d5160 100644
--- a/definitions/grib2/tables/7/4.2.0.2.table
+++ b/definitions/grib2/tables/7/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction [from which blowing] (deg true)
+0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
 3 3 v-component of wind (m s-1)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (s-1)
-8 8 Vertical velocity [pressure] (Pa s-1)
-9 9 Vertical velocity [geometric] (m s-1)
+8 8 Vertical velocity (pressure) (Pa s-1)
+9 9 Vertical velocity (geometric) (m s-1)
 10 10 Absolute vorticity (s-1)
 11 11 Absolute divergence (s-1)
 12 12 Relative vorticity (s-1)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m s-1)
-22 22 Wind speed [gust] (m s-1)
-23 23 u-component of wind [gust] (m s-1)
-24 24 v-component of wind [gust] (m s-1)
+22 22 Wind speed (gust) (m s-1)
+23 23 u-component of wind (gust) (m s-1)
+24 24 v-component of wind (gust) (m s-1)
 25 25 Vertical speed shear (s-1)
 26 26 Horizontal momentum flux (N m-2)
 27 27 U-component storm motion (m s-1)
diff --git a/definitions/grib2/tables/7/4.2.0.20.table b/definitions/grib2/tables/7/4.2.0.20.table
index 8ed9faf64..ca4189468 100644
--- a/definitions/grib2/tables/7/4.2.0.20.table
+++ b/definitions/grib2/tables/7/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density [concentration] (kg m-3)
-1 1 Column-integrated mass density [see Note 1] (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg kg-1)
+0 0 Mass density (concentration) (kg m-3)
+1 1 Column-integrated mass density (see Note 1) (kg m-2)
+2 2 Mass mixing ratio (mass fraction in air) (kg kg-1)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -11,15 +11,15 @@
 #9-49 9-49 Reserved (-)
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol mol-1)
+52 52 Volume mixing ratio (fraction in air) (mol mol-1)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
-56 56 Changes of amount in atmosphere [see Note 1] (mol s-1)
+56 56 Changes of amount in atmosphere (see Note 1) (mol s-1)
 57 57 Total yearly average burden of the atmosphere (mol)
-58 58 Total yearly averaged atmospheric loss [see Note 1] (mol s-1)
+58 58 Total yearly averaged atmospheric loss (see Note 1) (mol s-1)
 #59-99 59-99 Reserved (-)
-100 100 Surface area density [aerosol] (m-1)
+100 100 Surface area density (aerosol) (m-1)
 101 101 Atmosphere optical thickness (m)
 #102-191 102-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
diff --git a/definitions/grib2/tables/7/4.2.0.4.table b/definitions/grib2/tables/7/4.2.0.4.table
index e3033b3b7..d22ce42d3 100644
--- a/definitions/grib2/tables/7/4.2.0.4.table
+++ b/definitions/grib2/tables/7/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 #13-49 13-49 Reserved (-)
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index  (Numeric)
 #52-191 52-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
diff --git a/definitions/grib2/tables/7/4.2.0.5.table b/definitions/grib2/tables/7/4.2.0.5.table
index 27ea8ec29..6128eb9c0 100644
--- a/definitions/grib2/tables/7/4.2.0.5.table
+++ b/definitions/grib2/tables/7/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long wave radiation flux [surface] (W m-2)
-1 1 Net long wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long wave radiation flux (surface) (W m-2)
+1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/7/4.2.0.6.table b/definitions/grib2/tables/7/4.2.0.6.table
index d5102e727..f46fbc253 100644
--- a/definitions/grib2/tables/7/4.2.0.6.table
+++ b/definitions/grib2/tables/7/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base - validation (m)
 #26-31 26-31 Reserved (-)
 27 27 Height of convective cloud top - validation (m)
diff --git a/definitions/grib2/tables/7/4.2.0.7.table b/definitions/grib2/tables/7/4.2.0.7.table
index ad3c0e45a..bced218f0 100644
--- a/definitions/grib2/tables/7/4.2.0.7.table
+++ b/definitions/grib2/tables/7/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J kg-1)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index - validation (K)
 14 14 Reserved
diff --git a/definitions/grib2/tables/7/4.2.1.0.table b/definitions/grib2/tables/7/4.2.1.0.table
index a5ab6c2e2..f8efa7a12 100644
--- a/definitions/grib2/tables/7/4.2.1.0.table
+++ b/definitions/grib2/tables/7/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely sensed snow cover ((code table 4.215))
 3 3 Elevation of snow covered terrain ((code table 4.216))
 4 4 Snow water equivalent percent of normal (%)
diff --git a/definitions/grib2/tables/7/4.2.1.1.table b/definitions/grib2/tables/7/4.2.1.1.table
index 67035a3ce..979e94557 100644
--- a/definitions/grib2/tables/7/4.2.1.1.table
+++ b/definitions/grib2/tables/7/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional percent precipitation amount fractile for an overall period [Encoded as an accumulation]. (kg m-2)
-1 1 Percent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation). (kg m-2)
+1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 #3-191 3-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/7/4.2.10.0.table b/definitions/grib2/tables/7/4.2.10.0.table
index d5b9b1592..7671a7a5c 100644
--- a/definitions/grib2/tables/7/4.2.10.0.table
+++ b/definitions/grib2/tables/7/4.2.10.0.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
 4 4 Direction of wind waves (Degree true)
 5 5 Significant height of wind waves (m)
diff --git a/definitions/grib2/tables/7/4.2.10.191.table b/definitions/grib2/tables/7/4.2.10.191.table
index a938fcbb6..72cf1ce97 100644
--- a/definitions/grib2/tables/7/4.2.10.191.table
+++ b/definitions/grib2/tables/7/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Product discipline 10 - Oceanographic products, parameter category 191: miscellaneous
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3 s-1)
 #2-191 Reserved
 #192-254 Reserved for local use
diff --git a/definitions/grib2/tables/7/4.2.2.0.table b/definitions/grib2/tables/7/4.2.2.0.table
index c852db956..5970dfff1 100644
--- a/definitions/grib2/tables/7/4.2.2.0.table
+++ b/definitions/grib2/tables/7/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover [1=land, 0=sea] (Proportion)
+0 0 Land cover (1=land, 0=sea) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index - validation (Numeric)
 29 29 Evergreen forest - validation (Numeric)
 30 30 Deciduous forest - validation (Numeric)
-31 31 Normalized differential vegetation index [NDVI] - validation (Numeric)
+31 31 Normalized differential vegetation index (NDVI) - validation (Numeric)
 32 32 Root depth of vegetation - validation (M)
 #33-191 33-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
diff --git a/definitions/grib2/tables/7/4.2.2.3.table b/definitions/grib2/tables/7/4.2.2.3.table
index 02b373d71..52574791a 100644
--- a/definitions/grib2/tables/7/4.2.2.3.table
+++ b/definitions/grib2/tables/7/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/7/4.2.3.1.table b/definitions/grib2/tables/7/4.2.3.1.table
index 01e474d8b..d0a16c127 100644
--- a/definitions/grib2/tables/7/4.2.3.1.table
+++ b/definitions/grib2/tables/7/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (s-1)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved (-)
 19 19 Wind speed (m s-1)
 20 20 Aerosol optical thickness at 0.635 um (-)
diff --git a/definitions/grib2/tables/8/4.2.0.0.table b/definitions/grib2/tables/8/4.2.0.0.table
index 13adadb70..debc0a6f4 100644
--- a/definitions/grib2/tables/8/4.2.0.0.table
+++ b/definitions/grib2/tables/8/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew-point temperature (K)
-7 7 Dew-point depression [or deficit] (K)
+7 7 Dew-point depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/8/4.2.0.1.table b/definitions/grib2/tables/8/4.2.0.1.table
index e4837ea9b..319d5c17c 100644
--- a/definitions/grib2/tables/8/4.2.0.1.table
+++ b/definitions/grib2/tables/8/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total Condensate (kg/kg)
 81 81 Total Column-Integrated Condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/8/4.2.0.15.table b/definitions/grib2/tables/8/4.2.0.15.table
index 979a8173e..a7fa034b0 100644
--- a/definitions/grib2/tables/8/4.2.0.15.table
+++ b/definitions/grib2/tables/8/4.2.0.15.table
@@ -5,9 +5,9 @@
 3 3 Vertically-integrated liquid (kg/m)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/8/4.2.0.18.table b/definitions/grib2/tables/8/4.2.0.18.table
index aa2e3d1fb..30060fd2d 100644
--- a/definitions/grib2/tables/8/4.2.0.18.table
+++ b/definitions/grib2/tables/8/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/8/4.2.0.19.table b/definitions/grib2/tables/8/4.2.0.19.table
index 0865d5a30..a2adb1d1e 100644
--- a/definitions/grib2/tables/8/4.2.0.19.table
+++ b/definitions/grib2/tables/8/4.2.0.19.table
@@ -21,10 +21,10 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather Interpretation ww [WMO] (-)
+25 25 Weather Interpretation ww (WMO) (-)
 26 26 Convective outlook (Code table 4.224)
 # 27-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.0.191.table b/definitions/grib2/tables/8/4.2.0.191.table
index 4833f8f88..81230c0e0 100644
--- a/definitions/grib2/tables/8/4.2.0.191.table
+++ b/definitions/grib2/tables/8/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/8/4.2.0.2.table b/definitions/grib2/tables/8/4.2.0.2.table
index 19cda83c7..58428f66a 100644
--- a/definitions/grib2/tables/8/4.2.0.2.table
+++ b/definitions/grib2/tables/8/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/8/4.2.0.20.table b/definitions/grib2/tables/8/4.2.0.20.table
index 59d61255c..d0ef4b3a0 100644
--- a/definitions/grib2/tables/8/4.2.0.20.table
+++ b/definitions/grib2/tables/8/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [Sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (Sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Atmosphere optical thickness (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/8/4.2.0.4.table b/definitions/grib2/tables/8/4.2.0.4.table
index 0b83187b4..fea4cafc3 100644
--- a/definitions/grib2/tables/8/4.2.0.4.table
+++ b/definitions/grib2/tables/8/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.0.5.table b/definitions/grib2/tables/8/4.2.0.5.table
index 6a861331c..aae853bf9 100644
--- a/definitions/grib2/tables/8/4.2.0.5.table
+++ b/definitions/grib2/tables/8/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/8/4.2.0.6.table b/definitions/grib2/tables/8/4.2.0.6.table
index 8a6cf61c2..72394191f 100644
--- a/definitions/grib2/tables/8/4.2.0.6.table
+++ b/definitions/grib2/tables/8/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number concentration of cloud droplets (/kg)
diff --git a/definitions/grib2/tables/8/4.2.0.7.table b/definitions/grib2/tables/8/4.2.0.7.table
index 244272e58..7a7d2008b 100644
--- a/definitions/grib2/tables/8/4.2.0.7.table
+++ b/definitions/grib2/tables/8/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/8/4.2.1.0.table b/definitions/grib2/tables/8/4.2.1.0.table
index 00b032310..4e72e1ab3 100644
--- a/definitions/grib2/tables/8/4.2.1.0.table
+++ b/definitions/grib2/tables/8/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/8/4.2.1.1.table b/definitions/grib2/tables/8/4.2.1.1.table
index 3b95971a9..cb5117dc8 100644
--- a/definitions/grib2/tables/8/4.2.1.1.table
+++ b/definitions/grib2/tables/8/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/8/4.2.1.2.table b/definitions/grib2/tables/8/4.2.1.2.table
index b9a179026..499991d58 100644
--- a/definitions/grib2/tables/8/4.2.1.2.table
+++ b/definitions/grib2/tables/8/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/8/4.2.10.0.table b/definitions/grib2/tables/8/4.2.10.0.table
index 13b389989..eb9d1fa65 100644
--- a/definitions/grib2/tables/8/4.2.10.0.table
+++ b/definitions/grib2/tables/8/4.2.10.0.table
@@ -1,19 +1,19 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
-4 4 Direction of wind waves [degree true] (deg)
+4 4 Direction of wind waves (degree true) (deg)
 5 5 Significant height of wind waves (m)
 6 6 Mean period of wind waves (s)
-7 7 Direction of swell waves [degree true] (deg)
+7 7 Direction of swell waves (degree true) (deg)
 8 8 Significant height of swell waves (m)
 9 9 Mean period of swell waves (s)
-10 10 Primary wave direction [degree true] (deg)
+10 10 Primary wave direction (degree true) (deg)
 11 11 Primary wave mean period (s)
-12 12 Secondary wave direction [degree true] (deg)
+12 12 Secondary wave direction (degree true) (deg)
 13 13 Secondary wave mean period (s)
-14 14 Direction of combined wind waves and swell [degree true] (deg)
+14 14 Direction of combined wind waves and swell (degree true) (deg)
 15 15 Mean period of combined wind waves and swell (s)
 16 16 Coefficient of drag with waves (-)
 17 17 Friction velocity (m s-1)
diff --git a/definitions/grib2/tables/8/4.2.10.1.table b/definitions/grib2/tables/8/4.2.10.1.table
index f9486e6a4..5a33bac5d 100644
--- a/definitions/grib2/tables/8/4.2.10.1.table
+++ b/definitions/grib2/tables/8/4.2.10.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Current direction [degree true] (deg)
+0 0 Current direction (degree true) (deg)
 1 1 Current speed (m/s)
 2 2 u-component of current (m/s)
 3 3 v-component of current (m/s)
diff --git a/definitions/grib2/tables/8/4.2.10.191.table b/definitions/grib2/tables/8/4.2.10.191.table
index f0936614f..14085ac9a 100644
--- a/definitions/grib2/tables/8/4.2.10.191.table
+++ b/definitions/grib2/tables/8/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.10.2.table b/definitions/grib2/tables/8/4.2.10.2.table
index cb84cbbb2..a69b2622c 100644
--- a/definitions/grib2/tables/8/4.2.10.2.table
+++ b/definitions/grib2/tables/8/4.2.10.2.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Ice cover (Proportion)
 1 1 Ice thickness (m)
-2 2 Direction of ice drift [degree true] (deg)
+2 2 Direction of ice drift (degree true) (deg)
 3 3 Speed of ice drift (m/s)
 4 4 u-component of ice drift (m/s)
 5 5 v-component of ice drift (m/s)
diff --git a/definitions/grib2/tables/8/4.2.2.0.table b/definitions/grib2/tables/8/4.2.2.0.table
index 855867737..359a12e62 100644
--- a/definitions/grib2/tables/8/4.2.2.0.table
+++ b/definitions/grib2/tables/8/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest (Numeric)
 30 30 Deciduous forest (Numeric)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/8/4.2.2.3.table b/definitions/grib2/tables/8/4.2.2.3.table
index ab50b98b0..6c135b8cd 100644
--- a/definitions/grib2/tables/8/4.2.2.3.table
+++ b/definitions/grib2/tables/8/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/8/4.2.3.1.table b/definitions/grib2/tables/8/4.2.3.1.table
index 5a49942d6..16eee69c4 100644
--- a/definitions/grib2/tables/8/4.2.3.1.table
+++ b/definitions/grib2/tables/8/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/definitions/grib2/tables/9/4.2.0.0.table b/definitions/grib2/tables/9/4.2.0.0.table
index 13adadb70..debc0a6f4 100644
--- a/definitions/grib2/tables/9/4.2.0.0.table
+++ b/definitions/grib2/tables/9/4.2.0.0.table
@@ -6,7 +6,7 @@
 4 4 Maximum temperature (K)
 5 5 Minimum temperature (K)
 6 6 Dew-point temperature (K)
-7 7 Dew-point depression [or deficit] (K)
+7 7 Dew-point depression (or deficit) (K)
 8 8 Lapse rate (K/m)
 9 9 Temperature anomaly (K)
 10 10 Latent heat net flux (W m-2)
@@ -17,7 +17,7 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin temperature (K)
-18 18 Snow temperature [top of snow] (K)
+18 18 Snow temperature (top of snow) (K)
 19 19 Turbulent transfer coefficient for heat (Numeric)
 20 20 Turbulent diffusion coefficient for heat (m2/s)
 # 21-191 Reserved 
diff --git a/definitions/grib2/tables/9/4.2.0.1.table b/definitions/grib2/tables/9/4.2.0.1.table
index e4837ea9b..319d5c17c 100644
--- a/definitions/grib2/tables/9/4.2.0.1.table
+++ b/definitions/grib2/tables/9/4.2.0.1.table
@@ -8,7 +8,7 @@
 6 6 Evaporation (kg m-2)
 7 7 Precipitation rate (kg m-2 s-1)
 8 8 Total precipitation (kg m-2)
-9 9 Large-scale precipitation [non-convective] (kg m-2)
+9 9 Large-scale precipitation (non-convective) (kg m-2)
 10 10 Convective precipitation (kg m-2)
 11 11 Snow depth (m)
 12 12 Snowfall rate water equivalent (kg m-2 s-1)
@@ -31,7 +31,7 @@
 29 29 Total snowfall (m)
 30 30 Precipitable water category ((Code table 4.202))
 31 31 Hail (m)
-32 32 Graupel [snow pellets] (kg/kg)
+32 32 Graupel (snow pellets) (kg/kg)
 33 33 Categorical rain ((Code table 4.222))
 34 34 Categorical freezing rain ((Code table 4.222))
 35 35 Categorical ice pellets ((Code table 4.222))
@@ -46,11 +46,11 @@
 44 44 Rime factor (Numeric)
 45 45 Total column integrated rain (kg m-2)
 46 46 Total column integrated snow (kg m-2)
-47 47 Large scale water precipitation [non-convective] (kg m-2)
+47 47 Large scale water precipitation (non-convective) (kg m-2)
 48 48 Convective water precipitation (kg m-2)
 49 49 Total water precipitation (kg m-2)
 50 50 Total snow precipitation (kg m-2)
-51 51 Total column water [Vertically integrated total water=vapour + cloud water/ice] (kg m-2)
+51 51 Total column water (Vertically integrated total water (vapour + cloud water/ice)) (kg m-2)
 52 52 Total precipitation rate (kg m-2 s-1)
 53 53 Total snowfall rate water equivalent (kg m-2 s-1)
 54 54 Large scale precipitation rate (kg m-2 s-1)
@@ -74,10 +74,10 @@
 72 72 Total column integrated hail (kg m-2)
 73 73 Hail precipitation rate (kg m-2 s-1)
 74 74 Total column integrated graupel (kg m-2)
-75 75 Graupel [snow pellets] precipitation rate (kg m-2 s-1)
+75 75 Graupel (snow pellets) precipitation rate (kg m-2 s-1)
 76 76 Convective rain rate (kg m-2 s-1)
 77 77 Large scale rain rate (kg m-2 s-1)
-78 78 Total column integrated water [all components including precipitation] (kg m-2)
+78 78 Total column integrated water (all components including precipitation) (kg m-2)
 79 79 Evaporation rate (kg m-2 s-1)
 80 80 Total Condensate (kg/kg)
 81 81 Total Column-Integrated Condensate (kg m-2)
@@ -88,8 +88,8 @@
 86 86 Specific snow water content (kg/kg)
 # 87-89 Reserved 
 90 90 Total kinematic moisture flux (kg kg-1 m s-1)
-91 91 u-component [zonal] kinematic moisture flux (kg kg-1 m s-1)
-92 92 v-component [meridional] kinematic moisture flux (kg kg-1 m s-1)
+91 91 u-component (zonal) kinematic moisture flux (kg kg-1 m s-1)
+92 92 v-component (meridional) kinematic moisture flux (kg kg-1 m s-1)
 # 93-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/9/4.2.0.15.table b/definitions/grib2/tables/9/4.2.0.15.table
index 004d02950..895892f86 100644
--- a/definitions/grib2/tables/9/4.2.0.15.table
+++ b/definitions/grib2/tables/9/4.2.0.15.table
@@ -2,12 +2,12 @@
 0 0 Base spectrum width (m/s)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m/s)
-3 3 Vertically-integrated liquid water [VIL] (kg m-2)
+3 3 Vertically-integrated liquid water (VIL) (kg m-2)
 4 4 Layer-maximum base reflectivity (dB)
 5 5 Precipitation (kg m-2)
-6 6 Radar spectra [1] (-)
-7 7 Radar spectra [2] (-)
-8 8 Radar spectra [3] (-)
+6 6 Radar spectra (1) (-)
+7 7 Radar spectra (2) (-)
+8 8 Radar spectra (3) (-)
 9 9 Reflectivity of cloud droplets (dB)
 10 10 Reflectivity of cloud ice (dB)
 11 11 Reflectivity of snow (dB)
diff --git a/definitions/grib2/tables/9/4.2.0.18.table b/definitions/grib2/tables/9/4.2.0.18.table
index aa2e3d1fb..30060fd2d 100644
--- a/definitions/grib2/tables/9/4.2.0.18.table
+++ b/definitions/grib2/tables/9/4.2.0.18.table
@@ -12,7 +12,7 @@
 10 10 Air concentration (Bq m-3)
 11 11 Wet deposition (Bq m-2)
 12 12 Dry deposition (Bq m-2)
-13 13 Total deposition [wet + dry] (Bq m-2)
+13 13 Total deposition (wet + dry) (Bq m-2)
 # 14-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/9/4.2.0.19.table b/definitions/grib2/tables/9/4.2.0.19.table
index dceb79ccc..101103cb4 100644
--- a/definitions/grib2/tables/9/4.2.0.19.table
+++ b/definitions/grib2/tables/9/4.2.0.19.table
@@ -21,7 +21,7 @@
 19 19 Snow albedo (%)
 20 20 Icing (%)
 21 21 In-cloud turbulence (%)
-22 22 Clear air turbulence [CAT] (%)
+22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
 25 25 Weather (Code table 4.225)
diff --git a/definitions/grib2/tables/9/4.2.0.191.table b/definitions/grib2/tables/9/4.2.0.191.table
index 4833f8f88..81230c0e0 100644
--- a/definitions/grib2/tables/9/4.2.0.191.table
+++ b/definitions/grib2/tables/9/4.2.0.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Geographical latitude (deg N)
 2 2 Geographical longitude (deg E)
 # 3-191 Reserved 
diff --git a/definitions/grib2/tables/9/4.2.0.2.table b/definitions/grib2/tables/9/4.2.0.2.table
index b5654c5f5..e8b59a998 100644
--- a/definitions/grib2/tables/9/4.2.0.2.table
+++ b/definitions/grib2/tables/9/4.2.0.2.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wind direction [from which blowing] (degree true)
+0 0 Wind direction (from which blowing) (degree true)
 1 1 Wind speed (m/s)
 2 2 u-component of wind (m/s)
 3 3 v-component of wind (m/s)
@@ -7,8 +7,8 @@
 5 5 Velocity potential (m2 s-1)
 6 6 Montgomery stream function (m2 s-2)
 7 7 Sigma coordinate vertical velocity (/s)
-8 8 Vertical velocity [pressure] (Pa/s)
-9 9 Vertical velocity [geometric] (m/s)
+8 8 Vertical velocity (pressure) (Pa/s)
+9 9 Vertical velocity (geometric) (m/s)
 10 10 Absolute vorticity (/s)
 11 11 Absolute divergence (/s)
 12 12 Relative vorticity (/s)
@@ -21,9 +21,9 @@
 19 19 Wind mixing energy (J)
 20 20 Boundary layer dissipation (W m-2)
 21 21 Maximum wind speed (m/s)
-22 22 Wind speed [gust] (m/s)
-23 23 u-component of wind [gust] (m/s)
-24 24 v-component of wind [gust] (m/s)
+22 22 Wind speed (gust) (m/s)
+23 23 u-component of wind (gust) (m/s)
+24 24 v-component of wind (gust) (m/s)
 25 25 Vertical speed shear (/s)
 26 26 Horizontal momentum flux (N m-2)
 27 27 u-component storm motion (m/s)
diff --git a/definitions/grib2/tables/9/4.2.0.20.table b/definitions/grib2/tables/9/4.2.0.20.table
index e636a5ee9..cc2dbcc52 100644
--- a/definitions/grib2/tables/9/4.2.0.20.table
+++ b/definitions/grib2/tables/9/4.2.0.20.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Mass density [concentration] (kg m-3)
+0 0 Mass density (concentration) (kg m-3)
 1 1 Column-integrated mass density (kg m-2)
-2 2 Mass mixing ratio [mass fraction in air] (kg/kg)
+2 2 Mass mixing ratio (mass fraction in air) (kg/kg)
 3 3 Atmosphere emission mass flux (kg m-2 s-1)
 4 4 Atmosphere net production mass flux (kg m-2 s-1)
 5 5 Atmosphere net production and emission mass flux (kg m-2 s-1)
@@ -13,11 +13,11 @@
 11 11 Sedimentation mass flux (kg m-2 s-1)
 12 12 Dry deposition mass flux (kg m-2 s-1)
 13 13 Transfer from hydrophobic to hydrophilic (kg kg-1 s-1)
-14 14 Transfer from SO2 [Sulphur dioxide] to SO4 [sulphate] (kg kg-1 s-1)
+14 14 Transfer from SO2 (Sulphur dioxide) to SO4 (sulphate) (kg kg-1 s-1)
 # 15-49 Reserved 
 50 50 Amount in atmosphere (mol)
 51 51 Concentration in air (mol m-3)
-52 52 Volume mixing ratio [fraction in air] (mol/mol)
+52 52 Volume mixing ratio (fraction in air) (mol/mol)
 53 53 Chemical gross production rate of concentration (mol m-3 s-1)
 54 54 Chemical gross destruction rate of concentration (mol m-3 s-1)
 55 55 Surface flux (mol m-2 s-1)
@@ -26,7 +26,7 @@
 58 58 Total yearly averaged atmospheric loss (mol/s)
 59 59 Aerosol number concentration (m-3)
 # 60-99 Reserved 
-100 100 Surface area density [aerosol] (/m)
+100 100 Surface area density (aerosol) (/m)
 101 101 Vertical visual range (m)
 102 102 Aerosol optical thickness (Numeric)
 103 103 Single scattering albedo (Numeric)
diff --git a/definitions/grib2/tables/9/4.2.0.4.table b/definitions/grib2/tables/9/4.2.0.4.table
index 0b83187b4..fea4cafc3 100644
--- a/definitions/grib2/tables/9/4.2.0.4.table
+++ b/definitions/grib2/tables/9/4.2.0.4.table
@@ -1,11 +1,11 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net short-wave radiation flux [surface] (W m-2)
-1 1 Net short-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net short-wave radiation flux (surface) (W m-2)
+1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short-wave radiation flux (W m-2)
 3 3 Global radiation flux (W m-2)
 4 4 Brightness temperature (K)
-5 5 Radiance [with respect to wave number] (W m-1 sr-1)
-6 6 Radiance [with respect to wave length] (W m-3 sr-1)
+5 5 Radiance (with respect to wave number) (W m-1 sr-1)
+6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 8 8 Upward short-wave radiation flux (W m-2)
 9 9 Net short wave radiation flux (W m-2)
@@ -13,7 +13,7 @@
 11 11 Net short-wave radiation flux, clear sky (W m-2)
 12 12 Downward UV radiation (W m-2)
 # 13-49 Reserved 
-50 50 UV index [under clear sky] (Numeric)
+50 50 UV index (under clear sky) (Numeric)
 51 51 UV index (Numeric)
 # 52-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/9/4.2.0.5.table b/definitions/grib2/tables/9/4.2.0.5.table
index 6a861331c..aae853bf9 100644
--- a/definitions/grib2/tables/9/4.2.0.5.table
+++ b/definitions/grib2/tables/9/4.2.0.5.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Net long-wave radiation flux [surface] (W m-2)
-1 1 Net long-wave radiation flux [top of atmosphere] (W m-2)
+0 0 Net long-wave radiation flux (surface) (W m-2)
+1 1 Net long-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long-wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
diff --git a/definitions/grib2/tables/9/4.2.0.6.table b/definitions/grib2/tables/9/4.2.0.6.table
index 0f60b71b6..055df76a5 100644
--- a/definitions/grib2/tables/9/4.2.0.6.table
+++ b/definitions/grib2/tables/9/4.2.0.6.table
@@ -24,7 +24,7 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg/kg)
 24 24 Sunshine (Numeric)
-25 25 Horizontal extent of cumulonimbus [CB] (%)
+25 25 Horizontal extent of cumulonimbus (CB) (%)
 26 26 Height of convective cloud base (m)
 27 27 Height of convective cloud top (m)
 28 28 Number of cloud droplets per unit mass of air (/kg)
diff --git a/definitions/grib2/tables/9/4.2.0.7.table b/definitions/grib2/tables/9/4.2.0.7.table
index 244272e58..7a7d2008b 100644
--- a/definitions/grib2/tables/9/4.2.0.7.table
+++ b/definitions/grib2/tables/9/4.2.0.7.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Parcel lifted index [to 500 hPa] (K)
-1 1 Best lifted index [to 500 hPa] (K)
+0 0 Parcel lifted index (to 500 hPa) (K)
+1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
 3 3 KO index (K)
 4 4 Total totals index (K)
@@ -10,7 +10,7 @@
 8 8 Storm relative helicity (J/kg)
 9 9 Energy helicity index (Numeric)
 10 10 Surface lifted index (K)
-11 11 Best [4-layer] lifted index (K)
+11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
 13 13 Showalter index (K)
 14 14 Reserved 
diff --git a/definitions/grib2/tables/9/4.2.1.0.table b/definitions/grib2/tables/9/4.2.1.0.table
index 00b032310..4e72e1ab3 100644
--- a/definitions/grib2/tables/9/4.2.1.0.table
+++ b/definitions/grib2/tables/9/4.2.1.0.table
@@ -1,6 +1,6 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Flash flood guidance [Encoded as an accumulation over a floating subinterval of time between the reference time and valid time] (kg m-2)
-1 1 Flash flood runoff [Encoded as an accumulation over a floating subinterval of time] (kg m-2)
+0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
+1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely-sensed snow cover ((Code table 4.215))
 3 3 Elevation of snow-covered terrain ((Code table 4.216))
 4 4 Snow water equivalent per cent of normal (%)
diff --git a/definitions/grib2/tables/9/4.2.1.1.table b/definitions/grib2/tables/9/4.2.1.1.table
index 3b95971a9..cb5117dc8 100644
--- a/definitions/grib2/tables/9/4.2.1.1.table
+++ b/definitions/grib2/tables/9/4.2.1.1.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Conditional per cent precipitation amount fractile for an overall period [Encoded as an accumulation] (kg m-2)
-1 1 Per cent precipitation in a sub-period of an overall period [Encoded as per cent accumulation over the sub-period] (%)
-2 2 Probability of 0.01 inch of precipitation [POP] (%)
+0 0 Conditional per cent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
+1 1 Per cent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
+2 2 Probability of 0.01 inch of precipitation (POP) (%)
 # 3-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/9/4.2.1.2.table b/definitions/grib2/tables/9/4.2.1.2.table
index e665fa195..c53a175fe 100644
--- a/definitions/grib2/tables/9/4.2.1.2.table
+++ b/definitions/grib2/tables/9/4.2.1.2.table
@@ -7,7 +7,7 @@
 5 5 Ice thickness (m)
 6 6 Ice temperature (K)
 7 7 Ice cover (Proportion)
-8 8 Land cover [0 = water, 1 = land] (Proportion)
+8 8 Land cover (0 = water, 1 = land) (Proportion)
 9 9 Shape factor with respect to salinity profile (-)
 10 10 Shape factor with respect to temperature profile in thermocline (-)
 11 11 Attenuation coefficient of water with respect to solar radiation (m-1)
diff --git a/definitions/grib2/tables/9/4.2.10.0.table b/definitions/grib2/tables/9/4.2.10.0.table
index 291b54d19..d4321d955 100644
--- a/definitions/grib2/tables/9/4.2.10.0.table
+++ b/definitions/grib2/tables/9/4.2.10.0.table
@@ -1,19 +1,19 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Wave spectra [1] (-)
-1 1 Wave spectra [2] (-)
-2 2 Wave spectra [3] (-)
+0 0 Wave spectra (1) (-)
+1 1 Wave spectra (2) (-)
+2 2 Wave spectra (3) (-)
 3 3 Significant height of combined wind waves and swell (m)
-4 4 Direction of wind waves [degree true] (deg)
+4 4 Direction of wind waves (degree true) (deg)
 5 5 Significant height of wind waves (m)
 6 6 Mean period of wind waves (s)
-7 7 Direction of swell waves [degree true] (deg)
+7 7 Direction of swell waves (degree true) (deg)
 8 8 Significant height of swell waves (m)
 9 9 Mean period of swell waves (s)
-10 10 Primary wave direction [degree true] (deg)
+10 10 Primary wave direction (degree true) (deg)
 11 11 Primary wave mean period (s)
-12 12 Secondary wave direction [degree true] (deg)
+12 12 Secondary wave direction (degree true) (deg)
 13 13 Secondary wave mean period (s)
-14 14 Direction of combined wind waves and swell [degree true] (deg)
+14 14 Direction of combined wind waves and swell (degree true) (deg)
 15 15 Mean period of combined wind waves and swell (s)
 16 16 Coefficient of drag with waves (-)
 17 17 Friction velocity (m s-1)
diff --git a/definitions/grib2/tables/9/4.2.10.1.table b/definitions/grib2/tables/9/4.2.10.1.table
index f9486e6a4..5a33bac5d 100644
--- a/definitions/grib2/tables/9/4.2.10.1.table
+++ b/definitions/grib2/tables/9/4.2.10.1.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Current direction [degree true] (deg)
+0 0 Current direction (degree true) (deg)
 1 1 Current speed (m/s)
 2 2 u-component of current (m/s)
 3 3 v-component of current (m/s)
diff --git a/definitions/grib2/tables/9/4.2.10.191.table b/definitions/grib2/tables/9/4.2.10.191.table
index f0936614f..14085ac9a 100644
--- a/definitions/grib2/tables/9/4.2.10.191.table
+++ b/definitions/grib2/tables/9/4.2.10.191.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Seconds prior to initial reference time [defined in Section 1] (s)
+0 0 Seconds prior to initial reference time (defined in Section 1) (s)
 1 1 Meridional overturning stream function (m3/s)
 # 2-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/9/4.2.10.2.table b/definitions/grib2/tables/9/4.2.10.2.table
index cb84cbbb2..a69b2622c 100644
--- a/definitions/grib2/tables/9/4.2.10.2.table
+++ b/definitions/grib2/tables/9/4.2.10.2.table
@@ -1,7 +1,7 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Ice cover (Proportion)
 1 1 Ice thickness (m)
-2 2 Direction of ice drift [degree true] (deg)
+2 2 Direction of ice drift (degree true) (deg)
 3 3 Speed of ice drift (m/s)
 4 4 u-component of ice drift (m/s)
 5 5 v-component of ice drift (m/s)
diff --git a/definitions/grib2/tables/9/4.2.2.0.table b/definitions/grib2/tables/9/4.2.2.0.table
index ff62b236e..3e43b501c 100644
--- a/definitions/grib2/tables/9/4.2.2.0.table
+++ b/definitions/grib2/tables/9/4.2.2.0.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Land cover [0 = sea, 1 = land] (Proportion)
+0 0 Land cover (0 = sea, 1 = land) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
 3 3 Soil moisture content (kg m-2)
@@ -30,7 +30,7 @@
 28 28 Leaf area index (Numeric)
 29 29 Evergreen forest cover (Proportion)
 30 30 Deciduous forest cover (Proportion)
-31 31 Normalized differential vegetation index [NDVI] (Numeric)
+31 31 Normalized differential vegetation index (NDVI) (Numeric)
 32 32 Root depth of vegetation (m)
 # 33-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/9/4.2.2.3.table b/definitions/grib2/tables/9/4.2.2.3.table
index ab50b98b0..6c135b8cd 100644
--- a/definitions/grib2/tables/9/4.2.2.3.table
+++ b/definitions/grib2/tables/9/4.2.2.3.table
@@ -4,16 +4,16 @@
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
 4 4 Bottom layer soil temperature (K)
-5 5 Liquid volumetric soil moisture [non-frozen] (Proportion)
+5 5 Liquid volumetric soil moisture (non-frozen) (Proportion)
 6 6 Number of soil layers in root zone (Numeric)
-7 7 Transpiration stress-onset [soil moisture] (Proportion)
-8 8 Direct evaporation cease [soil moisture] (Proportion)
+7 7 Transpiration stress-onset (soil moisture) (Proportion)
+8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
-10 10 Liquid volumetric soil moisture [non-frozen] (m3 m-3)
-11 11 Volumetric transpiration stress-onset [soil moisture] (m3 m-3)
-12 12 Transpiration stress-onset [soil moisture] (kg m-3)
-13 13 Volumetric direct evaporation cease [soil moisture] (m3 m-3)
-14 14 Direct evaporation cease [soil moisture] (kg m-3)
+10 10 Liquid volumetric soil moisture (non-frozen) (m3 m-3)
+11 11 Volumetric transpiration stress-onset (soil moisture) (m3 m-3)
+12 12 Transpiration stress-onset (soil moisture) (kg m-3)
+13 13 Volumetric direct evaporation cease (soil moisture) (m3 m-3)
+14 14 Direct evaporation cease (soil moisture) (kg m-3)
 15 15 Soil porosity (m3 m-3)
 16 16 Volumetric saturation of soil moisture (m3 m-3)
 17 17 Saturation of soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/9/4.2.3.1.table b/definitions/grib2/tables/9/4.2.3.1.table
index 5a49942d6..16eee69c4 100644
--- a/definitions/grib2/tables/9/4.2.3.1.table
+++ b/definitions/grib2/tables/9/4.2.3.1.table
@@ -15,8 +15,8 @@
 13 13 Atmospheric divergence (/s)
 14 14 Cloudy brightness temperature (K)
 15 15 Clear-sky brightness temperature (K)
-16 16 Cloudy radiance [with respect to wave number] (W m-1 sr-1)
-17 17 Clear-sky radiance [with respect to wave number] (W m-1 sr-1)
+16 16 Cloudy radiance (with respect to wave number) (W m-1 sr-1)
+17 17 Clear-sky radiance (with respect to wave number) (W m-1 sr-1)
 18 18 Reserved 
 19 19 Wind speed (m/s)
 20 20 Aerosol optical thickness at 0.635 um
diff --git a/src/grib_accessor_class_codetable.c b/src/grib_accessor_class_codetable.c
index 43087097d..9ab68d983 100644
--- a/src/grib_accessor_class_codetable.c
+++ b/src/grib_accessor_class_codetable.c
@@ -419,6 +419,9 @@ static int grib_load_codetable(grib_context* c,const char* filename,
         char* r = title;
         char* units=0;
         char unknown[]="unknown";
+        char* last_open_paren = NULL;
+        char* last_clos_paren = NULL;
+
         ++lineNumber;
 
         line[strlen(line)-1] = 0;
@@ -428,6 +431,8 @@ static int grib_load_codetable(grib_context* c,const char* filename,
         if(*p == '#')
             continue;
 
+        last_open_paren = strrchr(line, '(');
+
         while(*p != '\0' && isspace(*p)) p++;
 
         if( *p =='\0' ) continue;
@@ -463,21 +468,25 @@ static int grib_load_codetable(grib_context* c,const char* filename,
         *q = 0;
         while(*p != '\0' && isspace(*p)) p++;
 
+        /* The title goes as far as the last open paren */
         while(*p != '\0')
         {
-            if(*p == '(' ) break;
+            if( last_open_paren && p >= last_open_paren && *p == '(' ) break;
             *r++ = *p++;
         }
         *r = 0;
 
-        while(*p != '\0' && isspace(*p)) p++;
-        if (*p != '\0') {
-            units=++p;
-            while(*p != '\0' && *p != ')' ) p++;
-            *p='\0';
-        } else {
-            units=unknown;
+        /* units at the end */
+        if (last_open_paren) {
+            last_clos_paren = strrchr(line, ')');
+            if (last_clos_paren && last_open_paren!=last_clos_paren) {
+                units = last_open_paren+1;
+                p = units;
+                p += (last_clos_paren - last_open_paren - 1);
+                *p='\0';
+            }
         }
+        if (!units) units=unknown;
 
         Assert(*abbreviation);
         Assert(*title);

From 05fa429c9e9f1f2b1a6c00725522ee9788da8791 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 25 Nov 2019 14:02:58 +0000
Subject: [PATCH 25/38] Definitions: clean up for tables

---
 definitions/grib2/tables/0/0.0.table       |  4 ----
 definitions/grib2/tables/0/1.0.table       |  2 --
 definitions/grib2/tables/0/1.1.table       |  3 ---
 definitions/grib2/tables/0/1.2.table       |  3 ---
 definitions/grib2/tables/0/1.3.table       |  3 ---
 definitions/grib2/tables/0/1.4.table       |  3 ---
 definitions/grib2/tables/0/3.0.table       |  3 ---
 definitions/grib2/tables/0/3.1.table       | 17 -----------------
 definitions/grib2/tables/0/3.10.table      |  1 -
 definitions/grib2/tables/0/3.11.table      |  1 -
 definitions/grib2/tables/0/3.15.table      | 13 ++-----------
 definitions/grib2/tables/0/3.2.table       |  3 ---
 definitions/grib2/tables/0/3.20.table      |  3 ---
 definitions/grib2/tables/0/3.21.table      |  4 ----
 definitions/grib2/tables/0/3.3.table       |  1 -
 definitions/grib2/tables/0/3.4.table       |  1 -
 definitions/grib2/tables/0/3.5.table       |  1 -
 definitions/grib2/tables/0/3.6.table       |  1 -
 definitions/grib2/tables/0/3.7.table       |  1 -
 definitions/grib2/tables/0/3.8.table       |  3 ---
 definitions/grib2/tables/0/3.9.table       |  1 -
 definitions/grib2/tables/0/4.0.table       |  1 -
 definitions/grib2/tables/0/4.1.0.table     |  4 ----
 definitions/grib2/tables/0/4.1.1.table     |  4 ----
 definitions/grib2/tables/0/4.1.10.table    |  4 ----
 definitions/grib2/tables/0/4.1.2.table     |  4 ----
 definitions/grib2/tables/0/4.1.3.table     |  4 ----
 definitions/grib2/tables/0/4.1.table       |  1 -
 definitions/grib2/tables/0/4.10.table      |  2 --
 definitions/grib2/tables/0/4.11.table      |  3 ---
 definitions/grib2/tables/0/4.12.table      |  1 -
 definitions/grib2/tables/0/4.13.table      |  2 --
 definitions/grib2/tables/0/4.14.table      |  1 -
 definitions/grib2/tables/0/4.15.table      |  1 -
 definitions/grib2/tables/0/4.151.table     |  1 -
 definitions/grib2/tables/0/4.2.0.0.table   |  3 ---
 definitions/grib2/tables/0/4.2.0.1.table   |  3 ---
 definitions/grib2/tables/0/4.2.0.13.table  |  3 ---
 definitions/grib2/tables/0/4.2.0.14.table  |  3 ---
 definitions/grib2/tables/0/4.2.0.15.table  |  3 ---
 definitions/grib2/tables/0/4.2.0.18.table  |  3 ---
 definitions/grib2/tables/0/4.2.0.19.table  |  3 ---
 definitions/grib2/tables/0/4.2.0.190.table |  3 ---
 definitions/grib2/tables/0/4.2.0.191.table |  3 ---
 definitions/grib2/tables/0/4.2.0.2.table   |  3 ---
 definitions/grib2/tables/0/4.2.0.20.table  |  4 ----
 definitions/grib2/tables/0/4.2.0.3.table   |  3 ---
 definitions/grib2/tables/0/4.2.0.4.table   |  3 ---
 definitions/grib2/tables/0/4.2.0.5.table   |  3 ---
 definitions/grib2/tables/0/4.2.0.6.table   |  3 ---
 definitions/grib2/tables/0/4.2.0.7.table   |  3 ---
 definitions/grib2/tables/0/4.2.1.0.table   |  3 ---
 definitions/grib2/tables/0/4.2.1.1.table   |  3 ---
 definitions/grib2/tables/0/4.2.10.0.table  |  3 ---
 definitions/grib2/tables/0/4.2.10.1.table  |  3 ---
 definitions/grib2/tables/0/4.2.10.2.table  |  3 ---
 definitions/grib2/tables/0/4.2.10.3.table  |  3 ---
 definitions/grib2/tables/0/4.2.10.4.table  |  3 ---
 definitions/grib2/tables/0/4.2.2.0.table   |  3 ---
 definitions/grib2/tables/0/4.2.2.3.table   |  3 ---
 definitions/grib2/tables/0/4.2.3.0.table   |  3 ---
 definitions/grib2/tables/0/4.2.3.1.table   |  3 ---
 definitions/grib2/tables/0/4.2.table       |  5 -----
 definitions/grib2/tables/0/4.201.table     |  1 -
 definitions/grib2/tables/0/4.202.table     |  1 -
 definitions/grib2/tables/0/4.203.table     |  2 --
 definitions/grib2/tables/0/4.204.table     |  1 -
 definitions/grib2/tables/0/4.205.table     |  1 -
 definitions/grib2/tables/0/4.206.table     |  1 -
 definitions/grib2/tables/0/4.207.table     |  1 -
 definitions/grib2/tables/0/4.208.table     |  1 -
 definitions/grib2/tables/0/4.209.table     |  1 -
 definitions/grib2/tables/0/4.210.table     |  1 -
 definitions/grib2/tables/0/4.211.table     |  1 -
 definitions/grib2/tables/0/4.212.table     |  1 -
 definitions/grib2/tables/0/4.213.table     |  1 -
 definitions/grib2/tables/0/4.215.table     |  1 -
 definitions/grib2/tables/0/4.216.table     |  1 -
 definitions/grib2/tables/0/4.217.table     |  1 -
 definitions/grib2/tables/0/4.220.table     |  1 -
 definitions/grib2/tables/0/4.221.table     |  1 -
 definitions/grib2/tables/0/4.230.table     |  3 ---
 definitions/grib2/tables/0/4.3.table       |  3 ---
 definitions/grib2/tables/0/4.4.table       |  3 ---
 definitions/grib2/tables/0/4.5.table       |  7 -------
 definitions/grib2/tables/0/4.6.table       |  2 --
 definitions/grib2/tables/0/4.7.table       |  1 -
 definitions/grib2/tables/0/4.8.table       |  1 -
 definitions/grib2/tables/0/4.9.table       |  1 -
 definitions/grib2/tables/0/4.91.table      |  1 -
 definitions/grib2/tables/0/5.0.table       |  2 --
 definitions/grib2/tables/0/5.1.table       |  2 --
 definitions/grib2/tables/0/5.2.table       |  2 --
 definitions/grib2/tables/0/5.3.table       |  2 --
 definitions/grib2/tables/0/5.4.table       |  2 --
 definitions/grib2/tables/0/5.40.table      |  2 --
 definitions/grib2/tables/0/5.40000.table   |  2 --
 definitions/grib2/tables/0/5.5.table       |  2 --
 definitions/grib2/tables/0/5.6.table       |  1 -
 definitions/grib2/tables/0/5.7.table       |  1 -
 definitions/grib2/tables/0/5.8.table       |  1 -
 definitions/grib2/tables/0/5.9.table       |  1 -
 definitions/grib2/tables/0/6.0.table       |  2 --
 definitions/grib2/tables/0/stepType.table  |  1 -
 definitions/grib2/tables/1/0.0.table       |  4 ----
 definitions/grib2/tables/1/1.0.table       |  2 --
 definitions/grib2/tables/1/1.1.table       |  3 ---
 definitions/grib2/tables/1/1.2.table       |  3 ---
 definitions/grib2/tables/1/1.3.table       |  3 ---
 definitions/grib2/tables/1/1.4.table       |  3 ---
 definitions/grib2/tables/1/3.0.table       |  3 ---
 definitions/grib2/tables/1/3.1.table       | 17 -----------------
 definitions/grib2/tables/1/3.10.table      |  1 -
 definitions/grib2/tables/1/3.11.table      |  1 -
 definitions/grib2/tables/1/3.15.table      |  9 ---------
 definitions/grib2/tables/1/3.2.table       |  3 ---
 definitions/grib2/tables/1/3.20.table      |  3 ---
 definitions/grib2/tables/1/3.21.table      |  4 ----
 definitions/grib2/tables/1/3.3.table       |  1 -
 definitions/grib2/tables/1/3.4.table       |  1 -
 definitions/grib2/tables/1/3.5.table       |  1 -
 definitions/grib2/tables/1/3.6.table       |  1 -
 definitions/grib2/tables/1/3.7.table       |  1 -
 definitions/grib2/tables/1/3.8.table       |  3 ---
 definitions/grib2/tables/1/3.9.table       |  1 -
 definitions/grib2/tables/1/4.0.table       |  1 -
 definitions/grib2/tables/1/4.1.0.table     |  4 ----
 definitions/grib2/tables/1/4.1.1.table     |  4 ----
 definitions/grib2/tables/1/4.1.10.table    |  4 ----
 definitions/grib2/tables/1/4.1.2.table     |  4 ----
 definitions/grib2/tables/1/4.1.3.table     |  4 ----
 definitions/grib2/tables/1/4.1.table       |  1 -
 definitions/grib2/tables/1/4.10.table      |  2 --
 definitions/grib2/tables/1/4.11.table      |  2 --
 definitions/grib2/tables/1/4.12.table      |  1 -
 definitions/grib2/tables/1/4.13.table      |  1 -
 definitions/grib2/tables/1/4.14.table      |  1 -
 definitions/grib2/tables/1/4.15.table      |  1 -
 definitions/grib2/tables/1/4.151.table     |  1 -
 definitions/grib2/tables/1/4.2.0.0.table   |  3 ---
 definitions/grib2/tables/1/4.2.0.1.table   |  3 ---
 definitions/grib2/tables/1/4.2.0.13.table  |  3 ---
 definitions/grib2/tables/1/4.2.0.14.table  |  3 ---
 definitions/grib2/tables/1/4.2.0.15.table  |  3 ---
 definitions/grib2/tables/1/4.2.0.18.table  |  3 ---
 definitions/grib2/tables/1/4.2.0.19.table  |  3 ---
 definitions/grib2/tables/1/4.2.0.190.table |  3 ---
 definitions/grib2/tables/1/4.2.0.191.table |  3 ---
 definitions/grib2/tables/1/4.2.0.2.table   |  3 ---
 definitions/grib2/tables/1/4.2.0.20.table  |  2 --
 definitions/grib2/tables/1/4.2.0.3.table   |  3 ---
 definitions/grib2/tables/1/4.2.0.4.table   |  3 ---
 definitions/grib2/tables/1/4.2.0.5.table   |  3 ---
 definitions/grib2/tables/1/4.2.0.6.table   |  3 ---
 definitions/grib2/tables/1/4.2.0.7.table   |  3 ---
 definitions/grib2/tables/1/4.2.1.0.table   |  3 ---
 definitions/grib2/tables/1/4.2.1.1.table   |  3 ---
 definitions/grib2/tables/1/4.2.10.0.table  |  3 ---
 definitions/grib2/tables/1/4.2.10.1.table  |  3 ---
 definitions/grib2/tables/1/4.2.10.2.table  |  3 ---
 definitions/grib2/tables/1/4.2.10.3.table  |  3 ---
 definitions/grib2/tables/1/4.2.10.4.table  |  3 ---
 definitions/grib2/tables/1/4.2.2.0.table   |  3 ---
 definitions/grib2/tables/1/4.2.2.3.table   |  3 ---
 definitions/grib2/tables/1/4.2.3.0.table   |  3 ---
 definitions/grib2/tables/1/4.2.3.1.table   |  3 ---
 definitions/grib2/tables/1/4.2.table       |  5 -----
 definitions/grib2/tables/1/4.201.table     |  1 -
 definitions/grib2/tables/1/4.202.table     |  1 -
 definitions/grib2/tables/1/4.203.table     |  2 --
 definitions/grib2/tables/1/4.204.table     |  1 -
 definitions/grib2/tables/1/4.205.table     |  1 -
 definitions/grib2/tables/1/4.206.table     |  1 -
 definitions/grib2/tables/1/4.207.table     |  1 -
 definitions/grib2/tables/1/4.208.table     |  1 -
 definitions/grib2/tables/1/4.209.table     |  1 -
 definitions/grib2/tables/1/4.210.table     |  1 -
 definitions/grib2/tables/1/4.211.table     |  1 -
 definitions/grib2/tables/1/4.212.table     |  1 -
 definitions/grib2/tables/1/4.213.table     |  1 -
 definitions/grib2/tables/1/4.215.table     |  1 -
 definitions/grib2/tables/1/4.216.table     |  1 -
 definitions/grib2/tables/1/4.217.table     |  1 -
 definitions/grib2/tables/1/4.220.table     |  1 -
 definitions/grib2/tables/1/4.221.table     |  1 -
 definitions/grib2/tables/1/4.3.table       |  3 ---
 definitions/grib2/tables/1/4.4.table       |  3 ---
 definitions/grib2/tables/1/4.5.table       |  7 -------
 definitions/grib2/tables/1/4.6.table       |  2 --
 definitions/grib2/tables/1/4.7.table       |  1 -
 definitions/grib2/tables/1/4.8.table       |  1 -
 definitions/grib2/tables/1/4.9.table       |  1 -
 definitions/grib2/tables/1/4.91.table      |  1 -
 definitions/grib2/tables/1/5.0.table       |  2 --
 definitions/grib2/tables/1/5.1.table       |  2 --
 definitions/grib2/tables/1/5.2.table       |  2 --
 definitions/grib2/tables/1/5.3.table       |  2 --
 definitions/grib2/tables/1/5.4.table       |  2 --
 definitions/grib2/tables/1/5.40.table      |  2 --
 definitions/grib2/tables/1/5.40000.table   |  2 --
 definitions/grib2/tables/1/5.5.table       |  2 --
 definitions/grib2/tables/1/5.6.table       |  1 -
 definitions/grib2/tables/1/5.7.table       |  1 -
 definitions/grib2/tables/1/5.8.table       |  1 -
 definitions/grib2/tables/1/5.9.table       |  1 -
 definitions/grib2/tables/1/6.0.table       |  2 --
 definitions/grib2/tables/1/stepType.table  |  1 -
 207 files changed, 2 insertions(+), 499 deletions(-)

diff --git a/definitions/grib2/tables/0/0.0.table b/definitions/grib2/tables/0/0.0.table
index fd2056350..0dd70a18a 100644
--- a/definitions/grib2/tables/0/0.0.table
+++ b/definitions/grib2/tables/0/0.0.table
@@ -1,10 +1,6 @@
-#Code Table 0.0: Discipline of processed data in the GRIB message, number of GRIB Master Table
 0 0 Meteorological products
 1 1 Hydrological products
 2 2 Land surface products
 3 3 Space products
-# 4-9 Reserved
 10 10 Oceanographic products
-# 11-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/1.0.table b/definitions/grib2/tables/0/1.0.table
index a34f44ee1..3c5223d3b 100644
--- a/definitions/grib2/tables/0/1.0.table
+++ b/definitions/grib2/tables/0/1.0.table
@@ -1,7 +1,5 @@
-# Code Table 1.0: GRIB Master Tables Version Number
 0 0 Experimental
 1 1 Initial operational version number
 2 2 Previous operational version number
 3 3 Current operational version number implemented on 2 November 2005
-# 4-254 Future operational version numbers
 255 255 Master tables not used. Local table entries and local templates may use the entire range of the table, not just those sections marked Reserved for local used.
diff --git a/definitions/grib2/tables/0/1.1.table b/definitions/grib2/tables/0/1.1.table
index 6c5a60361..a3c2fdc79 100644
--- a/definitions/grib2/tables/0/1.1.table
+++ b/definitions/grib2/tables/0/1.1.table
@@ -1,5 +1,2 @@
-# Code Table 1.1 GRIB Local Tables Version Number
 0 0	Local tables not used 
-# . Only table entries and templates from the current Master table are valid.
-# 1-254		Number of local tables version used
 255 255	Missing
diff --git a/definitions/grib2/tables/0/1.2.table b/definitions/grib2/tables/0/1.2.table
index eb8755209..a4e2cc41f 100644
--- a/definitions/grib2/tables/0/1.2.table
+++ b/definitions/grib2/tables/0/1.2.table
@@ -1,8 +1,5 @@
-# CODE TABLE 1.2, Significance of Reference Time
 0 0  Analysis
 1 1  Start of forecast
 2 2  Verifying time of forecast
 3 3  Observation time
-#4-191 Reserved
-#192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/1.3.table b/definitions/grib2/tables/0/1.3.table
index d4ed48c63..ce83b4950 100644
--- a/definitions/grib2/tables/0/1.3.table
+++ b/definitions/grib2/tables/0/1.3.table
@@ -1,10 +1,7 @@
-# CODE TABLE 1.3, Production status of data
 0 0  Operational products
 1 1  Operational test products
 2 2  Research products
 3 3  Re-analysis products
 4 4  TIGGE Operational products
 5 5  TIGGE test products
-# 4-191 Reserved
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/1.4.table b/definitions/grib2/tables/0/1.4.table
index ac21f5c4c..a712f07a6 100644
--- a/definitions/grib2/tables/0/1.4.table
+++ b/definitions/grib2/tables/0/1.4.table
@@ -1,4 +1,3 @@
-# CODE TABLE 1.4, Type of data
 0 an Analysis products
 1 fc Forecast products
 2 af  Analysis and forecast products
@@ -8,6 +7,4 @@
 6 sa  Processed satellite observations
 7 ra  Processed radar observations
 8 ep  Event Probability
-# 8-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/3.0.table b/definitions/grib2/tables/0/3.0.table
index 6030a5132..be8be1209 100644
--- a/definitions/grib2/tables/0/3.0.table
+++ b/definitions/grib2/tables/0/3.0.table
@@ -1,6 +1,3 @@
-# CODE TABLE 3.0, Source of Grid Definition
 0 0 Specified in Code table 3.1
 1 1 Predetermined grid definition 	Defined by originating centre
-# 2-191 Reserved
-# 192-254 Reserved for local use
 255 255 A grid definition does not apply to this product
diff --git a/definitions/grib2/tables/0/3.1.table b/definitions/grib2/tables/0/3.1.table
index 235fb8bd3..f81f9f05a 100644
--- a/definitions/grib2/tables/0/3.1.table
+++ b/definitions/grib2/tables/0/3.1.table
@@ -1,43 +1,26 @@
-# CODE TABLE 3.1, Grid Definition Template Number
 0 0 Latitude/longitude. Also called equidistant cylindrical, or Plate Carree
 1 1 Rotated latitude/longitude
 2 2 Stretched latitude/longitude
 3 3 Stretched and rotated latitude/longitude
-# 4-9 Reserved
 10 10 Mercator
-# 11-19 Reserved
 20 20 Polar stereographic can be south or north
-# 21-29 Reserved
 30 30 Lambert Conformal can be secant or tangent, conical or bipolar
 31 31 Albers equal-area
-# 32-39 Reserved
 40 40 Gaussian latitude/longitude
 41 41 Rotated Gaussian latitude/longitude
 42 42 Stretched Gaussian latitude/longitude
 43 43 Stretched and rotated Gaussian latitude/longitude
-# 44-49 Reserved
 50 50 Spherical harmonic coefficients
 51 51 Rotated spherical harmonic coefficients
 52 52 Stretched spherical harmonic coefficients
 53 53 Stretched and rotated spherical harmonic coefficients
-# 54-89 Reserved
 90 90 Space view perspective orthographic
-# 91-99 Reserved
 100 100 Triangular grid based on an icosahedron
-# 101-109 Reserved
 110 110 Equatorial azimuthal equidistant projection
-# 111-119 Reserved
 120 120 Azimuth-range projection
-# 121-129 Reserved
 130 130 Irregular latitude/longitude grid
-# 131-139 Reserved
 140 140 Lambert azimuthal equal area projection
-# 141-999 Reserved
 1000 1000 Cross-section grid, with points equally spaced on the horizontal
-# 1001-1099 Reserved
 1100 1100 Hovmoller diagram grid, with points equally spaced on the horizontal
-# 1101-1199 Reserved
 1200 1200 Time section grid
-# 1201-32767 Reserved
-# 32768-65534 Reserved for local use
 65535 65535 Missing
diff --git a/definitions/grib2/tables/0/3.10.table b/definitions/grib2/tables/0/3.10.table
index ae5baf9d5..6b635d900 100644
--- a/definitions/grib2/tables/0/3.10.table
+++ b/definitions/grib2/tables/0/3.10.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.10, Scanning mode for one diamond
 1 0 Points scan in +i direction, i.e. from pole to equator
 1 1 Points scan in -i direction, i.e. from equator to pole
 2 0 Points scan in +j direction, i.e. from west to east
diff --git a/definitions/grib2/tables/0/3.11.table b/definitions/grib2/tables/0/3.11.table
index 9a84d4a95..16e6f46b0 100644
--- a/definitions/grib2/tables/0/3.11.table
+++ b/definitions/grib2/tables/0/3.11.table
@@ -1,4 +1,3 @@
-# CODE TABLE 3.11, Interpretation of list of numbers defining number of points
 0 0  There is no appended list
 1 1  Numbers define number of points corresponding to full coordinate circles (i.e. parallels), coordinate values on each circle are multiple of the circle mesh, and extreme coordinate values given in grid definition (i.e. extreme longitudes) may not be reached in all rows
 2 2  Numbers define number of points corresponding to coordinate lines delimited by extreme coordinate values given in grid definition (i.e. extreme longitudes) which are present in each row
diff --git a/definitions/grib2/tables/0/3.15.table b/definitions/grib2/tables/0/3.15.table
index bb431e14f..f3792c00f 100644
--- a/definitions/grib2/tables/0/3.15.table
+++ b/definitions/grib2/tables/0/3.15.table
@@ -1,11 +1,8 @@
-# CODE TABLE 3.15, Physical meaning of vertical coordinate
-# 0-19 Reserved
 20 20 Temperature K
-# 21-99 Reserved
 100 100 Pressure Pa
 101 101 Pressure deviation from mean sea level Pa
 102 102 Altitude above mean sea level m
-103 103 Height above ground (see Note 1) m
+103 103 Height above ground m
 104 104 Sigma coordinate
 105 105 Hybrid coordinate
 106 106 Depth below land surface m
@@ -13,13 +10,7 @@
 108 108 Pressure deviation from ground to level Pa
 109 pv Potential vorticity K m-2 kg-1 s-1
 110 110 Geometrical height m
-111 111 Eta coordinate (see Note 2)
+111 111 Eta coordinate
 112 112 Geopotential height gpm
-# 113-159 Reserved
 160 160 Depth below sea level m
-# 161-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.
diff --git a/definitions/grib2/tables/0/3.2.table b/definitions/grib2/tables/0/3.2.table
index d037ee120..58a33e567 100644
--- a/definitions/grib2/tables/0/3.2.table
+++ b/definitions/grib2/tables/0/3.2.table
@@ -1,4 +1,3 @@
-# CODE TABLE 3.2, Shape of the Earth
 0 0  Earth assumed spherical with radius = 6,367,470.0 m
 1 1  Earth assumed spherical with radius specified by data producer
 2 2  Earth assumed oblate spheroid with size as determined by IAU in 1965 (major axis = 6,378,160.0 m, minor axis = 6,356,775.0 m, f = 1/297.0)
@@ -6,6 +5,4 @@
 4 4  Earth assumed oblate spheroid as defined in IAG-GRS80 model (major axis = 6,378,137.0 m, minor axis = 6,356,752.314 m, f = 1/298.257222101)
 5 5  Earth assumed represented by WGS84 (as used by ICAO since 1998)
 6 6  Earth assumed spherical with radius of 6,371,229.0 m
-# 7-191 Reserved
-# 192- 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/3.20.table b/definitions/grib2/tables/0/3.20.table
index cfa35ae38..25995dccf 100644
--- a/definitions/grib2/tables/0/3.20.table
+++ b/definitions/grib2/tables/0/3.20.table
@@ -1,6 +1,3 @@
-# CODE TABLE 3.20, Type of horizontal line
 0 0  Rhumb
 1 1  Great circle
-# 2-191 Reserved
-# 192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/3.21.table b/definitions/grib2/tables/0/3.21.table
index c2fd94586..1b9b7d685 100644
--- a/definitions/grib2/tables/0/3.21.table
+++ b/definitions/grib2/tables/0/3.21.table
@@ -1,8 +1,4 @@
-# CODE TABLE 3.21, Vertical dimension coordinate values definition
 0 0  Explicit coordinate values set
 1 1  Linear coordinates
-# 2-10 Reserved
 11 11  Geometric coordinates
-# 12-191 Reserved
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/3.3.table b/definitions/grib2/tables/0/3.3.table
index 84cbb8bcc..90202ecd8 100644
--- a/definitions/grib2/tables/0/3.3.table
+++ b/definitions/grib2/tables/0/3.3.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.3, Resolution and Component Flags
 3 0 i direction increments not given
 3 1 i direction increments given
 4 0 j direction increments not given
diff --git a/definitions/grib2/tables/0/3.4.table b/definitions/grib2/tables/0/3.4.table
index 51d0664b2..b93252d83 100644
--- a/definitions/grib2/tables/0/3.4.table
+++ b/definitions/grib2/tables/0/3.4.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.4, Scanning Mode
 1 0 Points of first row or column scan in the +i (+x) direction
 1 1 Points of first row or column scan in the -i (-x) direction
 2 0 Points of first row or column scan in the -j (-y) direction
diff --git a/definitions/grib2/tables/0/3.5.table b/definitions/grib2/tables/0/3.5.table
index 117b26be3..07c9a5f8c 100644
--- a/definitions/grib2/tables/0/3.5.table
+++ b/definitions/grib2/tables/0/3.5.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.5, Projection Centre
 1 0 North Pole is on the projection plane
 1 1 South Pole is on the projection plane
 2 0 Only one projection centre is used
diff --git a/definitions/grib2/tables/0/3.6.table b/definitions/grib2/tables/0/3.6.table
index 41dd97e4a..c0b792e56 100644
--- a/definitions/grib2/tables/0/3.6.table
+++ b/definitions/grib2/tables/0/3.6.table
@@ -1,2 +1 @@
-# CODE TABLE 3.6, Spectral data representation type
 1 1  The Associated Legendre Functions of the first kind are defined by:
diff --git a/definitions/grib2/tables/0/3.7.table b/definitions/grib2/tables/0/3.7.table
index fa8fe356b..579f4bab4 100644
--- a/definitions/grib2/tables/0/3.7.table
+++ b/definitions/grib2/tables/0/3.7.table
@@ -1,4 +1,3 @@
-# Code Table 3.7: Spectral data representation mode
 0 0 Reserved
 1 1 The complex numbers Fnm
 255 255 Missing
diff --git a/definitions/grib2/tables/0/3.8.table b/definitions/grib2/tables/0/3.8.table
index 0d9b7d001..d9c89cf30 100644
--- a/definitions/grib2/tables/0/3.8.table
+++ b/definitions/grib2/tables/0/3.8.table
@@ -1,8 +1,5 @@
-# Code table 3.8: Grid point position
 0 0 Grid points at triangle vertices
 1 1 Grid points at centres of triangles
 2 2 Grid points at midpoints of triangle sides
-#3-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/3.9.table b/definitions/grib2/tables/0/3.9.table
index 800c08259..83441c0ab 100644
--- a/definitions/grib2/tables/0/3.9.table
+++ b/definitions/grib2/tables/0/3.9.table
@@ -1,3 +1,2 @@
-# FLAG TABLE 3.9, Numbering order of diamonds as seen from the corresponding pole
 1 0 Clockwise orientation
 1 1 Anti-clockwise (i.e., counter-clockwise) orientation
diff --git a/definitions/grib2/tables/0/4.0.table b/definitions/grib2/tables/0/4.0.table
index 759512a0c..862f03e7c 100644
--- a/definitions/grib2/tables/0/4.0.table
+++ b/definitions/grib2/tables/0/4.0.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.0, Product Definition Template Number
 0 0 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time
 1 1 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time
 2 2 Derived forecast based on all ensemble members at a horizontal level or in a horizontal layer at a point in time
diff --git a/definitions/grib2/tables/0/4.1.0.table b/definitions/grib2/tables/0/4.1.0.table
index 33d1c3984..dd5c30afe 100644
--- a/definitions/grib2/tables/0/4.1.0.table
+++ b/definitions/grib2/tables/0/4.1.0.table
@@ -1,5 +1,3 @@
-#Discipline 0: Meteorological products
-#Category Description
 0 0 Temperature
 1 1 Moisture
 2 2 Momentum
@@ -21,10 +19,8 @@
 18 18 Nuclear/radiology
 19 19 Physical atmospheric properties
 20 20 Atmospheric chemical or physical constituents
-# 20-189 Reserved
 190 190 CCITT IA5 string
 191 191 Miscellaneous
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/0/4.1.1.table b/definitions/grib2/tables/0/4.1.1.table
index ebb7d9ea0..9b3222b5e 100644
--- a/definitions/grib2/tables/0/4.1.1.table
+++ b/definitions/grib2/tables/0/4.1.1.table
@@ -1,9 +1,5 @@
-#Discipline 1: Hydrological products
-#Category Description
 0 0 Hydrology basic products
 1 1 Hydrology probabilities
-#2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/0/4.1.10.table b/definitions/grib2/tables/0/4.1.10.table
index 45b08caaa..9472c5f4c 100644
--- a/definitions/grib2/tables/0/4.1.10.table
+++ b/definitions/grib2/tables/0/4.1.10.table
@@ -1,12 +1,8 @@
-#Discipline 10: Oceanographic Products
-#Category Description
 0 0 Waves
 1 1 Currents
 2 2 Ice
 3 3 Surface Properties
 4 4 Sub-surface Properties
-# 5-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/0/4.1.2.table b/definitions/grib2/tables/0/4.1.2.table
index f7f2ea2ba..3fbf491b8 100644
--- a/definitions/grib2/tables/0/4.1.2.table
+++ b/definitions/grib2/tables/0/4.1.2.table
@@ -1,11 +1,7 @@
-#Discipline 2: Land Surface Products
-#Category Description
 0 0 Vegetation/Biomass
 1 1 Agri-/aquacultural Special Products
 2 2 Transportation-related Products
 3 3 Soil Products
-# 4-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/0/4.1.3.table b/definitions/grib2/tables/0/4.1.3.table
index f7578e163..aad184600 100644
--- a/definitions/grib2/tables/0/4.1.3.table
+++ b/definitions/grib2/tables/0/4.1.3.table
@@ -1,9 +1,5 @@
-#Discipline 3: Space Products
-#Category Description
 0 0 Image format products
 1 1 Quantitative products
-# 2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/0/4.1.table b/definitions/grib2/tables/0/4.1.table
index cc5bb2ffd..4c6659045 100644
--- a/definitions/grib2/tables/0/4.1.table
+++ b/definitions/grib2/tables/0/4.1.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.1, Category of parameters by product discipline
 0 0 Temperature
 1 1 Moisture
 3 3 Mass
diff --git a/definitions/grib2/tables/0/4.10.table b/definitions/grib2/tables/0/4.10.table
index 9cf447b69..3a4280b39 100644
--- a/definitions/grib2/tables/0/4.10.table
+++ b/definitions/grib2/tables/0/4.10.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.10, Type of statistical processing
 
 0 avg  Average
 1 accum  Accumulation
@@ -10,5 +9,4 @@
 7 cov  Covariance (Temporal variance)
 8 8  Difference (Value at the start of time range minus value at the end)
 9 ratio  Ratio
-# 192 254  Reserved for local use
 255 missing  Missing
diff --git a/definitions/grib2/tables/0/4.11.table b/definitions/grib2/tables/0/4.11.table
index 68901aac4..e5aeec8b7 100644
--- a/definitions/grib2/tables/0/4.11.table
+++ b/definitions/grib2/tables/0/4.11.table
@@ -1,9 +1,6 @@
-# CODE TABLE 4.11, Type of time intervals
-
 1 1  Successive times processed have same forecast time, start time of forecast is incremented
 2 2  Successive times processed have same start time of forecast, forecast time is incremented
 3 3  Successive times processed have start time of forecast incremented and forecast time decremented so that valid time remains constant
 4 4  Successive times processed have start time of forecast decremented and forecast time incremented so that valid time remains constant
 5 5  Floating subinterval of time between forecast time and end of overall time interval
-# 192 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/4.12.table b/definitions/grib2/tables/0/4.12.table
index 86b6177be..ccc846d23 100644
--- a/definitions/grib2/tables/0/4.12.table
+++ b/definitions/grib2/tables/0/4.12.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.12, Operating Mode
 
 0 0  Maintenance Mode
 1 1  Clear air
diff --git a/definitions/grib2/tables/0/4.13.table b/definitions/grib2/tables/0/4.13.table
index ddd7537d0..875d21bd3 100644
--- a/definitions/grib2/tables/0/4.13.table
+++ b/definitions/grib2/tables/0/4.13.table
@@ -1,5 +1,3 @@
-# CODE TABLE 4.13, Quality Control Indicator
-
 0 0  No quality control applied
 1 1  Quality control applied
 192 192  Reserved for local use
diff --git a/definitions/grib2/tables/0/4.14.table b/definitions/grib2/tables/0/4.14.table
index 69984d720..f43e9812f 100644
--- a/definitions/grib2/tables/0/4.14.table
+++ b/definitions/grib2/tables/0/4.14.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.14, Clutter Filter Indicator
 
 0 0  No clutter filter used
 1 1  Clutter filter used
diff --git a/definitions/grib2/tables/0/4.15.table b/definitions/grib2/tables/0/4.15.table
index 49b0b2d26..659d07036 100644
--- a/definitions/grib2/tables/0/4.15.table
+++ b/definitions/grib2/tables/0/4.15.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.15, Type of auxiliary information
 
 0 0  Confidence level ('grib2/4.151.table')
 1 1  Delta time (seconds)
diff --git a/definitions/grib2/tables/0/4.151.table b/definitions/grib2/tables/0/4.151.table
index bcfa0aea7..be56a229a 100644
--- a/definitions/grib2/tables/0/4.151.table
+++ b/definitions/grib2/tables/0/4.151.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.15, Confidence level units       
 
 0 0  bad
 1 1  suspect
diff --git a/definitions/grib2/tables/0/4.2.0.0.table b/definitions/grib2/tables/0/4.2.0.0.table
index 0386b8cd2..f935dec76 100644
--- a/definitions/grib2/tables/0/4.2.0.0.table
+++ b/definitions/grib2/tables/0/4.2.0.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 0: Temperature
 0 0 Temperature (K)
 1 1 Virtual temperature (K)
 2 2 Potential temperature (K)
@@ -17,7 +16,5 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin Temperature (K)
-#17-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.1.table b/definitions/grib2/tables/0/4.2.0.1.table
index 6f7ce78fa..823e1d322 100644
--- a/definitions/grib2/tables/0/4.2.0.1.table
+++ b/definitions/grib2/tables/0/4.2.0.1.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 1: Moisture
 0 0 Specific humidity (kg kg-1)
 1 1 Relative humidity (%)
 2 2 Humidity mixing ratio (kg kg-1)
@@ -60,7 +59,5 @@
 70 70 Specific cloud ice water content (kg kg-1)
 71 71 Specific rain water content (kg kg-1)
 72 72 Specific snow water content (kg kg-1)
-#47-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.13.table b/definitions/grib2/tables/0/4.2.0.13.table
index 8fc3425af..567dce2e9 100644
--- a/definitions/grib2/tables/0/4.2.0.13.table
+++ b/definitions/grib2/tables/0/4.2.0.13.table
@@ -1,6 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 13: Aerosols
 0 0 Aerosol type (Code table 4.205)
-#  1-191 Reserved
-#  192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.14.table b/definitions/grib2/tables/0/4.2.0.14.table
index 309c40d47..ad1f023f0 100644
--- a/definitions/grib2/tables/0/4.2.0.14.table
+++ b/definitions/grib2/tables/0/4.2.0.14.table
@@ -1,7 +1,4 @@
-# Product Discipline 0: Meteorological products, Parameter Category 14: Trace Gases
 0 0 Total ozone (Dobson)
 1 1 Ozone mixing ratio (kg kg-1)
-# 2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.15.table b/definitions/grib2/tables/0/4.2.0.15.table
index bb419178b..2e48bedcc 100644
--- a/definitions/grib2/tables/0/4.2.0.15.table
+++ b/definitions/grib2/tables/0/4.2.0.15.table
@@ -1,4 +1,3 @@
-# Product Discipline 0 - Meteorological products, Parameter Category 15: Radar
 0 0 Base spectrum width (m s-1)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m s-1)
@@ -8,7 +7,5 @@
 6 6 Radar spectra (1) (-)
 7 7 Radar spectra (2) (-)
 8 8 Radar spectra (3) (-)
-# 9-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.18.table b/definitions/grib2/tables/0/4.2.0.18.table
index 5c0fd6e5d..156a65d70 100644
--- a/definitions/grib2/tables/0/4.2.0.18.table
+++ b/definitions/grib2/tables/0/4.2.0.18.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 18: Nuclear/radiology
 0 0 Air concentration of Caesium 137 (Bq m-3)
 1 1 Air concentration of Iodine 131 (Bq m-3)
 2 2 Air concentration of radioactive pollutant (Bq m-3)
@@ -8,7 +7,5 @@
 6 6 Time-integrated air concentration of caesium pollutant (Bq s m-3)
 7 7 Time-integrated air concentration of iodine pollutant (Bq s m-3)
 8 8 Time-integrated air concentration of radioactive pollutant (Bq s m-3)
-# 9-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.19.table b/definitions/grib2/tables/0/4.2.0.19.table
index 369c3f657..7c495a607 100644
--- a/definitions/grib2/tables/0/4.2.0.19.table
+++ b/definitions/grib2/tables/0/4.2.0.19.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 19: Physical atmospheric properties
 0 0 Visibility (m)
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
@@ -18,7 +17,5 @@
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
 18 18 Snow free albedo (%)
-# 19-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.190.table b/definitions/grib2/tables/0/4.2.0.190.table
index b1f47bc02..181e9bb59 100644
--- a/definitions/grib2/tables/0/4.2.0.190.table
+++ b/definitions/grib2/tables/0/4.2.0.190.table
@@ -1,6 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 190: CCITT IA5 string
 0 0 Arbitrary text string (CCITTIA5)
-# 1-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.191.table b/definitions/grib2/tables/0/4.2.0.191.table
index affb98f42..592810f9c 100644
--- a/definitions/grib2/tables/0/4.2.0.191.table
+++ b/definitions/grib2/tables/0/4.2.0.191.table
@@ -1,6 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 191: Miscellaneous
 0 0 Seconds prior to initial reference time (defined in Section 1) (s)
-# 1-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.2.table b/definitions/grib2/tables/0/4.2.0.2.table
index 1ec945102..ac23abf79 100644
--- a/definitions/grib2/tables/0/4.2.0.2.table
+++ b/definitions/grib2/tables/0/4.2.0.2.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 2: Momentum
 0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
@@ -30,6 +29,4 @@
 28 28 V-component storm motion (m s-1)
 29 29 Drag coefficient (Numeric)
 30 30 Frictional velocity (m s-1)
-# 31-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/4.2.0.20.table b/definitions/grib2/tables/0/4.2.0.20.table
index 4d762c38e..2a66a0fe3 100644
--- a/definitions/grib2/tables/0/4.2.0.20.table
+++ b/definitions/grib2/tables/0/4.2.0.20.table
@@ -7,7 +7,6 @@
 6 6 Surface dry deposition mass flux kg m-2 s-1
 7 7 Surface wet deposition mass flux kg m-2 s-1
 8 8 Atmosphere re-emission mass flux kg m-2 s-1
-#9-49 9-49 Reserved
 50 50 Amount in atmosphere mol
 51 51 Concentration in air mol m-3
 52 52 Volume mixing ratio (fraction in air) mol mol-1
@@ -17,10 +16,7 @@
 56 56 Changes of amount in atmosphere (see Note 1) mol s-1
 57 57 Total yearly average burden of the atmosphere mol
 58 58 Total yearly averaged atmospheric loss (see Note 1) mol s-1
-#59-99 59-99 Reserved 
 100 100 Surface area density (aerosol) m-1
 101 101 Atmosphere optical thickness m
-#102-191 102-191 Reserved
-#192-254 192-254 Reserved for local use
 255 255 Missing 
 
diff --git a/definitions/grib2/tables/0/4.2.0.3.table b/definitions/grib2/tables/0/4.2.0.3.table
index 5c7e8151d..af5504ba5 100644
--- a/definitions/grib2/tables/0/4.2.0.3.table
+++ b/definitions/grib2/tables/0/4.2.0.3.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 3: Mass
  0 0 Pressure (Pa)
  1 1 Pressure reduced to MSL (Pa)
  2 2 Pressure tendency (Pa s-1)
@@ -19,7 +18,5 @@
  17 17 Meridional flux of gravity wave stress (N m-2)
  18 18 Planetary boundary layer height (m)
  19 19 5-wave geopotential height anomaly (gpm)
-# 20-191 Reserved
-# 192-254 Reserved for local use
  255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.4.table b/definitions/grib2/tables/0/4.2.0.4.table
index 815c184a2..fc42fba67 100644
--- a/definitions/grib2/tables/0/4.2.0.4.table
+++ b/definitions/grib2/tables/0/4.2.0.4.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 4: Short-wave Radiation
 0 0 Net short-wave radiation flux (surface) (W m-2)
 1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short wave radiation flux (W m-2)
@@ -8,7 +7,5 @@
 6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 9 8 Upward short-wave radiation flux (W m-2)
-# 9-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.5.table b/definitions/grib2/tables/0/4.2.0.5.table
index 1b57fa301..94d7b971e 100644
--- a/definitions/grib2/tables/0/4.2.0.5.table
+++ b/definitions/grib2/tables/0/4.2.0.5.table
@@ -1,11 +1,8 @@
-# Product Discipline 0: Meteorological products, Parameter Category 5: Long-wave Radiation
 0 0 Net long wave radiation flux (surface) (W m-2)
 1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
 5 5 Net long wave radiation flux (W m-2)
-# 5-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.6.table b/definitions/grib2/tables/0/4.2.0.6.table
index 05cf72f57..504fc6796 100644
--- a/definitions/grib2/tables/0/4.2.0.6.table
+++ b/definitions/grib2/tables/0/4.2.0.6.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 6: Cloud
 0 0 Cloud Ice (kg m-2)
 1 1 Total cloud cover (%)
 2 2 Convective cloud cover (%)
@@ -24,7 +23,5 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-# 23-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.0.7.table b/definitions/grib2/tables/0/4.2.0.7.table
index 78374fde5..3e2ce318a 100644
--- a/definitions/grib2/tables/0/4.2.0.7.table
+++ b/definitions/grib2/tables/0/4.2.0.7.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 7: Thermodynamic Stability Indices
 0 0 Parcel lifted index (to 500 hPa) (K)
 1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
@@ -12,7 +11,5 @@
 10 10 Surface lifted index (K)
 11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
-#13-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.1.0.table b/definitions/grib2/tables/0/4.2.1.0.table
index 1e867e1cb..3147f8c2a 100644
--- a/definitions/grib2/tables/0/4.2.1.0.table
+++ b/definitions/grib2/tables/0/4.2.1.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 1: Hydrologic products, Parameter Category 0: Hydrology basic products
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely sensed snow cover (Code table 4.215)
@@ -6,6 +5,4 @@
 4 4 Snow water equivalent percent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
-# 7-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/4.2.1.1.table b/definitions/grib2/tables/0/4.2.1.1.table
index b7342ef2f..a86c29c6c 100644
--- a/definitions/grib2/tables/0/4.2.1.1.table
+++ b/definitions/grib2/tables/0/4.2.1.1.table
@@ -1,8 +1,5 @@
-# Product Discipline 1: Hydrologic products, Parameter Category 1: Hydrology probabilities 
 0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
 1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
 2 2 Probability of 0.01 inch of precipitation (POP) (%)
-#3-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.10.0.table b/definitions/grib2/tables/0/4.2.10.0.table
index 479e26d51..98a0fedfb 100644
--- a/definitions/grib2/tables/0/4.2.10.0.table
+++ b/definitions/grib2/tables/0/4.2.10.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 0: Waves
 0 0 Wave spectra (1) (-)
 1 1 Wave spectra (2) (-)
 2 2 Wave spectra (3) (-)
@@ -13,8 +12,6 @@
 11 11 Primary wave mean period (s)
 12 12 Secondary wave direction (Degree true)
 13 13 Secondary wave mean period (s)
-# 14-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/0/4.2.10.1.table b/definitions/grib2/tables/0/4.2.10.1.table
index df18f31dd..8c92ae826 100644
--- a/definitions/grib2/tables/0/4.2.10.1.table
+++ b/definitions/grib2/tables/0/4.2.10.1.table
@@ -1,8 +1,5 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 1: Currents
 0 0 Current direction (Degree true)
 1 1 Current speed (m s-1)
 2 2 u-component of current (m s-1)
 3 3 v-component of current (m s-1)
-# 4-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/4.2.10.2.table b/definitions/grib2/tables/0/4.2.10.2.table
index cb73da46c..7297632c2 100644
--- a/definitions/grib2/tables/0/4.2.10.2.table
+++ b/definitions/grib2/tables/0/4.2.10.2.table
@@ -1,4 +1,3 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 2: Ice
 0 0 Ice cover (Proportion)
 1 1 Ice thickness (m)
 2 2 Direction of ice drift (Degree true)
@@ -7,6 +6,4 @@
 5 5 v-component of ice drift (m s-1)
 6 6 Ice growth rate (m s-1)
 7 7 Ice divergence (s-1)
-# 8-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/4.2.10.3.table b/definitions/grib2/tables/0/4.2.10.3.table
index a14ae22e3..9e805aefa 100644
--- a/definitions/grib2/tables/0/4.2.10.3.table
+++ b/definitions/grib2/tables/0/4.2.10.3.table
@@ -1,6 +1,3 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 3: Surface Properties
 0 0 Water temperature (K)
 1 1 Deviation of sea level from mean (m)
-# 2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/4.2.10.4.table b/definitions/grib2/tables/0/4.2.10.4.table
index a24c3c8c4..20a604c30 100644
--- a/definitions/grib2/tables/0/4.2.10.4.table
+++ b/definitions/grib2/tables/0/4.2.10.4.table
@@ -1,9 +1,6 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 4: Sub-surface Properties
 0 0 Main thermocline depth (m)
 1 1 Main thermocline anomaly (m)
 2 2 Transient thermocline depth (m)
 3 3 Salinity (kg kg-1)
-# 4-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.2.0.table b/definitions/grib2/tables/0/4.2.2.0.table
index fdc8ce0ef..5678022f2 100644
--- a/definitions/grib2/tables/0/4.2.2.0.table
+++ b/definitions/grib2/tables/0/4.2.2.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 2: Land surface products, Parameter Category 0: Vegetation/Biomass
 0 0 Land cover (0=land, 1=sea) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
@@ -23,7 +22,5 @@
 21 21 Humidity parameter in canopy conductance (Proportion)
 22 22 Soil moisture (kg m-3)
 26 26 Wilting point (kg m-3)
-# 23-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.2.3.table b/definitions/grib2/tables/0/4.2.2.3.table
index d6376fecb..6d993394a 100644
--- a/definitions/grib2/tables/0/4.2.2.3.table
+++ b/definitions/grib2/tables/0/4.2.2.3.table
@@ -1,4 +1,3 @@
-# Product Discipline 2: Land surface products, Parameter Category 3: Soil Products
 0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
@@ -10,7 +9,5 @@
 8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
 12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-# 11-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.3.0.table b/definitions/grib2/tables/0/4.2.3.0.table
index 944566388..7e9e74e66 100644
--- a/definitions/grib2/tables/0/4.2.3.0.table
+++ b/definitions/grib2/tables/0/4.2.3.0.table
@@ -1,4 +1,3 @@
-# Product discipline 3: Space products, Parameter Category 0: Image format products
 0 0 Scaled radiance (Numeric)
 1 1 Scaled albedo (Numeric)
 2 2 Scaled brightness temperature (Numeric)
@@ -8,7 +7,5 @@
 6 6 Scaled skin temperature (Numeric)
 7 7 Cloud mask (Code table 4.217)
 8 8 Pixel scene type (Code table 4.218)
-# 9-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.3.1.table b/definitions/grib2/tables/0/4.2.3.1.table
index 60d6e8420..e01f22110 100644
--- a/definitions/grib2/tables/0/4.2.3.1.table
+++ b/definitions/grib2/tables/0/4.2.3.1.table
@@ -1,11 +1,8 @@
-# Product Discipline 3: Space products, Parameter Category 1: Quantitative products
 0 0 Estimated precipitation (kg m-2)
 1 1 Instantaneous rain rate (kg m-2 s-1)
 2 2 Cloud top height (m)
 3 3 Cloud top height quality indicator (Code table 4.219)
 4 4 Estimated u component of wind (m s-1)
 5 5 Estimated v component of wind (m s-1)
-# 6-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/0/4.2.table b/definitions/grib2/tables/0/4.2.table
index ff9553645..e69de29bb 100644
--- a/definitions/grib2/tables/0/4.2.table
+++ b/definitions/grib2/tables/0/4.2.table
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/0/4.201.table b/definitions/grib2/tables/0/4.201.table
index 7445c9c20..7ee3a7031 100644
--- a/definitions/grib2/tables/0/4.201.table
+++ b/definitions/grib2/tables/0/4.201.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.201, Precipitation Type
 
 1 1  Rain
 2 2  Thunderstorm
diff --git a/definitions/grib2/tables/0/4.202.table b/definitions/grib2/tables/0/4.202.table
index 69dbe3a5d..cee4c9e63 100644
--- a/definitions/grib2/tables/0/4.202.table
+++ b/definitions/grib2/tables/0/4.202.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.202, Precipitable water category
 
 192 192  Reserved for local use
 193 193  Reserved for local use
diff --git a/definitions/grib2/tables/0/4.203.table b/definitions/grib2/tables/0/4.203.table
index 057f40910..1f8dbef65 100644
--- a/definitions/grib2/tables/0/4.203.table
+++ b/definitions/grib2/tables/0/4.203.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.203, Cloud type
 0 0  Clear
 1 1  Cumulonimbus
 2 2  Stratus
@@ -21,5 +20,4 @@
 19 19  Cirrocumulus - ground based fog beneath the lowest layer
 20 20  Cirrus - ground based fog beneath the lowest layer
 191 191  Unknown
-# 192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/4.204.table b/definitions/grib2/tables/0/4.204.table
index 23b60cf77..6ff5c3538 100644
--- a/definitions/grib2/tables/0/4.204.table
+++ b/definitions/grib2/tables/0/4.204.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.204, Thunderstorm coverage
 
 0 0  None
 1 1  Isolated (1%  - 2%)
diff --git a/definitions/grib2/tables/0/4.205.table b/definitions/grib2/tables/0/4.205.table
index 98c7b48ec..7594bc0ea 100644
--- a/definitions/grib2/tables/0/4.205.table
+++ b/definitions/grib2/tables/0/4.205.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.205, Aerosol type
 
 0 0  Aerosol not present
 1 1  Aerosol present
diff --git a/definitions/grib2/tables/0/4.206.table b/definitions/grib2/tables/0/4.206.table
index b1ef2e787..40463d37c 100644
--- a/definitions/grib2/tables/0/4.206.table
+++ b/definitions/grib2/tables/0/4.206.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.206, Volcanic ash
 
 0 0  Not present
 1 1  Present
diff --git a/definitions/grib2/tables/0/4.207.table b/definitions/grib2/tables/0/4.207.table
index 13fc7b54b..46c8c808e 100644
--- a/definitions/grib2/tables/0/4.207.table
+++ b/definitions/grib2/tables/0/4.207.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.207, Icing
 
 0 0  None
 1 1  Light
diff --git a/definitions/grib2/tables/0/4.208.table b/definitions/grib2/tables/0/4.208.table
index 15b514a07..34fc6708f 100644
--- a/definitions/grib2/tables/0/4.208.table
+++ b/definitions/grib2/tables/0/4.208.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.208, Turbulence
 
 0 0  None (smooth)
 1 1  Light
diff --git a/definitions/grib2/tables/0/4.209.table b/definitions/grib2/tables/0/4.209.table
index b4cca1d73..2700f882e 100644
--- a/definitions/grib2/tables/0/4.209.table
+++ b/definitions/grib2/tables/0/4.209.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.209, Planetary boundary layer regime
 
 1 1  Stable
 2 2  Mechanically driven turbulence
diff --git a/definitions/grib2/tables/0/4.210.table b/definitions/grib2/tables/0/4.210.table
index d05e07721..00ab2b2d4 100644
--- a/definitions/grib2/tables/0/4.210.table
+++ b/definitions/grib2/tables/0/4.210.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.210, Contrail intensity
 
 0 0  Contrail not present
 1 1  Contrail present
diff --git a/definitions/grib2/tables/0/4.211.table b/definitions/grib2/tables/0/4.211.table
index 604b2e643..810d3de86 100644
--- a/definitions/grib2/tables/0/4.211.table
+++ b/definitions/grib2/tables/0/4.211.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.211, Contrail engine type
 
 0 0  Low bypass
 1 1  High bypass
diff --git a/definitions/grib2/tables/0/4.212.table b/definitions/grib2/tables/0/4.212.table
index 7393238e7..30d8335cc 100644
--- a/definitions/grib2/tables/0/4.212.table
+++ b/definitions/grib2/tables/0/4.212.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.212, Land Use
 
 1 1  Urban land
 2 2  Agriculture
diff --git a/definitions/grib2/tables/0/4.213.table b/definitions/grib2/tables/0/4.213.table
index cc4bdfc1f..110a13150 100644
--- a/definitions/grib2/tables/0/4.213.table
+++ b/definitions/grib2/tables/0/4.213.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.213, Soil type
 
 1 1  Sand
 2 2  Loamy sand
diff --git a/definitions/grib2/tables/0/4.215.table b/definitions/grib2/tables/0/4.215.table
index 7e1442962..2fdcf4414 100644
--- a/definitions/grib2/tables/0/4.215.table
+++ b/definitions/grib2/tables/0/4.215.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.215, Remotely Sensed Snow Coverage
 
 50 50  No-snow/no-cloud
 100 100  Clouds
diff --git a/definitions/grib2/tables/0/4.216.table b/definitions/grib2/tables/0/4.216.table
index a1e12c20e..b63683ffb 100644
--- a/definitions/grib2/tables/0/4.216.table
+++ b/definitions/grib2/tables/0/4.216.table
@@ -1,3 +1,2 @@
-# CODE TABLE 4.216, Elevation of Snow Covered Terrain
 254 254  Clouds
 255 255  Missing
diff --git a/definitions/grib2/tables/0/4.217.table b/definitions/grib2/tables/0/4.217.table
index 475ab686d..5fe126992 100644
--- a/definitions/grib2/tables/0/4.217.table
+++ b/definitions/grib2/tables/0/4.217.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.217, Cloud mask type
 
 0 0  Clear over water
 1 1  Clear over land
diff --git a/definitions/grib2/tables/0/4.220.table b/definitions/grib2/tables/0/4.220.table
index 9fddcd49f..b26216966 100644
--- a/definitions/grib2/tables/0/4.220.table
+++ b/definitions/grib2/tables/0/4.220.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.220, Horizontal dimension processed
 
 0 0  Latitude
 1 1  Longitude
diff --git a/definitions/grib2/tables/0/4.221.table b/definitions/grib2/tables/0/4.221.table
index 2291eab60..41718eb02 100644
--- a/definitions/grib2/tables/0/4.221.table
+++ b/definitions/grib2/tables/0/4.221.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.221, Treatment of missing data
 
 0 0  Not included
 1 1  Extrapolated
diff --git a/definitions/grib2/tables/0/4.230.table b/definitions/grib2/tables/0/4.230.table
index 7bcbe3043..245febe5b 100644
--- a/definitions/grib2/tables/0/4.230.table
+++ b/definitions/grib2/tables/0/4.230.table
@@ -1,4 +1,3 @@
-#Code figure	Code figure	Meaning
 0 0 Ozone
 1 1 Water vapour
 2 2 Methane
@@ -60,9 +59,7 @@
 10021 10021 Benzene
 10022 10022 Toluene
 10023 10023 Xylene
-#10024-10499 10024-10499 reserved for other simple organic molecules (e.g. higher aldehydes, alcohols, peroxides,...)
 10500 10500 Dimethyl sulphide
-#10501-20000 10501-20000 Reserved
 20001 20001 Hydrogen chloride
 20002 20002 CFC-11
 20003 20003 CFC-12
diff --git a/definitions/grib2/tables/0/4.3.table b/definitions/grib2/tables/0/4.3.table
index 84a72352b..cac7ebbb4 100644
--- a/definitions/grib2/tables/0/4.3.table
+++ b/definitions/grib2/tables/0/4.3.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.3, Type of generating process
 0 0  Analysis
 1 1  Initialization
 2 2  Forecast
@@ -8,6 +7,4 @@
 6 6  Forecast error
 7 7  Analysis error
 8 8  Observation
-# 9-191 Reserved
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/4.4.table b/definitions/grib2/tables/0/4.4.table
index 61aa20c5f..4f9f0cdcd 100644
--- a/definitions/grib2/tables/0/4.4.table
+++ b/definitions/grib2/tables/0/4.4.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.4, Indicator of unit of time range
 0 m  Minute
 1 h  Hour
 2 D  Day
@@ -11,6 +10,4 @@
 11 6h  6 hours
 12 12h  12 hours
 13 s  Second
-# 14-191 Reserved
-#192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/4.5.table b/definitions/grib2/tables/0/4.5.table
index 5fe94d4d5..72dc1ad1b 100644
--- a/definitions/grib2/tables/0/4.5.table
+++ b/definitions/grib2/tables/0/4.5.table
@@ -1,4 +1,3 @@
-#Code table 4.5: Fixed surface types and units
 0 0 Reserved
 1 sfc Ground or water surface 
 2 2 Cloud base level 
@@ -9,9 +8,7 @@
 7 7 Tropopause 
 8 sfc Nominal top of the atmosphere 
 9 9 Sea bottom 
-# 10-19 Reserved
 20 20 Isothermal level (K)
-#21-99 Reserved
 100 pl Isobaric surface (Pa)
 101 sfc Mean sea level
 102 102 Specific altitude above mean sea level (m)
@@ -24,10 +21,6 @@
 109 pv Potential vorticity surface (K m2 kg-1 s-1)
 110 110 Reserved
 111 ml Eta level 
-# 112-116 Reserved
 117 117 Mixed layer depth (m)
-# 118-159 Reserved
 160 160 Depth below sea level (m)
-#161-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/4.6.table b/definitions/grib2/tables/0/4.6.table
index dc6d94c20..a9efd5a77 100644
--- a/definitions/grib2/tables/0/4.6.table
+++ b/definitions/grib2/tables/0/4.6.table
@@ -1,8 +1,6 @@
-# CODE TABLE 4.6, Type of ensemble forecast
 
 0 0  Unperturbed high-resolution control forecast
 1 1  Unperturbed low-resolution control forecast
 2 2  Negatively perturbed forecast
 3 3  Positively perturbed forecast
-# 192 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/4.7.table b/definitions/grib2/tables/0/4.7.table
index dadf59b46..2f295c769 100644
--- a/definitions/grib2/tables/0/4.7.table
+++ b/definitions/grib2/tables/0/4.7.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.7, Derived forecast
 
 0 0  Unweighted mean of all members
 1 1  Weighted mean of all members
diff --git a/definitions/grib2/tables/0/4.8.table b/definitions/grib2/tables/0/4.8.table
index 9d3a0e8a7..5f1e971da 100644
--- a/definitions/grib2/tables/0/4.8.table
+++ b/definitions/grib2/tables/0/4.8.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.8, Clustering Method
 
 0 0  Anomaly correlation
 1 1  Root mean square
diff --git a/definitions/grib2/tables/0/4.9.table b/definitions/grib2/tables/0/4.9.table
index 895f30171..7ae967e28 100644
--- a/definitions/grib2/tables/0/4.9.table
+++ b/definitions/grib2/tables/0/4.9.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.9, Probability Type
 
 0 0  Probability of event below lower limit
 1 1  Probability of event above upper limit
diff --git a/definitions/grib2/tables/0/4.91.table b/definitions/grib2/tables/0/4.91.table
index a960f56b0..498e3fe16 100644
--- a/definitions/grib2/tables/0/4.91.table
+++ b/definitions/grib2/tables/0/4.91.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.91 Category Type
 
 0 0  Below lower limit
 1 1  Above upper limit
diff --git a/definitions/grib2/tables/0/5.0.table b/definitions/grib2/tables/0/5.0.table
index 0cf3752cb..cb7fd1642 100644
--- a/definitions/grib2/tables/0/5.0.table
+++ b/definitions/grib2/tables/0/5.0.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.0, Data Representation Template Number
 0 0 Grid point data - simple packing
 1 1 Matrix value - simple packing
 2 2 Grid point data - complex packing
@@ -10,7 +9,6 @@
 50 50 Spectral data -simple packing
 51 51 Spherical harmonics data - complex packing
 61 61 Grid point data - simple packing with logarithm pre-processing
-# 192-254 Reserved for local use
 255 255 Missing
 40000 40000 JPEG2000 Packing
 40010 40010 PNG pacling
diff --git a/definitions/grib2/tables/0/5.1.table b/definitions/grib2/tables/0/5.1.table
index d7ca4bedc..d0e6c2f30 100644
--- a/definitions/grib2/tables/0/5.1.table
+++ b/definitions/grib2/tables/0/5.1.table
@@ -1,5 +1,3 @@
-# CODE TABLE 5.1, Type of original field values
 0 0  Floating point
 1 1  Integer
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/5.2.table b/definitions/grib2/tables/0/5.2.table
index a048d712e..d04bee530 100644
--- a/definitions/grib2/tables/0/5.2.table
+++ b/definitions/grib2/tables/0/5.2.table
@@ -1,6 +1,4 @@
-# CODE TABLE 5.2, Matrix coordinate value function definition
 0 0 Explicit coordinate values set
 1 1 Linear coordinates
 11 11 Geometric coordinates
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/5.3.table b/definitions/grib2/tables/0/5.3.table
index 4a673ef85..1d0207110 100644
--- a/definitions/grib2/tables/0/5.3.table
+++ b/definitions/grib2/tables/0/5.3.table
@@ -1,6 +1,4 @@
-# CODE TABLE 5.3, Matrix coordinate parameter
 1 1 Direction Degrees true
 2 2 Frequency (s-1)
 3 3 Radial number (2pi/lambda) (m-1)
-# 192-254  Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/0/5.4.table b/definitions/grib2/tables/0/5.4.table
index 1fd37966f..72d090e5a 100644
--- a/definitions/grib2/tables/0/5.4.table
+++ b/definitions/grib2/tables/0/5.4.table
@@ -1,5 +1,3 @@
-# CODE TABLE 5.4, Group Splitting Method
 0 0  Row by row splitting
 1 1  General group splitting
-# 192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/5.40.table b/definitions/grib2/tables/0/5.40.table
index 1eef7c763..1a43b2d6c 100644
--- a/definitions/grib2/tables/0/5.40.table
+++ b/definitions/grib2/tables/0/5.40.table
@@ -1,5 +1,3 @@
-# Code Table 5.40: Type of Compression
 0 0 Lossless
 1 1 Lossy
-#2-254 Reserved
 255 255 Missing
diff --git a/definitions/grib2/tables/0/5.40000.table b/definitions/grib2/tables/0/5.40000.table
index 1eef7c763..1a43b2d6c 100644
--- a/definitions/grib2/tables/0/5.40000.table
+++ b/definitions/grib2/tables/0/5.40000.table
@@ -1,5 +1,3 @@
-# Code Table 5.40: Type of Compression
 0 0 Lossless
 1 1 Lossy
-#2-254 Reserved
 255 255 Missing
diff --git a/definitions/grib2/tables/0/5.5.table b/definitions/grib2/tables/0/5.5.table
index d1caac9e8..5533ee98b 100644
--- a/definitions/grib2/tables/0/5.5.table
+++ b/definitions/grib2/tables/0/5.5.table
@@ -1,7 +1,5 @@
-# CODE TABLE 5.5, Missing Value Management for Complex Packing
 
 0 0  No explicit missing values included within data values
 1 1  Primary missing values included within data values
 2 2  Primary and secondary missing values included within data values
-# 192 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/0/5.6.table b/definitions/grib2/tables/0/5.6.table
index 4aec3314e..fedae4ebb 100644
--- a/definitions/grib2/tables/0/5.6.table
+++ b/definitions/grib2/tables/0/5.6.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.6, Order of Spatial Differencing
 
 1 1  First-order spatial differencing
 2 2  Second-order spatial differencing
diff --git a/definitions/grib2/tables/0/5.7.table b/definitions/grib2/tables/0/5.7.table
index 35b23b94d..c21dde206 100644
--- a/definitions/grib2/tables/0/5.7.table
+++ b/definitions/grib2/tables/0/5.7.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.7, Precision of floating-point numbers
 
 1 1  IEEE 32-bit (I=4 in Section 7)
 2 2  IEEE 64-bit (I=8 in Section 7)
diff --git a/definitions/grib2/tables/0/5.8.table b/definitions/grib2/tables/0/5.8.table
index c654331ff..5819a2b5f 100644
--- a/definitions/grib2/tables/0/5.8.table
+++ b/definitions/grib2/tables/0/5.8.table
@@ -1,3 +1,2 @@
-# CODE TABLE 5.8, lossless compression method
 0 no  no compression method
 255 255  Missing
diff --git a/definitions/grib2/tables/0/5.9.table b/definitions/grib2/tables/0/5.9.table
index 6925d31a3..0dab162bc 100644
--- a/definitions/grib2/tables/0/5.9.table
+++ b/definitions/grib2/tables/0/5.9.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.8, pre-processing
 0 no  no pre-processing
 1  logarithm logarithm
 255 255  Missing
diff --git a/definitions/grib2/tables/0/6.0.table b/definitions/grib2/tables/0/6.0.table
index 6a8c74b48..1eeac9562 100644
--- a/definitions/grib2/tables/0/6.0.table
+++ b/definitions/grib2/tables/0/6.0.table
@@ -1,7 +1,5 @@
-# CODE TABLE 6.0, Bit Map Indicator
 
 0 0  A bit map applies to this product and is specified in this Section
 1 1  A bit map pre-determined by the originating/generating Centre applies to this product and is not specified in this Section
-# 2 253  A bit map pre-determined by the originating/generating Centre applies to this product and is not specified in this Section
 254 254  A bit map defined previously in the same "GRIB" message applies to this product
 255 255  A bit map does not apply to this product
diff --git a/definitions/grib2/tables/0/stepType.table b/definitions/grib2/tables/0/stepType.table
index d88e44123..10721eb25 100644
--- a/definitions/grib2/tables/0/stepType.table
+++ b/definitions/grib2/tables/0/stepType.table
@@ -1,4 +1,3 @@
-# CODE TABLE Step Type
 
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/1/0.0.table b/definitions/grib2/tables/1/0.0.table
index fd2056350..0dd70a18a 100644
--- a/definitions/grib2/tables/1/0.0.table
+++ b/definitions/grib2/tables/1/0.0.table
@@ -1,10 +1,6 @@
-#Code Table 0.0: Discipline of processed data in the GRIB message, number of GRIB Master Table
 0 0 Meteorological products
 1 1 Hydrological products
 2 2 Land surface products
 3 3 Space products
-# 4-9 Reserved
 10 10 Oceanographic products
-# 11-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/1.0.table b/definitions/grib2/tables/1/1.0.table
index a34f44ee1..3c5223d3b 100644
--- a/definitions/grib2/tables/1/1.0.table
+++ b/definitions/grib2/tables/1/1.0.table
@@ -1,7 +1,5 @@
-# Code Table 1.0: GRIB Master Tables Version Number
 0 0 Experimental
 1 1 Initial operational version number
 2 2 Previous operational version number
 3 3 Current operational version number implemented on 2 November 2005
-# 4-254 Future operational version numbers
 255 255 Master tables not used. Local table entries and local templates may use the entire range of the table, not just those sections marked Reserved for local used.
diff --git a/definitions/grib2/tables/1/1.1.table b/definitions/grib2/tables/1/1.1.table
index 6c5a60361..a3c2fdc79 100644
--- a/definitions/grib2/tables/1/1.1.table
+++ b/definitions/grib2/tables/1/1.1.table
@@ -1,5 +1,2 @@
-# Code Table 1.1 GRIB Local Tables Version Number
 0 0	Local tables not used 
-# . Only table entries and templates from the current Master table are valid.
-# 1-254		Number of local tables version used
 255 255	Missing
diff --git a/definitions/grib2/tables/1/1.2.table b/definitions/grib2/tables/1/1.2.table
index eb8755209..a4e2cc41f 100644
--- a/definitions/grib2/tables/1/1.2.table
+++ b/definitions/grib2/tables/1/1.2.table
@@ -1,8 +1,5 @@
-# CODE TABLE 1.2, Significance of Reference Time
 0 0  Analysis
 1 1  Start of forecast
 2 2  Verifying time of forecast
 3 3  Observation time
-#4-191 Reserved
-#192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/1.3.table b/definitions/grib2/tables/1/1.3.table
index d4ed48c63..ce83b4950 100644
--- a/definitions/grib2/tables/1/1.3.table
+++ b/definitions/grib2/tables/1/1.3.table
@@ -1,10 +1,7 @@
-# CODE TABLE 1.3, Production status of data
 0 0  Operational products
 1 1  Operational test products
 2 2  Research products
 3 3  Re-analysis products
 4 4  TIGGE Operational products
 5 5  TIGGE test products
-# 4-191 Reserved
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/1.4.table b/definitions/grib2/tables/1/1.4.table
index ac21f5c4c..a712f07a6 100644
--- a/definitions/grib2/tables/1/1.4.table
+++ b/definitions/grib2/tables/1/1.4.table
@@ -1,4 +1,3 @@
-# CODE TABLE 1.4, Type of data
 0 an Analysis products
 1 fc Forecast products
 2 af  Analysis and forecast products
@@ -8,6 +7,4 @@
 6 sa  Processed satellite observations
 7 ra  Processed radar observations
 8 ep  Event Probability
-# 8-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/3.0.table b/definitions/grib2/tables/1/3.0.table
index 6030a5132..be8be1209 100644
--- a/definitions/grib2/tables/1/3.0.table
+++ b/definitions/grib2/tables/1/3.0.table
@@ -1,6 +1,3 @@
-# CODE TABLE 3.0, Source of Grid Definition
 0 0 Specified in Code table 3.1
 1 1 Predetermined grid definition 	Defined by originating centre
-# 2-191 Reserved
-# 192-254 Reserved for local use
 255 255 A grid definition does not apply to this product
diff --git a/definitions/grib2/tables/1/3.1.table b/definitions/grib2/tables/1/3.1.table
index 235fb8bd3..f81f9f05a 100644
--- a/definitions/grib2/tables/1/3.1.table
+++ b/definitions/grib2/tables/1/3.1.table
@@ -1,43 +1,26 @@
-# CODE TABLE 3.1, Grid Definition Template Number
 0 0 Latitude/longitude. Also called equidistant cylindrical, or Plate Carree
 1 1 Rotated latitude/longitude
 2 2 Stretched latitude/longitude
 3 3 Stretched and rotated latitude/longitude
-# 4-9 Reserved
 10 10 Mercator
-# 11-19 Reserved
 20 20 Polar stereographic can be south or north
-# 21-29 Reserved
 30 30 Lambert Conformal can be secant or tangent, conical or bipolar
 31 31 Albers equal-area
-# 32-39 Reserved
 40 40 Gaussian latitude/longitude
 41 41 Rotated Gaussian latitude/longitude
 42 42 Stretched Gaussian latitude/longitude
 43 43 Stretched and rotated Gaussian latitude/longitude
-# 44-49 Reserved
 50 50 Spherical harmonic coefficients
 51 51 Rotated spherical harmonic coefficients
 52 52 Stretched spherical harmonic coefficients
 53 53 Stretched and rotated spherical harmonic coefficients
-# 54-89 Reserved
 90 90 Space view perspective orthographic
-# 91-99 Reserved
 100 100 Triangular grid based on an icosahedron
-# 101-109 Reserved
 110 110 Equatorial azimuthal equidistant projection
-# 111-119 Reserved
 120 120 Azimuth-range projection
-# 121-129 Reserved
 130 130 Irregular latitude/longitude grid
-# 131-139 Reserved
 140 140 Lambert azimuthal equal area projection
-# 141-999 Reserved
 1000 1000 Cross-section grid, with points equally spaced on the horizontal
-# 1001-1099 Reserved
 1100 1100 Hovmoller diagram grid, with points equally spaced on the horizontal
-# 1101-1199 Reserved
 1200 1200 Time section grid
-# 1201-32767 Reserved
-# 32768-65534 Reserved for local use
 65535 65535 Missing
diff --git a/definitions/grib2/tables/1/3.10.table b/definitions/grib2/tables/1/3.10.table
index ae5baf9d5..6b635d900 100644
--- a/definitions/grib2/tables/1/3.10.table
+++ b/definitions/grib2/tables/1/3.10.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.10, Scanning mode for one diamond
 1 0 Points scan in +i direction, i.e. from pole to equator
 1 1 Points scan in -i direction, i.e. from equator to pole
 2 0 Points scan in +j direction, i.e. from west to east
diff --git a/definitions/grib2/tables/1/3.11.table b/definitions/grib2/tables/1/3.11.table
index 9a84d4a95..16e6f46b0 100644
--- a/definitions/grib2/tables/1/3.11.table
+++ b/definitions/grib2/tables/1/3.11.table
@@ -1,4 +1,3 @@
-# CODE TABLE 3.11, Interpretation of list of numbers defining number of points
 0 0  There is no appended list
 1 1  Numbers define number of points corresponding to full coordinate circles (i.e. parallels), coordinate values on each circle are multiple of the circle mesh, and extreme coordinate values given in grid definition (i.e. extreme longitudes) may not be reached in all rows
 2 2  Numbers define number of points corresponding to coordinate lines delimited by extreme coordinate values given in grid definition (i.e. extreme longitudes) which are present in each row
diff --git a/definitions/grib2/tables/1/3.15.table b/definitions/grib2/tables/1/3.15.table
index bb431e14f..f4c6b2a1b 100644
--- a/definitions/grib2/tables/1/3.15.table
+++ b/definitions/grib2/tables/1/3.15.table
@@ -1,7 +1,4 @@
-# CODE TABLE 3.15, Physical meaning of vertical coordinate
-# 0-19 Reserved
 20 20 Temperature K
-# 21-99 Reserved
 100 100 Pressure Pa
 101 101 Pressure deviation from mean sea level Pa
 102 102 Altitude above mean sea level m
@@ -15,11 +12,5 @@
 110 110 Geometrical height m
 111 111 Eta coordinate (see Note 2)
 112 112 Geopotential height gpm
-# 113-159 Reserved
 160 160 Depth below sea level m
-# 161-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.
diff --git a/definitions/grib2/tables/1/3.2.table b/definitions/grib2/tables/1/3.2.table
index d037ee120..58a33e567 100644
--- a/definitions/grib2/tables/1/3.2.table
+++ b/definitions/grib2/tables/1/3.2.table
@@ -1,4 +1,3 @@
-# CODE TABLE 3.2, Shape of the Earth
 0 0  Earth assumed spherical with radius = 6,367,470.0 m
 1 1  Earth assumed spherical with radius specified by data producer
 2 2  Earth assumed oblate spheroid with size as determined by IAU in 1965 (major axis = 6,378,160.0 m, minor axis = 6,356,775.0 m, f = 1/297.0)
@@ -6,6 +5,4 @@
 4 4  Earth assumed oblate spheroid as defined in IAG-GRS80 model (major axis = 6,378,137.0 m, minor axis = 6,356,752.314 m, f = 1/298.257222101)
 5 5  Earth assumed represented by WGS84 (as used by ICAO since 1998)
 6 6  Earth assumed spherical with radius of 6,371,229.0 m
-# 7-191 Reserved
-# 192- 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/3.20.table b/definitions/grib2/tables/1/3.20.table
index cfa35ae38..25995dccf 100644
--- a/definitions/grib2/tables/1/3.20.table
+++ b/definitions/grib2/tables/1/3.20.table
@@ -1,6 +1,3 @@
-# CODE TABLE 3.20, Type of horizontal line
 0 0  Rhumb
 1 1  Great circle
-# 2-191 Reserved
-# 192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/3.21.table b/definitions/grib2/tables/1/3.21.table
index c2fd94586..1b9b7d685 100644
--- a/definitions/grib2/tables/1/3.21.table
+++ b/definitions/grib2/tables/1/3.21.table
@@ -1,8 +1,4 @@
-# CODE TABLE 3.21, Vertical dimension coordinate values definition
 0 0  Explicit coordinate values set
 1 1  Linear coordinates
-# 2-10 Reserved
 11 11  Geometric coordinates
-# 12-191 Reserved
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/3.3.table b/definitions/grib2/tables/1/3.3.table
index 84cbb8bcc..90202ecd8 100644
--- a/definitions/grib2/tables/1/3.3.table
+++ b/definitions/grib2/tables/1/3.3.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.3, Resolution and Component Flags
 3 0 i direction increments not given
 3 1 i direction increments given
 4 0 j direction increments not given
diff --git a/definitions/grib2/tables/1/3.4.table b/definitions/grib2/tables/1/3.4.table
index 51d0664b2..b93252d83 100644
--- a/definitions/grib2/tables/1/3.4.table
+++ b/definitions/grib2/tables/1/3.4.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.4, Scanning Mode
 1 0 Points of first row or column scan in the +i (+x) direction
 1 1 Points of first row or column scan in the -i (-x) direction
 2 0 Points of first row or column scan in the -j (-y) direction
diff --git a/definitions/grib2/tables/1/3.5.table b/definitions/grib2/tables/1/3.5.table
index 117b26be3..07c9a5f8c 100644
--- a/definitions/grib2/tables/1/3.5.table
+++ b/definitions/grib2/tables/1/3.5.table
@@ -1,4 +1,3 @@
-# FLAG TABLE 3.5, Projection Centre
 1 0 North Pole is on the projection plane
 1 1 South Pole is on the projection plane
 2 0 Only one projection centre is used
diff --git a/definitions/grib2/tables/1/3.6.table b/definitions/grib2/tables/1/3.6.table
index 41dd97e4a..c0b792e56 100644
--- a/definitions/grib2/tables/1/3.6.table
+++ b/definitions/grib2/tables/1/3.6.table
@@ -1,2 +1 @@
-# CODE TABLE 3.6, Spectral data representation type
 1 1  The Associated Legendre Functions of the first kind are defined by:
diff --git a/definitions/grib2/tables/1/3.7.table b/definitions/grib2/tables/1/3.7.table
index fa8fe356b..579f4bab4 100644
--- a/definitions/grib2/tables/1/3.7.table
+++ b/definitions/grib2/tables/1/3.7.table
@@ -1,4 +1,3 @@
-# Code Table 3.7: Spectral data representation mode
 0 0 Reserved
 1 1 The complex numbers Fnm
 255 255 Missing
diff --git a/definitions/grib2/tables/1/3.8.table b/definitions/grib2/tables/1/3.8.table
index 0d9b7d001..d9c89cf30 100644
--- a/definitions/grib2/tables/1/3.8.table
+++ b/definitions/grib2/tables/1/3.8.table
@@ -1,8 +1,5 @@
-# Code table 3.8: Grid point position
 0 0 Grid points at triangle vertices
 1 1 Grid points at centres of triangles
 2 2 Grid points at midpoints of triangle sides
-#3-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/3.9.table b/definitions/grib2/tables/1/3.9.table
index 800c08259..83441c0ab 100644
--- a/definitions/grib2/tables/1/3.9.table
+++ b/definitions/grib2/tables/1/3.9.table
@@ -1,3 +1,2 @@
-# FLAG TABLE 3.9, Numbering order of diamonds as seen from the corresponding pole
 1 0 Clockwise orientation
 1 1 Anti-clockwise (i.e., counter-clockwise) orientation
diff --git a/definitions/grib2/tables/1/4.0.table b/definitions/grib2/tables/1/4.0.table
index 759512a0c..862f03e7c 100644
--- a/definitions/grib2/tables/1/4.0.table
+++ b/definitions/grib2/tables/1/4.0.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.0, Product Definition Template Number
 0 0 Analysis or forecast at a horizontal level or in a horizontal layer at a point in time
 1 1 Individual ensemble forecast, control and perturbed, at a horizontal level or in a horizontal layer at a point in time
 2 2 Derived forecast based on all ensemble members at a horizontal level or in a horizontal layer at a point in time
diff --git a/definitions/grib2/tables/1/4.1.0.table b/definitions/grib2/tables/1/4.1.0.table
index 33d1c3984..dd5c30afe 100644
--- a/definitions/grib2/tables/1/4.1.0.table
+++ b/definitions/grib2/tables/1/4.1.0.table
@@ -1,5 +1,3 @@
-#Discipline 0: Meteorological products
-#Category Description
 0 0 Temperature
 1 1 Moisture
 2 2 Momentum
@@ -21,10 +19,8 @@
 18 18 Nuclear/radiology
 19 19 Physical atmospheric properties
 20 20 Atmospheric chemical or physical constituents
-# 20-189 Reserved
 190 190 CCITT IA5 string
 191 191 Miscellaneous
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/1/4.1.1.table b/definitions/grib2/tables/1/4.1.1.table
index ebb7d9ea0..9b3222b5e 100644
--- a/definitions/grib2/tables/1/4.1.1.table
+++ b/definitions/grib2/tables/1/4.1.1.table
@@ -1,9 +1,5 @@
-#Discipline 1: Hydrological products
-#Category Description
 0 0 Hydrology basic products
 1 1 Hydrology probabilities
-#2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/1/4.1.10.table b/definitions/grib2/tables/1/4.1.10.table
index 45b08caaa..9472c5f4c 100644
--- a/definitions/grib2/tables/1/4.1.10.table
+++ b/definitions/grib2/tables/1/4.1.10.table
@@ -1,12 +1,8 @@
-#Discipline 10: Oceanographic Products
-#Category Description
 0 0 Waves
 1 1 Currents
 2 2 Ice
 3 3 Surface Properties
 4 4 Sub-surface Properties
-# 5-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/1/4.1.2.table b/definitions/grib2/tables/1/4.1.2.table
index f7f2ea2ba..3fbf491b8 100644
--- a/definitions/grib2/tables/1/4.1.2.table
+++ b/definitions/grib2/tables/1/4.1.2.table
@@ -1,11 +1,7 @@
-#Discipline 2: Land Surface Products
-#Category Description
 0 0 Vegetation/Biomass
 1 1 Agri-/aquacultural Special Products
 2 2 Transportation-related Products
 3 3 Soil Products
-# 4-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/1/4.1.3.table b/definitions/grib2/tables/1/4.1.3.table
index f7578e163..aad184600 100644
--- a/definitions/grib2/tables/1/4.1.3.table
+++ b/definitions/grib2/tables/1/4.1.3.table
@@ -1,9 +1,5 @@
-#Discipline 3: Space Products
-#Category Description
 0 0 Image format products
 1 1 Quantitative products
-# 2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/1/4.1.table b/definitions/grib2/tables/1/4.1.table
index cc5bb2ffd..4c6659045 100644
--- a/definitions/grib2/tables/1/4.1.table
+++ b/definitions/grib2/tables/1/4.1.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.1, Category of parameters by product discipline
 0 0 Temperature
 1 1 Moisture
 3 3 Mass
diff --git a/definitions/grib2/tables/1/4.10.table b/definitions/grib2/tables/1/4.10.table
index 9cf447b69..3a4280b39 100644
--- a/definitions/grib2/tables/1/4.10.table
+++ b/definitions/grib2/tables/1/4.10.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.10, Type of statistical processing
 
 0 avg  Average
 1 accum  Accumulation
@@ -10,5 +9,4 @@
 7 cov  Covariance (Temporal variance)
 8 8  Difference (Value at the start of time range minus value at the end)
 9 ratio  Ratio
-# 192 254  Reserved for local use
 255 missing  Missing
diff --git a/definitions/grib2/tables/1/4.11.table b/definitions/grib2/tables/1/4.11.table
index 68901aac4..e4f6514b0 100644
--- a/definitions/grib2/tables/1/4.11.table
+++ b/definitions/grib2/tables/1/4.11.table
@@ -1,9 +1,7 @@
-# CODE TABLE 4.11, Type of time intervals
 
 1 1  Successive times processed have same forecast time, start time of forecast is incremented
 2 2  Successive times processed have same start time of forecast, forecast time is incremented
 3 3  Successive times processed have start time of forecast incremented and forecast time decremented so that valid time remains constant
 4 4  Successive times processed have start time of forecast decremented and forecast time incremented so that valid time remains constant
 5 5  Floating subinterval of time between forecast time and end of overall time interval
-# 192 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/4.12.table b/definitions/grib2/tables/1/4.12.table
index 86b6177be..ccc846d23 100644
--- a/definitions/grib2/tables/1/4.12.table
+++ b/definitions/grib2/tables/1/4.12.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.12, Operating Mode
 
 0 0  Maintenance Mode
 1 1  Clear air
diff --git a/definitions/grib2/tables/1/4.13.table b/definitions/grib2/tables/1/4.13.table
index ddd7537d0..6a5cad1ac 100644
--- a/definitions/grib2/tables/1/4.13.table
+++ b/definitions/grib2/tables/1/4.13.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.13, Quality Control Indicator
 
 0 0  No quality control applied
 1 1  Quality control applied
diff --git a/definitions/grib2/tables/1/4.14.table b/definitions/grib2/tables/1/4.14.table
index 69984d720..f43e9812f 100644
--- a/definitions/grib2/tables/1/4.14.table
+++ b/definitions/grib2/tables/1/4.14.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.14, Clutter Filter Indicator
 
 0 0  No clutter filter used
 1 1  Clutter filter used
diff --git a/definitions/grib2/tables/1/4.15.table b/definitions/grib2/tables/1/4.15.table
index 49b0b2d26..659d07036 100644
--- a/definitions/grib2/tables/1/4.15.table
+++ b/definitions/grib2/tables/1/4.15.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.15, Type of auxiliary information
 
 0 0  Confidence level ('grib2/4.151.table')
 1 1  Delta time (seconds)
diff --git a/definitions/grib2/tables/1/4.151.table b/definitions/grib2/tables/1/4.151.table
index bcfa0aea7..be56a229a 100644
--- a/definitions/grib2/tables/1/4.151.table
+++ b/definitions/grib2/tables/1/4.151.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.15, Confidence level units       
 
 0 0  bad
 1 1  suspect
diff --git a/definitions/grib2/tables/1/4.2.0.0.table b/definitions/grib2/tables/1/4.2.0.0.table
index 0386b8cd2..f935dec76 100644
--- a/definitions/grib2/tables/1/4.2.0.0.table
+++ b/definitions/grib2/tables/1/4.2.0.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 0: Temperature
 0 0 Temperature (K)
 1 1 Virtual temperature (K)
 2 2 Potential temperature (K)
@@ -17,7 +16,5 @@
 15 15 Virtual potential temperature (K)
 16 16 Snow phase change heat flux (W m-2)
 17 17 Skin Temperature (K)
-#17-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.1.table b/definitions/grib2/tables/1/4.2.0.1.table
index 154f2d007..f760821b7 100644
--- a/definitions/grib2/tables/1/4.2.0.1.table
+++ b/definitions/grib2/tables/1/4.2.0.1.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 1: Moisture
 0 0 Specific humidity (kg kg-1)
 1 1 Relative humidity (%)
 2 2 Humidity mixing ratio (kg kg-1)
@@ -56,7 +55,5 @@
 58 58 Convective snowfall rate (m s-1)
 59 59 Large scale snowfall rate (m s-1)
 60 60 Snow depth water equivalent (kg m-2)
-#47-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.13.table b/definitions/grib2/tables/1/4.2.0.13.table
index 8fc3425af..567dce2e9 100644
--- a/definitions/grib2/tables/1/4.2.0.13.table
+++ b/definitions/grib2/tables/1/4.2.0.13.table
@@ -1,6 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 13: Aerosols
 0 0 Aerosol type (Code table 4.205)
-#  1-191 Reserved
-#  192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.14.table b/definitions/grib2/tables/1/4.2.0.14.table
index 309c40d47..ad1f023f0 100644
--- a/definitions/grib2/tables/1/4.2.0.14.table
+++ b/definitions/grib2/tables/1/4.2.0.14.table
@@ -1,7 +1,4 @@
-# Product Discipline 0: Meteorological products, Parameter Category 14: Trace Gases
 0 0 Total ozone (Dobson)
 1 1 Ozone mixing ratio (kg kg-1)
-# 2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.15.table b/definitions/grib2/tables/1/4.2.0.15.table
index bb419178b..2e48bedcc 100644
--- a/definitions/grib2/tables/1/4.2.0.15.table
+++ b/definitions/grib2/tables/1/4.2.0.15.table
@@ -1,4 +1,3 @@
-# Product Discipline 0 - Meteorological products, Parameter Category 15: Radar
 0 0 Base spectrum width (m s-1)
 1 1 Base reflectivity (dB)
 2 2 Base radial velocity (m s-1)
@@ -8,7 +7,5 @@
 6 6 Radar spectra (1) (-)
 7 7 Radar spectra (2) (-)
 8 8 Radar spectra (3) (-)
-# 9-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.18.table b/definitions/grib2/tables/1/4.2.0.18.table
index 5c0fd6e5d..156a65d70 100644
--- a/definitions/grib2/tables/1/4.2.0.18.table
+++ b/definitions/grib2/tables/1/4.2.0.18.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 18: Nuclear/radiology
 0 0 Air concentration of Caesium 137 (Bq m-3)
 1 1 Air concentration of Iodine 131 (Bq m-3)
 2 2 Air concentration of radioactive pollutant (Bq m-3)
@@ -8,7 +7,5 @@
 6 6 Time-integrated air concentration of caesium pollutant (Bq s m-3)
 7 7 Time-integrated air concentration of iodine pollutant (Bq s m-3)
 8 8 Time-integrated air concentration of radioactive pollutant (Bq s m-3)
-# 9-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.19.table b/definitions/grib2/tables/1/4.2.0.19.table
index 369c3f657..7c495a607 100644
--- a/definitions/grib2/tables/1/4.2.0.19.table
+++ b/definitions/grib2/tables/1/4.2.0.19.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 19: Physical atmospheric properties
 0 0 Visibility (m)
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
@@ -18,7 +17,5 @@
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
 18 18 Snow free albedo (%)
-# 19-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.190.table b/definitions/grib2/tables/1/4.2.0.190.table
index b1f47bc02..181e9bb59 100644
--- a/definitions/grib2/tables/1/4.2.0.190.table
+++ b/definitions/grib2/tables/1/4.2.0.190.table
@@ -1,6 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 190: CCITT IA5 string
 0 0 Arbitrary text string (CCITTIA5)
-# 1-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.191.table b/definitions/grib2/tables/1/4.2.0.191.table
index affb98f42..592810f9c 100644
--- a/definitions/grib2/tables/1/4.2.0.191.table
+++ b/definitions/grib2/tables/1/4.2.0.191.table
@@ -1,6 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 191: Miscellaneous
 0 0 Seconds prior to initial reference time (defined in Section 1) (s)
-# 1-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.2.table b/definitions/grib2/tables/1/4.2.0.2.table
index 1ec945102..ac23abf79 100644
--- a/definitions/grib2/tables/1/4.2.0.2.table
+++ b/definitions/grib2/tables/1/4.2.0.2.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 2: Momentum
 0 0 Wind direction (from which blowing) (deg true)
 1 1 Wind speed (m s-1)
 2 2 u-component of wind (m s-1)
@@ -30,6 +29,4 @@
 28 28 V-component storm motion (m s-1)
 29 29 Drag coefficient (Numeric)
 30 30 Frictional velocity (m s-1)
-# 31-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/4.2.0.20.table b/definitions/grib2/tables/1/4.2.0.20.table
index 4e7f45db4..4e5938bb4 100644
--- a/definitions/grib2/tables/1/4.2.0.20.table
+++ b/definitions/grib2/tables/1/4.2.0.20.table
@@ -8,6 +8,4 @@
 7 7	Chemical gross production rate of mole concentration	mole.m-3.s-1
 8 8	Chemical gross destruction rate of mole concentration	mole.m-3.s-1
 9 9	Surface dry deposition mass flux into stomata	kg.m-2.s-1
-#10-191	Reserved	
-#192-254	Reserved for local use	
 255 255	Missing	
diff --git a/definitions/grib2/tables/1/4.2.0.3.table b/definitions/grib2/tables/1/4.2.0.3.table
index 5c7e8151d..af5504ba5 100644
--- a/definitions/grib2/tables/1/4.2.0.3.table
+++ b/definitions/grib2/tables/1/4.2.0.3.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 3: Mass
  0 0 Pressure (Pa)
  1 1 Pressure reduced to MSL (Pa)
  2 2 Pressure tendency (Pa s-1)
@@ -19,7 +18,5 @@
  17 17 Meridional flux of gravity wave stress (N m-2)
  18 18 Planetary boundary layer height (m)
  19 19 5-wave geopotential height anomaly (gpm)
-# 20-191 Reserved
-# 192-254 Reserved for local use
  255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.4.table b/definitions/grib2/tables/1/4.2.0.4.table
index 815c184a2..fc42fba67 100644
--- a/definitions/grib2/tables/1/4.2.0.4.table
+++ b/definitions/grib2/tables/1/4.2.0.4.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 4: Short-wave Radiation
 0 0 Net short-wave radiation flux (surface) (W m-2)
 1 1 Net short-wave radiation flux (top of atmosphere) (W m-2)
 2 2 Short wave radiation flux (W m-2)
@@ -8,7 +7,5 @@
 6 6 Radiance (with respect to wave length) (W m-3 sr-1)
 7 7 Downward short-wave radiation flux (W m-2)
 9 8 Upward short-wave radiation flux (W m-2)
-# 9-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.5.table b/definitions/grib2/tables/1/4.2.0.5.table
index 1b57fa301..94d7b971e 100644
--- a/definitions/grib2/tables/1/4.2.0.5.table
+++ b/definitions/grib2/tables/1/4.2.0.5.table
@@ -1,11 +1,8 @@
-# Product Discipline 0: Meteorological products, Parameter Category 5: Long-wave Radiation
 0 0 Net long wave radiation flux (surface) (W m-2)
 1 1 Net long wave radiation flux (top of atmosphere) (W m-2)
 2 2 Long wave radiation flux (W m-2)
 3 3 Downward long-wave radiation flux (W m-2)
 4 4 Upward long-wave radiation flux (W m-2)
 5 5 Net long wave radiation flux (W m-2)
-# 5-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.6.table b/definitions/grib2/tables/1/4.2.0.6.table
index 05cf72f57..504fc6796 100644
--- a/definitions/grib2/tables/1/4.2.0.6.table
+++ b/definitions/grib2/tables/1/4.2.0.6.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 6: Cloud
 0 0 Cloud Ice (kg m-2)
 1 1 Total cloud cover (%)
 2 2 Convective cloud cover (%)
@@ -24,7 +23,5 @@
 22 22 Cloud cover (%)
 23 23 Cloud ice mixing ratio (kg kg-1)
 24 24 Sunshine (Numeric)
-# 23-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.0.7.table b/definitions/grib2/tables/1/4.2.0.7.table
index 78374fde5..3e2ce318a 100644
--- a/definitions/grib2/tables/1/4.2.0.7.table
+++ b/definitions/grib2/tables/1/4.2.0.7.table
@@ -1,4 +1,3 @@
-# Product Discipline 0: Meteorological products, Parameter Category 7: Thermodynamic Stability Indices
 0 0 Parcel lifted index (to 500 hPa) (K)
 1 1 Best lifted index (to 500 hPa) (K)
 2 2 K index (K)
@@ -12,7 +11,5 @@
 10 10 Surface lifted index (K)
 11 11 Best (4-layer) lifted index (K)
 12 12 Richardson number (Numeric)
-#13-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.1.0.table b/definitions/grib2/tables/1/4.2.1.0.table
index 1e867e1cb..3147f8c2a 100644
--- a/definitions/grib2/tables/1/4.2.1.0.table
+++ b/definitions/grib2/tables/1/4.2.1.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 1: Hydrologic products, Parameter Category 0: Hydrology basic products
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
 2 2 Remotely sensed snow cover (Code table 4.215)
@@ -6,6 +5,4 @@
 4 4 Snow water equivalent percent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
-# 7-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/4.2.1.1.table b/definitions/grib2/tables/1/4.2.1.1.table
index b7342ef2f..a86c29c6c 100644
--- a/definitions/grib2/tables/1/4.2.1.1.table
+++ b/definitions/grib2/tables/1/4.2.1.1.table
@@ -1,8 +1,5 @@
-# Product Discipline 1: Hydrologic products, Parameter Category 1: Hydrology probabilities 
 0 0 Conditional percent precipitation amount fractile for an overall period (Encoded as an accumulation) (kg m-2)
 1 1 Percent precipitation in a sub-period of an overall period (Encoded as per cent accumulation over the sub-period) (%)
 2 2 Probability of 0.01 inch of precipitation (POP) (%)
-#3-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.10.0.table b/definitions/grib2/tables/1/4.2.10.0.table
index 479e26d51..98a0fedfb 100644
--- a/definitions/grib2/tables/1/4.2.10.0.table
+++ b/definitions/grib2/tables/1/4.2.10.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 0: Waves
 0 0 Wave spectra (1) (-)
 1 1 Wave spectra (2) (-)
 2 2 Wave spectra (3) (-)
@@ -13,8 +12,6 @@
 11 11 Primary wave mean period (s)
 12 12 Secondary wave direction (Degree true)
 13 13 Secondary wave mean period (s)
-# 14-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
 
 
diff --git a/definitions/grib2/tables/1/4.2.10.1.table b/definitions/grib2/tables/1/4.2.10.1.table
index df18f31dd..8c92ae826 100644
--- a/definitions/grib2/tables/1/4.2.10.1.table
+++ b/definitions/grib2/tables/1/4.2.10.1.table
@@ -1,8 +1,5 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 1: Currents
 0 0 Current direction (Degree true)
 1 1 Current speed (m s-1)
 2 2 u-component of current (m s-1)
 3 3 v-component of current (m s-1)
-# 4-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/4.2.10.2.table b/definitions/grib2/tables/1/4.2.10.2.table
index cb73da46c..7297632c2 100644
--- a/definitions/grib2/tables/1/4.2.10.2.table
+++ b/definitions/grib2/tables/1/4.2.10.2.table
@@ -1,4 +1,3 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 2: Ice
 0 0 Ice cover (Proportion)
 1 1 Ice thickness (m)
 2 2 Direction of ice drift (Degree true)
@@ -7,6 +6,4 @@
 5 5 v-component of ice drift (m s-1)
 6 6 Ice growth rate (m s-1)
 7 7 Ice divergence (s-1)
-# 8-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/4.2.10.3.table b/definitions/grib2/tables/1/4.2.10.3.table
index a14ae22e3..9e805aefa 100644
--- a/definitions/grib2/tables/1/4.2.10.3.table
+++ b/definitions/grib2/tables/1/4.2.10.3.table
@@ -1,6 +1,3 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 3: Surface Properties
 0 0 Water temperature (K)
 1 1 Deviation of sea level from mean (m)
-# 2-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/4.2.10.4.table b/definitions/grib2/tables/1/4.2.10.4.table
index a24c3c8c4..20a604c30 100644
--- a/definitions/grib2/tables/1/4.2.10.4.table
+++ b/definitions/grib2/tables/1/4.2.10.4.table
@@ -1,9 +1,6 @@
-# Product Discipline 10: Oceanographic products, Parameter Category 4: Sub-surface Properties
 0 0 Main thermocline depth (m)
 1 1 Main thermocline anomaly (m)
 2 2 Transient thermocline depth (m)
 3 3 Salinity (kg kg-1)
-# 4-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.2.0.table b/definitions/grib2/tables/1/4.2.2.0.table
index fdc8ce0ef..5678022f2 100644
--- a/definitions/grib2/tables/1/4.2.2.0.table
+++ b/definitions/grib2/tables/1/4.2.2.0.table
@@ -1,4 +1,3 @@
-# Product Discipline 2: Land surface products, Parameter Category 0: Vegetation/Biomass
 0 0 Land cover (0=land, 1=sea) (Proportion)
 1 1 Surface roughness (m)
 2 2 Soil temperature (K)
@@ -23,7 +22,5 @@
 21 21 Humidity parameter in canopy conductance (Proportion)
 22 22 Soil moisture (kg m-3)
 26 26 Wilting point (kg m-3)
-# 23-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.2.3.table b/definitions/grib2/tables/1/4.2.2.3.table
index d6376fecb..6d993394a 100644
--- a/definitions/grib2/tables/1/4.2.2.3.table
+++ b/definitions/grib2/tables/1/4.2.2.3.table
@@ -1,4 +1,3 @@
-# Product Discipline 2: Land surface products, Parameter Category 3: Soil Products
 0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
@@ -10,7 +9,5 @@
 8 8 Direct evaporation cease (soil moisture) (Proportion)
 9 9 Soil porosity (Proportion)
 12 12 Transpiration stress-onset (soil moisture) (kg m-3)
-# 11-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.3.0.table b/definitions/grib2/tables/1/4.2.3.0.table
index 944566388..7e9e74e66 100644
--- a/definitions/grib2/tables/1/4.2.3.0.table
+++ b/definitions/grib2/tables/1/4.2.3.0.table
@@ -1,4 +1,3 @@
-# Product discipline 3: Space products, Parameter Category 0: Image format products
 0 0 Scaled radiance (Numeric)
 1 1 Scaled albedo (Numeric)
 2 2 Scaled brightness temperature (Numeric)
@@ -8,7 +7,5 @@
 6 6 Scaled skin temperature (Numeric)
 7 7 Cloud mask (Code table 4.217)
 8 8 Pixel scene type (Code table 4.218)
-# 9-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.3.1.table b/definitions/grib2/tables/1/4.2.3.1.table
index 60d6e8420..e01f22110 100644
--- a/definitions/grib2/tables/1/4.2.3.1.table
+++ b/definitions/grib2/tables/1/4.2.3.1.table
@@ -1,11 +1,8 @@
-# Product Discipline 3: Space products, Parameter Category 1: Quantitative products
 0 0 Estimated precipitation (kg m-2)
 1 1 Instantaneous rain rate (kg m-2 s-1)
 2 2 Cloud top height (m)
 3 3 Cloud top height quality indicator (Code table 4.219)
 4 4 Estimated u component of wind (m s-1)
 5 5 Estimated v component of wind (m s-1)
-# 6-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
 
diff --git a/definitions/grib2/tables/1/4.2.table b/definitions/grib2/tables/1/4.2.table
index ff9553645..e69de29bb 100644
--- a/definitions/grib2/tables/1/4.2.table
+++ b/definitions/grib2/tables/1/4.2.table
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/1/4.201.table b/definitions/grib2/tables/1/4.201.table
index 7445c9c20..7ee3a7031 100644
--- a/definitions/grib2/tables/1/4.201.table
+++ b/definitions/grib2/tables/1/4.201.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.201, Precipitation Type
 
 1 1  Rain
 2 2  Thunderstorm
diff --git a/definitions/grib2/tables/1/4.202.table b/definitions/grib2/tables/1/4.202.table
index 69dbe3a5d..cee4c9e63 100644
--- a/definitions/grib2/tables/1/4.202.table
+++ b/definitions/grib2/tables/1/4.202.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.202, Precipitable water category
 
 192 192  Reserved for local use
 193 193  Reserved for local use
diff --git a/definitions/grib2/tables/1/4.203.table b/definitions/grib2/tables/1/4.203.table
index 057f40910..1f8dbef65 100644
--- a/definitions/grib2/tables/1/4.203.table
+++ b/definitions/grib2/tables/1/4.203.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.203, Cloud type
 0 0  Clear
 1 1  Cumulonimbus
 2 2  Stratus
@@ -21,5 +20,4 @@
 19 19  Cirrocumulus - ground based fog beneath the lowest layer
 20 20  Cirrus - ground based fog beneath the lowest layer
 191 191  Unknown
-# 192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/4.204.table b/definitions/grib2/tables/1/4.204.table
index 23b60cf77..6ff5c3538 100644
--- a/definitions/grib2/tables/1/4.204.table
+++ b/definitions/grib2/tables/1/4.204.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.204, Thunderstorm coverage
 
 0 0  None
 1 1  Isolated (1%  - 2%)
diff --git a/definitions/grib2/tables/1/4.205.table b/definitions/grib2/tables/1/4.205.table
index 98c7b48ec..7594bc0ea 100644
--- a/definitions/grib2/tables/1/4.205.table
+++ b/definitions/grib2/tables/1/4.205.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.205, Aerosol type
 
 0 0  Aerosol not present
 1 1  Aerosol present
diff --git a/definitions/grib2/tables/1/4.206.table b/definitions/grib2/tables/1/4.206.table
index b1ef2e787..40463d37c 100644
--- a/definitions/grib2/tables/1/4.206.table
+++ b/definitions/grib2/tables/1/4.206.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.206, Volcanic ash
 
 0 0  Not present
 1 1  Present
diff --git a/definitions/grib2/tables/1/4.207.table b/definitions/grib2/tables/1/4.207.table
index 13fc7b54b..46c8c808e 100644
--- a/definitions/grib2/tables/1/4.207.table
+++ b/definitions/grib2/tables/1/4.207.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.207, Icing
 
 0 0  None
 1 1  Light
diff --git a/definitions/grib2/tables/1/4.208.table b/definitions/grib2/tables/1/4.208.table
index 15b514a07..34fc6708f 100644
--- a/definitions/grib2/tables/1/4.208.table
+++ b/definitions/grib2/tables/1/4.208.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.208, Turbulence
 
 0 0  None (smooth)
 1 1  Light
diff --git a/definitions/grib2/tables/1/4.209.table b/definitions/grib2/tables/1/4.209.table
index b4cca1d73..2700f882e 100644
--- a/definitions/grib2/tables/1/4.209.table
+++ b/definitions/grib2/tables/1/4.209.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.209, Planetary boundary layer regime
 
 1 1  Stable
 2 2  Mechanically driven turbulence
diff --git a/definitions/grib2/tables/1/4.210.table b/definitions/grib2/tables/1/4.210.table
index d05e07721..00ab2b2d4 100644
--- a/definitions/grib2/tables/1/4.210.table
+++ b/definitions/grib2/tables/1/4.210.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.210, Contrail intensity
 
 0 0  Contrail not present
 1 1  Contrail present
diff --git a/definitions/grib2/tables/1/4.211.table b/definitions/grib2/tables/1/4.211.table
index 604b2e643..810d3de86 100644
--- a/definitions/grib2/tables/1/4.211.table
+++ b/definitions/grib2/tables/1/4.211.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.211, Contrail engine type
 
 0 0  Low bypass
 1 1  High bypass
diff --git a/definitions/grib2/tables/1/4.212.table b/definitions/grib2/tables/1/4.212.table
index 7393238e7..30d8335cc 100644
--- a/definitions/grib2/tables/1/4.212.table
+++ b/definitions/grib2/tables/1/4.212.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.212, Land Use
 
 1 1  Urban land
 2 2  Agriculture
diff --git a/definitions/grib2/tables/1/4.213.table b/definitions/grib2/tables/1/4.213.table
index cc4bdfc1f..110a13150 100644
--- a/definitions/grib2/tables/1/4.213.table
+++ b/definitions/grib2/tables/1/4.213.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.213, Soil type
 
 1 1  Sand
 2 2  Loamy sand
diff --git a/definitions/grib2/tables/1/4.215.table b/definitions/grib2/tables/1/4.215.table
index 7e1442962..2fdcf4414 100644
--- a/definitions/grib2/tables/1/4.215.table
+++ b/definitions/grib2/tables/1/4.215.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.215, Remotely Sensed Snow Coverage
 
 50 50  No-snow/no-cloud
 100 100  Clouds
diff --git a/definitions/grib2/tables/1/4.216.table b/definitions/grib2/tables/1/4.216.table
index a1e12c20e..b63683ffb 100644
--- a/definitions/grib2/tables/1/4.216.table
+++ b/definitions/grib2/tables/1/4.216.table
@@ -1,3 +1,2 @@
-# CODE TABLE 4.216, Elevation of Snow Covered Terrain
 254 254  Clouds
 255 255  Missing
diff --git a/definitions/grib2/tables/1/4.217.table b/definitions/grib2/tables/1/4.217.table
index 475ab686d..5fe126992 100644
--- a/definitions/grib2/tables/1/4.217.table
+++ b/definitions/grib2/tables/1/4.217.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.217, Cloud mask type
 
 0 0  Clear over water
 1 1  Clear over land
diff --git a/definitions/grib2/tables/1/4.220.table b/definitions/grib2/tables/1/4.220.table
index 9fddcd49f..b26216966 100644
--- a/definitions/grib2/tables/1/4.220.table
+++ b/definitions/grib2/tables/1/4.220.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.220, Horizontal dimension processed
 
 0 0  Latitude
 1 1  Longitude
diff --git a/definitions/grib2/tables/1/4.221.table b/definitions/grib2/tables/1/4.221.table
index 2291eab60..41718eb02 100644
--- a/definitions/grib2/tables/1/4.221.table
+++ b/definitions/grib2/tables/1/4.221.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.221, Treatment of missing data
 
 0 0  Not included
 1 1  Extrapolated
diff --git a/definitions/grib2/tables/1/4.3.table b/definitions/grib2/tables/1/4.3.table
index 84a72352b..cac7ebbb4 100644
--- a/definitions/grib2/tables/1/4.3.table
+++ b/definitions/grib2/tables/1/4.3.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.3, Type of generating process
 0 0  Analysis
 1 1  Initialization
 2 2  Forecast
@@ -8,6 +7,4 @@
 6 6  Forecast error
 7 7  Analysis error
 8 8  Observation
-# 9-191 Reserved
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/4.4.table b/definitions/grib2/tables/1/4.4.table
index 61aa20c5f..4f9f0cdcd 100644
--- a/definitions/grib2/tables/1/4.4.table
+++ b/definitions/grib2/tables/1/4.4.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.4, Indicator of unit of time range
 0 m  Minute
 1 h  Hour
 2 D  Day
@@ -11,6 +10,4 @@
 11 6h  6 hours
 12 12h  12 hours
 13 s  Second
-# 14-191 Reserved
-#192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/4.5.table b/definitions/grib2/tables/1/4.5.table
index 89c5fb175..d4e950872 100644
--- a/definitions/grib2/tables/1/4.5.table
+++ b/definitions/grib2/tables/1/4.5.table
@@ -1,4 +1,3 @@
-#Code table 4.5: Fixed surface types and units
 0 0 Reserved
 1 sfc Ground or water surface 
 2 2 Cloud base level 
@@ -9,9 +8,7 @@
 7 7 Tropopause 
 8 sfc Nominal top of the atmosphere 
 9 9 Sea bottom 
-# 10-19 Reserved
 20 20 Isothermal level (K)
-#21-99 Reserved
 100 pl Isobaric surface (Pa)
 101 sfc Mean sea level
 102 102 Specific altitude above mean sea level (m)
@@ -24,10 +21,6 @@
 109 pv Potential vorticity surface (K m2 kg-1 s-1)
 110 110 Reserved
 111 111 Eta level
-# 112-116 Reserved
 117 117 Mixed layer depth (m)
-# 118-159 Reserved
 160 160 Depth below sea level (m)
-#161-191 Reserved
-#192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/4.6.table b/definitions/grib2/tables/1/4.6.table
index dc6d94c20..a9efd5a77 100644
--- a/definitions/grib2/tables/1/4.6.table
+++ b/definitions/grib2/tables/1/4.6.table
@@ -1,8 +1,6 @@
-# CODE TABLE 4.6, Type of ensemble forecast
 
 0 0  Unperturbed high-resolution control forecast
 1 1  Unperturbed low-resolution control forecast
 2 2  Negatively perturbed forecast
 3 3  Positively perturbed forecast
-# 192 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/4.7.table b/definitions/grib2/tables/1/4.7.table
index dadf59b46..2f295c769 100644
--- a/definitions/grib2/tables/1/4.7.table
+++ b/definitions/grib2/tables/1/4.7.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.7, Derived forecast
 
 0 0  Unweighted mean of all members
 1 1  Weighted mean of all members
diff --git a/definitions/grib2/tables/1/4.8.table b/definitions/grib2/tables/1/4.8.table
index 9d3a0e8a7..5f1e971da 100644
--- a/definitions/grib2/tables/1/4.8.table
+++ b/definitions/grib2/tables/1/4.8.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.8, Clustering Method
 
 0 0  Anomaly correlation
 1 1  Root mean square
diff --git a/definitions/grib2/tables/1/4.9.table b/definitions/grib2/tables/1/4.9.table
index 895f30171..7ae967e28 100644
--- a/definitions/grib2/tables/1/4.9.table
+++ b/definitions/grib2/tables/1/4.9.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.9, Probability Type
 
 0 0  Probability of event below lower limit
 1 1  Probability of event above upper limit
diff --git a/definitions/grib2/tables/1/4.91.table b/definitions/grib2/tables/1/4.91.table
index a960f56b0..498e3fe16 100644
--- a/definitions/grib2/tables/1/4.91.table
+++ b/definitions/grib2/tables/1/4.91.table
@@ -1,4 +1,3 @@
-# CODE TABLE 4.91 Category Type
 
 0 0  Below lower limit
 1 1  Above upper limit
diff --git a/definitions/grib2/tables/1/5.0.table b/definitions/grib2/tables/1/5.0.table
index 0cf3752cb..cb7fd1642 100644
--- a/definitions/grib2/tables/1/5.0.table
+++ b/definitions/grib2/tables/1/5.0.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.0, Data Representation Template Number
 0 0 Grid point data - simple packing
 1 1 Matrix value - simple packing
 2 2 Grid point data - complex packing
@@ -10,7 +9,6 @@
 50 50 Spectral data -simple packing
 51 51 Spherical harmonics data - complex packing
 61 61 Grid point data - simple packing with logarithm pre-processing
-# 192-254 Reserved for local use
 255 255 Missing
 40000 40000 JPEG2000 Packing
 40010 40010 PNG pacling
diff --git a/definitions/grib2/tables/1/5.1.table b/definitions/grib2/tables/1/5.1.table
index d7ca4bedc..d0e6c2f30 100644
--- a/definitions/grib2/tables/1/5.1.table
+++ b/definitions/grib2/tables/1/5.1.table
@@ -1,5 +1,3 @@
-# CODE TABLE 5.1, Type of original field values
 0 0  Floating point
 1 1  Integer
-# 192-254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/5.2.table b/definitions/grib2/tables/1/5.2.table
index a048d712e..d04bee530 100644
--- a/definitions/grib2/tables/1/5.2.table
+++ b/definitions/grib2/tables/1/5.2.table
@@ -1,6 +1,4 @@
-# CODE TABLE 5.2, Matrix coordinate value function definition
 0 0 Explicit coordinate values set
 1 1 Linear coordinates
 11 11 Geometric coordinates
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/5.3.table b/definitions/grib2/tables/1/5.3.table
index 4a673ef85..1d0207110 100644
--- a/definitions/grib2/tables/1/5.3.table
+++ b/definitions/grib2/tables/1/5.3.table
@@ -1,6 +1,4 @@
-# CODE TABLE 5.3, Matrix coordinate parameter
 1 1 Direction Degrees true
 2 2 Frequency (s-1)
 3 3 Radial number (2pi/lambda) (m-1)
-# 192-254  Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/1/5.4.table b/definitions/grib2/tables/1/5.4.table
index 1fd37966f..72d090e5a 100644
--- a/definitions/grib2/tables/1/5.4.table
+++ b/definitions/grib2/tables/1/5.4.table
@@ -1,5 +1,3 @@
-# CODE TABLE 5.4, Group Splitting Method
 0 0  Row by row splitting
 1 1  General group splitting
-# 192-254 Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/5.40.table b/definitions/grib2/tables/1/5.40.table
index 1eef7c763..1a43b2d6c 100644
--- a/definitions/grib2/tables/1/5.40.table
+++ b/definitions/grib2/tables/1/5.40.table
@@ -1,5 +1,3 @@
-# Code Table 5.40: Type of Compression
 0 0 Lossless
 1 1 Lossy
-#2-254 Reserved
 255 255 Missing
diff --git a/definitions/grib2/tables/1/5.40000.table b/definitions/grib2/tables/1/5.40000.table
index 1eef7c763..1a43b2d6c 100644
--- a/definitions/grib2/tables/1/5.40000.table
+++ b/definitions/grib2/tables/1/5.40000.table
@@ -1,5 +1,3 @@
-# Code Table 5.40: Type of Compression
 0 0 Lossless
 1 1 Lossy
-#2-254 Reserved
 255 255 Missing
diff --git a/definitions/grib2/tables/1/5.5.table b/definitions/grib2/tables/1/5.5.table
index d1caac9e8..5533ee98b 100644
--- a/definitions/grib2/tables/1/5.5.table
+++ b/definitions/grib2/tables/1/5.5.table
@@ -1,7 +1,5 @@
-# CODE TABLE 5.5, Missing Value Management for Complex Packing
 
 0 0  No explicit missing values included within data values
 1 1  Primary missing values included within data values
 2 2  Primary and secondary missing values included within data values
-# 192 254  Reserved for local use
 255 255  Missing
diff --git a/definitions/grib2/tables/1/5.6.table b/definitions/grib2/tables/1/5.6.table
index 4aec3314e..fedae4ebb 100644
--- a/definitions/grib2/tables/1/5.6.table
+++ b/definitions/grib2/tables/1/5.6.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.6, Order of Spatial Differencing
 
 1 1  First-order spatial differencing
 2 2  Second-order spatial differencing
diff --git a/definitions/grib2/tables/1/5.7.table b/definitions/grib2/tables/1/5.7.table
index 35b23b94d..c21dde206 100644
--- a/definitions/grib2/tables/1/5.7.table
+++ b/definitions/grib2/tables/1/5.7.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.7, Precision of floating-point numbers
 
 1 1  IEEE 32-bit (I=4 in Section 7)
 2 2  IEEE 64-bit (I=8 in Section 7)
diff --git a/definitions/grib2/tables/1/5.8.table b/definitions/grib2/tables/1/5.8.table
index c654331ff..5819a2b5f 100644
--- a/definitions/grib2/tables/1/5.8.table
+++ b/definitions/grib2/tables/1/5.8.table
@@ -1,3 +1,2 @@
-# CODE TABLE 5.8, lossless compression method
 0 no  no compression method
 255 255  Missing
diff --git a/definitions/grib2/tables/1/5.9.table b/definitions/grib2/tables/1/5.9.table
index 6925d31a3..0dab162bc 100644
--- a/definitions/grib2/tables/1/5.9.table
+++ b/definitions/grib2/tables/1/5.9.table
@@ -1,4 +1,3 @@
-# CODE TABLE 5.8, pre-processing
 0 no  no pre-processing
 1  logarithm logarithm
 255 255  Missing
diff --git a/definitions/grib2/tables/1/6.0.table b/definitions/grib2/tables/1/6.0.table
index 6a8c74b48..1eeac9562 100644
--- a/definitions/grib2/tables/1/6.0.table
+++ b/definitions/grib2/tables/1/6.0.table
@@ -1,7 +1,5 @@
-# CODE TABLE 6.0, Bit Map Indicator
 
 0 0  A bit map applies to this product and is specified in this Section
 1 1  A bit map pre-determined by the originating/generating Centre applies to this product and is not specified in this Section
-# 2 253  A bit map pre-determined by the originating/generating Centre applies to this product and is not specified in this Section
 254 254  A bit map defined previously in the same "GRIB" message applies to this product
 255 255  A bit map does not apply to this product
diff --git a/definitions/grib2/tables/1/stepType.table b/definitions/grib2/tables/1/stepType.table
index d88e44123..10721eb25 100644
--- a/definitions/grib2/tables/1/stepType.table
+++ b/definitions/grib2/tables/1/stepType.table
@@ -1,4 +1,3 @@
-# CODE TABLE Step Type
 
 0 instant  Instant
 1 interval Interval

From a11ba0c488bb641539dcdd98a48f178fb19bf5af Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 25 Nov 2019 14:20:12 +0000
Subject: [PATCH 26/38] Definitions: remove unnecessary notes from code tables

---
 definitions/grib2/tables/2/3.15.table    | 8 --------
 definitions/grib2/tables/2/4.2.1.0.table | 2 --
 definitions/grib2/tables/3/3.15.table    | 8 --------
 definitions/grib2/tables/3/4.2.1.0.table | 2 --
 definitions/grib2/tables/4/3.15.table    | 3 ---
 definitions/grib2/tables/5/3.15.table    | 3 ---
 definitions/grib2/tables/6/3.15.table    | 4 ----
 definitions/grib2/tables/7/3.15.table    | 8 --------
 8 files changed, 38 deletions(-)

diff --git a/definitions/grib2/tables/2/3.15.table b/definitions/grib2/tables/2/3.15.table
index bb431e14f..d4f7e0ed2 100644
--- a/definitions/grib2/tables/2/3.15.table
+++ b/definitions/grib2/tables/2/3.15.table
@@ -1,7 +1,5 @@
 # CODE TABLE 3.15, Physical meaning of vertical coordinate
-# 0-19 Reserved
 20 20 Temperature K
-# 21-99 Reserved
 100 100 Pressure Pa
 101 101 Pressure deviation from mean sea level Pa
 102 102 Altitude above mean sea level m
@@ -15,11 +13,5 @@
 110 110 Geometrical height m
 111 111 Eta coordinate (see Note 2)
 112 112 Geopotential height gpm
-# 113-159 Reserved
 160 160 Depth below sea level m
-# 161-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.
diff --git a/definitions/grib2/tables/2/4.2.1.0.table b/definitions/grib2/tables/2/4.2.1.0.table
index 1e867e1cb..828c869de 100644
--- a/definitions/grib2/tables/2/4.2.1.0.table
+++ b/definitions/grib2/tables/2/4.2.1.0.table
@@ -6,6 +6,4 @@
 4 4 Snow water equivalent percent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
-# 7-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/3/3.15.table b/definitions/grib2/tables/3/3.15.table
index bb431e14f..d4f7e0ed2 100644
--- a/definitions/grib2/tables/3/3.15.table
+++ b/definitions/grib2/tables/3/3.15.table
@@ -1,7 +1,5 @@
 # CODE TABLE 3.15, Physical meaning of vertical coordinate
-# 0-19 Reserved
 20 20 Temperature K
-# 21-99 Reserved
 100 100 Pressure Pa
 101 101 Pressure deviation from mean sea level Pa
 102 102 Altitude above mean sea level m
@@ -15,11 +13,5 @@
 110 110 Geometrical height m
 111 111 Eta coordinate (see Note 2)
 112 112 Geopotential height gpm
-# 113-159 Reserved
 160 160 Depth below sea level m
-# 161-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.
diff --git a/definitions/grib2/tables/3/4.2.1.0.table b/definitions/grib2/tables/3/4.2.1.0.table
index 1e867e1cb..828c869de 100644
--- a/definitions/grib2/tables/3/4.2.1.0.table
+++ b/definitions/grib2/tables/3/4.2.1.0.table
@@ -6,6 +6,4 @@
 4 4 Snow water equivalent percent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
-# 7-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
diff --git a/definitions/grib2/tables/4/3.15.table b/definitions/grib2/tables/4/3.15.table
index bb431e14f..6a035be56 100644
--- a/definitions/grib2/tables/4/3.15.table
+++ b/definitions/grib2/tables/4/3.15.table
@@ -20,6 +20,3 @@
 # 161-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.
diff --git a/definitions/grib2/tables/5/3.15.table b/definitions/grib2/tables/5/3.15.table
index bb431e14f..6a035be56 100644
--- a/definitions/grib2/tables/5/3.15.table
+++ b/definitions/grib2/tables/5/3.15.table
@@ -20,6 +20,3 @@
 # 161-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.
diff --git a/definitions/grib2/tables/6/3.15.table b/definitions/grib2/tables/6/3.15.table
index bb431e14f..b3adaeb33 100644
--- a/definitions/grib2/tables/6/3.15.table
+++ b/definitions/grib2/tables/6/3.15.table
@@ -1,5 +1,4 @@
 # CODE TABLE 3.15, Physical meaning of vertical coordinate
-# 0-19 Reserved
 20 20 Temperature K
 # 21-99 Reserved
 100 100 Pressure Pa
@@ -20,6 +19,3 @@
 # 161-191 Reserved
 # 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.
diff --git a/definitions/grib2/tables/7/3.15.table b/definitions/grib2/tables/7/3.15.table
index eb83c1b42..337bdce96 100644
--- a/definitions/grib2/tables/7/3.15.table
+++ b/definitions/grib2/tables/7/3.15.table
@@ -1,7 +1,5 @@
 # CODE TABLE 3.15, Physical meaning of vertical coordinate
-# 0-19 Reserved
 20 20 Temperature (K)
-# 21-99 Reserved
 100 100 Pressure (Pa)
 101 101 Pressure deviation from mean sea level (Pa)
 102 102 Altitude above mean sea level (m)
@@ -15,11 +13,5 @@
 110 110 Geometrical height (m)
 111 111 Eta coordinate (see Note 2)
 112 112 Geopotential height (gpm)
-# 113-159 Reserved
 160 160 Depth below sea level (m)
-# 161-191 Reserved
-# 192-254 Reserved for local use
 255 255 Missing
-# Notes:
-# (1) Negative values associated to this coordinate will indicate depth below ground surface.  If values are all below surface, use of entry 106 is recommended, with positive coordinate values instead.
-# (2) The Eta vertical coordinate system involves normalizing the pressure at some point on a specific level by the mean sea level pressure at that point.

From fd6ba9d146e951e5fc2184dfb50de9245f0e0d8c Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 25 Nov 2019 17:52:42 +0000
Subject: [PATCH 27/38] Code tables: remove double parens

---
 definitions/grib2/tables/10/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/11/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/12/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/13/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/14/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/15/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/16/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/17/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/18/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/19/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/20/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/21/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/23/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/24/4.2.0.1.table | 12 ++++++------
 definitions/grib2/tables/5/4.2.0.1.table  |  8 ++++----
 definitions/grib2/tables/6/4.2.0.1.table  |  4 ++--
 definitions/grib2/tables/7/4.2.0.1.table  |  4 ++--
 definitions/grib2/tables/8/4.2.0.1.table  | 12 ++++++------
 definitions/grib2/tables/9/4.2.0.1.table  | 12 ++++++------
 19 files changed, 104 insertions(+), 104 deletions(-)

diff --git a/definitions/grib2/tables/10/4.2.0.1.table b/definitions/grib2/tables/10/4.2.0.1.table
index fbebb792d..b95e8699d 100644
--- a/definitions/grib2/tables/10/4.2.0.1.table
+++ b/definitions/grib2/tables/10/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Percent frozen precipitation (%)
diff --git a/definitions/grib2/tables/11/4.2.0.1.table b/definitions/grib2/tables/11/4.2.0.1.table
index 2d8fbed8c..827ba1dcf 100644
--- a/definitions/grib2/tables/11/4.2.0.1.table
+++ b/definitions/grib2/tables/11/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/12/4.2.0.1.table b/definitions/grib2/tables/12/4.2.0.1.table
index bb0ff7c42..d1d1704df 100644
--- a/definitions/grib2/tables/12/4.2.0.1.table
+++ b/definitions/grib2/tables/12/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/13/4.2.0.1.table b/definitions/grib2/tables/13/4.2.0.1.table
index bb0ff7c42..d1d1704df 100644
--- a/definitions/grib2/tables/13/4.2.0.1.table
+++ b/definitions/grib2/tables/13/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/14/4.2.0.1.table b/definitions/grib2/tables/14/4.2.0.1.table
index 0af12c3c3..4c624e74a 100644
--- a/definitions/grib2/tables/14/4.2.0.1.table
+++ b/definitions/grib2/tables/14/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/15/4.2.0.1.table b/definitions/grib2/tables/15/4.2.0.1.table
index c90ade1c5..f2fdd3026 100644
--- a/definitions/grib2/tables/15/4.2.0.1.table
+++ b/definitions/grib2/tables/15/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/16/4.2.0.1.table b/definitions/grib2/tables/16/4.2.0.1.table
index b0127980c..775cfe54f 100644
--- a/definitions/grib2/tables/16/4.2.0.1.table
+++ b/definitions/grib2/tables/16/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/17/4.2.0.1.table b/definitions/grib2/tables/17/4.2.0.1.table
index 490297d22..70001f746 100644
--- a/definitions/grib2/tables/17/4.2.0.1.table
+++ b/definitions/grib2/tables/17/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/18/4.2.0.1.table b/definitions/grib2/tables/18/4.2.0.1.table
index 8f96bcd60..c38d6a053 100644
--- a/definitions/grib2/tables/18/4.2.0.1.table
+++ b/definitions/grib2/tables/18/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/19/4.2.0.1.table b/definitions/grib2/tables/19/4.2.0.1.table
index 8f96bcd60..c38d6a053 100644
--- a/definitions/grib2/tables/19/4.2.0.1.table
+++ b/definitions/grib2/tables/19/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/20/4.2.0.1.table b/definitions/grib2/tables/20/4.2.0.1.table
index 75df7d4ea..541deaca9 100644
--- a/definitions/grib2/tables/20/4.2.0.1.table
+++ b/definitions/grib2/tables/20/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/21/4.2.0.1.table b/definitions/grib2/tables/21/4.2.0.1.table
index 75df7d4ea..541deaca9 100644
--- a/definitions/grib2/tables/21/4.2.0.1.table
+++ b/definitions/grib2/tables/21/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/23/4.2.0.1.table b/definitions/grib2/tables/23/4.2.0.1.table
index dee95505d..0c01ce89b 100644
--- a/definitions/grib2/tables/23/4.2.0.1.table
+++ b/definitions/grib2/tables/23/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/24/4.2.0.1.table b/definitions/grib2/tables/24/4.2.0.1.table
index 11c8c61c5..ef6d2ed7e 100644
--- a/definitions/grib2/tables/24/4.2.0.1.table
+++ b/definitions/grib2/tables/24/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Per cent frozen precipitation (%)
diff --git a/definitions/grib2/tables/5/4.2.0.1.table b/definitions/grib2/tables/5/4.2.0.1.table
index eff557718..c79545757 100644
--- a/definitions/grib2/tables/5/4.2.0.1.table
+++ b/definitions/grib2/tables/5/4.2.0.1.table
@@ -32,10 +32,10 @@
 30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg kg-1)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Percent frozen precipitation (%)
diff --git a/definitions/grib2/tables/6/4.2.0.1.table b/definitions/grib2/tables/6/4.2.0.1.table
index 60a934b70..936d53fb4 100644
--- a/definitions/grib2/tables/6/4.2.0.1.table
+++ b/definitions/grib2/tables/6/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age day (-)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type (code table (4.201))
+19 19 Precipitation type (code table (4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg kg-1)
 22 22 Cloud mixing ratio (kg kg-1)
@@ -29,7 +29,7 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category (code table (4.202))
+30 30 Precipitable water category (code table (4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg kg-1)
 33 33 Categorical rain (Code table 4.222)
diff --git a/definitions/grib2/tables/7/4.2.0.1.table b/definitions/grib2/tables/7/4.2.0.1.table
index 0ab8ef361..95e016a2a 100644
--- a/definitions/grib2/tables/7/4.2.0.1.table
+++ b/definitions/grib2/tables/7/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age day (-)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type (code table (4.201))
+19 19 Precipitation type (code table (4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg kg-1)
 22 22 Cloud mixing ratio (kg kg-1)
@@ -29,7 +29,7 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category (code table (4.202))
+30 30 Precipitable water category (code table (4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg kg-1)
 33 33 Categorical rain (Code table 4.222)
diff --git a/definitions/grib2/tables/8/4.2.0.1.table b/definitions/grib2/tables/8/4.2.0.1.table
index 319d5c17c..1922792a6 100644
--- a/definitions/grib2/tables/8/4.2.0.1.table
+++ b/definitions/grib2/tables/8/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Percent frozen precipitation (%)
diff --git a/definitions/grib2/tables/9/4.2.0.1.table b/definitions/grib2/tables/9/4.2.0.1.table
index 319d5c17c..1922792a6 100644
--- a/definitions/grib2/tables/9/4.2.0.1.table
+++ b/definitions/grib2/tables/9/4.2.0.1.table
@@ -18,7 +18,7 @@
 16 16 Snow melt (kg m-2)
 17 17 Snow age (d)
 18 18 Absolute humidity (kg m-3)
-19 19 Precipitation type ((Code table 4.201))
+19 19 Precipitation type (Code table 4.201)
 20 20 Integrated liquid water (kg m-2)
 21 21 Condensate (kg/kg)
 22 22 Cloud mixing ratio (kg/kg)
@@ -29,13 +29,13 @@
 27 27 Maximum relative humidity (%)
 28 28 Maximum absolute humidity (kg m-3)
 29 29 Total snowfall (m)
-30 30 Precipitable water category ((Code table 4.202))
+30 30 Precipitable water category (Code table 4.202)
 31 31 Hail (m)
 32 32 Graupel (snow pellets) (kg/kg)
-33 33 Categorical rain ((Code table 4.222))
-34 34 Categorical freezing rain ((Code table 4.222))
-35 35 Categorical ice pellets ((Code table 4.222))
-36 36 Categorical snow ((Code table 4.222))
+33 33 Categorical rain (Code table 4.222)
+34 34 Categorical freezing rain (Code table 4.222)
+35 35 Categorical ice pellets (Code table 4.222)
+36 36 Categorical snow (Code table 4.222)
 37 37 Convective precipitation rate (kg m-2 s-1)
 38 38 Horizontal moisture divergence (kg kg-1 s-1)
 39 39 Percent frozen precipitation (%)

From eaf13376e8aff0de016ab5194e421e78f579e9fa Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Mon, 25 Nov 2019 18:11:51 +0000
Subject: [PATCH 28/38] Code tables: remove double parens

---
 definitions/grib2/tables/10/4.2.0.13.table |  2 +-
 definitions/grib2/tables/10/4.2.0.19.table | 12 ++++++------
 definitions/grib2/tables/10/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/10/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/10/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/10/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/11/4.2.0.13.table |  2 +-
 definitions/grib2/tables/11/4.2.0.19.table | 12 ++++++------
 definitions/grib2/tables/11/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/11/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/11/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/11/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/12/4.2.0.13.table |  2 +-
 definitions/grib2/tables/12/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/12/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/12/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/12/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/12/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/13/4.2.0.13.table |  2 +-
 definitions/grib2/tables/13/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/13/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/13/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/13/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/13/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/14/4.2.0.13.table |  2 +-
 definitions/grib2/tables/14/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/14/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/14/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/14/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/14/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/15/4.2.0.13.table |  2 +-
 definitions/grib2/tables/15/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/15/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/15/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/15/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/15/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/16/4.2.0.13.table |  2 +-
 definitions/grib2/tables/16/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/16/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/16/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/16/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/16/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/17/4.2.0.13.table |  2 +-
 definitions/grib2/tables/17/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/17/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/17/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/17/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/17/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/18/4.2.0.13.table |  2 +-
 definitions/grib2/tables/18/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/18/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/18/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/18/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/18/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/19/4.2.0.13.table |  2 +-
 definitions/grib2/tables/19/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/19/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/19/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/19/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/19/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/20/4.2.0.13.table |  2 +-
 definitions/grib2/tables/20/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/20/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/20/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/20/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/20/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/21/4.2.0.13.table |  2 +-
 definitions/grib2/tables/21/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/21/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/21/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/21/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/21/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/23/4.2.0.13.table |  2 +-
 definitions/grib2/tables/23/4.2.0.19.table | 18 +++++++++---------
 definitions/grib2/tables/23/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/23/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/23/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/23/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/24/4.2.0.13.table |  2 +-
 definitions/grib2/tables/24/4.2.0.19.table | 20 ++++++++++----------
 definitions/grib2/tables/24/4.2.0.6.table  |  4 ++--
 definitions/grib2/tables/24/4.2.1.0.table  |  4 ++--
 definitions/grib2/tables/24/4.2.2.0.table  |  2 +-
 definitions/grib2/tables/24/4.2.2.3.table  |  2 +-
 definitions/grib2/tables/5/4.2.0.13.table  |  2 +-
 definitions/grib2/tables/5/4.2.0.19.table  | 12 ++++++------
 definitions/grib2/tables/5/4.2.0.6.table   |  4 ++--
 definitions/grib2/tables/5/4.2.1.0.table   |  4 ++--
 definitions/grib2/tables/5/4.2.2.0.table   |  2 +-
 definitions/grib2/tables/5/4.2.2.3.table   |  2 +-
 definitions/grib2/tables/6/4.2.0.13.table  |  2 +-
 definitions/grib2/tables/6/4.2.0.19.table  | 12 ++++++------
 definitions/grib2/tables/6/4.2.0.6.table   |  4 ++--
 definitions/grib2/tables/6/4.2.1.0.table   |  4 ++--
 definitions/grib2/tables/6/4.2.2.0.table   |  2 +-
 definitions/grib2/tables/6/4.2.2.3.table   |  2 +-
 definitions/grib2/tables/7/4.2.0.13.table  |  2 +-
 definitions/grib2/tables/7/4.2.0.19.table  | 14 +++++++-------
 definitions/grib2/tables/7/4.2.0.6.table   |  4 ++--
 definitions/grib2/tables/7/4.2.1.0.table   |  4 ++--
 definitions/grib2/tables/7/4.2.2.0.table   |  2 +-
 definitions/grib2/tables/7/4.2.2.3.table   |  2 +-
 definitions/grib2/tables/7/4.2.2.4.table   |  4 ++--
 definitions/grib2/tables/8/4.2.0.13.table  |  2 +-
 definitions/grib2/tables/8/4.2.0.19.table  | 12 ++++++------
 definitions/grib2/tables/8/4.2.0.6.table   |  4 ++--
 definitions/grib2/tables/8/4.2.1.0.table   |  4 ++--
 definitions/grib2/tables/8/4.2.2.0.table   |  2 +-
 definitions/grib2/tables/8/4.2.2.3.table   |  2 +-
 definitions/grib2/tables/9/4.2.0.13.table  |  2 +-
 definitions/grib2/tables/9/4.2.0.19.table  | 12 ++++++------
 definitions/grib2/tables/9/4.2.0.6.table   |  4 ++--
 definitions/grib2/tables/9/4.2.1.0.table   |  4 ++--
 definitions/grib2/tables/9/4.2.2.0.table   |  2 +-
 definitions/grib2/tables/9/4.2.2.3.table   |  2 +-
 115 files changed, 287 insertions(+), 287 deletions(-)

diff --git a/definitions/grib2/tables/10/4.2.0.13.table b/definitions/grib2/tables/10/4.2.0.13.table
index 2a4fcbef1..b9979f0d3 100644
--- a/definitions/grib2/tables/10/4.2.0.13.table
+++ b/definitions/grib2/tables/10/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/10/4.2.0.19.table b/definitions/grib2/tables/10/4.2.0.19.table
index e6c97e5f9..2aa34464a 100644
--- a/definitions/grib2/tables/10/4.2.0.19.table
+++ b/definitions/grib2/tables/10/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
diff --git a/definitions/grib2/tables/10/4.2.0.6.table b/definitions/grib2/tables/10/4.2.0.6.table
index 055df76a5..fd4b23014 100644
--- a/definitions/grib2/tables/10/4.2.0.6.table
+++ b/definitions/grib2/tables/10/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/10/4.2.1.0.table b/definitions/grib2/tables/10/4.2.1.0.table
index 4e72e1ab3..bf1e3e93f 100644
--- a/definitions/grib2/tables/10/4.2.1.0.table
+++ b/definitions/grib2/tables/10/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/10/4.2.2.0.table b/definitions/grib2/tables/10/4.2.2.0.table
index d9498c4fc..9a426a5c2 100644
--- a/definitions/grib2/tables/10/4.2.2.0.table
+++ b/definitions/grib2/tables/10/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/10/4.2.2.3.table b/definitions/grib2/tables/10/4.2.2.3.table
index 4c5e2a4b4..e985e41aa 100644
--- a/definitions/grib2/tables/10/4.2.2.3.table
+++ b/definitions/grib2/tables/10/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 2 - Land surface products, parameter category 3: soil products
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/11/4.2.0.13.table b/definitions/grib2/tables/11/4.2.0.13.table
index 2a4fcbef1..b9979f0d3 100644
--- a/definitions/grib2/tables/11/4.2.0.13.table
+++ b/definitions/grib2/tables/11/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/11/4.2.0.19.table b/definitions/grib2/tables/11/4.2.0.19.table
index e6c97e5f9..2aa34464a 100644
--- a/definitions/grib2/tables/11/4.2.0.19.table
+++ b/definitions/grib2/tables/11/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
diff --git a/definitions/grib2/tables/11/4.2.0.6.table b/definitions/grib2/tables/11/4.2.0.6.table
index 051830aff..a06f4292f 100644
--- a/definitions/grib2/tables/11/4.2.0.6.table
+++ b/definitions/grib2/tables/11/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/11/4.2.1.0.table b/definitions/grib2/tables/11/4.2.1.0.table
index 4e72e1ab3..bf1e3e93f 100644
--- a/definitions/grib2/tables/11/4.2.1.0.table
+++ b/definitions/grib2/tables/11/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/11/4.2.2.0.table b/definitions/grib2/tables/11/4.2.2.0.table
index d9498c4fc..9a426a5c2 100644
--- a/definitions/grib2/tables/11/4.2.2.0.table
+++ b/definitions/grib2/tables/11/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/11/4.2.2.3.table b/definitions/grib2/tables/11/4.2.2.3.table
index 4c5e2a4b4..e985e41aa 100644
--- a/definitions/grib2/tables/11/4.2.2.3.table
+++ b/definitions/grib2/tables/11/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category. Product discipline 2 - Land surface products, parameter category 3: soil products
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/12/4.2.0.13.table b/definitions/grib2/tables/12/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/12/4.2.0.13.table
+++ b/definitions/grib2/tables/12/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.0.19.table b/definitions/grib2/tables/12/4.2.0.19.table
index 0478ef16f..75101bd37 100644
--- a/definitions/grib2/tables/12/4.2.0.19.table
+++ b/definitions/grib2/tables/12/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 # 28-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/12/4.2.0.6.table b/definitions/grib2/tables/12/4.2.0.6.table
index b97357194..9ee97b73f 100644
--- a/definitions/grib2/tables/12/4.2.0.6.table
+++ b/definitions/grib2/tables/12/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/12/4.2.1.0.table b/definitions/grib2/tables/12/4.2.1.0.table
index 77b25fa24..e93f0a332 100644
--- a/definitions/grib2/tables/12/4.2.1.0.table
+++ b/definitions/grib2/tables/12/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/12/4.2.2.0.table b/definitions/grib2/tables/12/4.2.2.0.table
index bf3574834..95b696a37 100644
--- a/definitions/grib2/tables/12/4.2.2.0.table
+++ b/definitions/grib2/tables/12/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/12/4.2.2.3.table b/definitions/grib2/tables/12/4.2.2.3.table
index 28284d4d4..2f6291077 100644
--- a/definitions/grib2/tables/12/4.2.2.3.table
+++ b/definitions/grib2/tables/12/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/13/4.2.0.13.table b/definitions/grib2/tables/13/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/13/4.2.0.13.table
+++ b/definitions/grib2/tables/13/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.0.19.table b/definitions/grib2/tables/13/4.2.0.19.table
index 0478ef16f..75101bd37 100644
--- a/definitions/grib2/tables/13/4.2.0.19.table
+++ b/definitions/grib2/tables/13/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 # 28-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/13/4.2.0.6.table b/definitions/grib2/tables/13/4.2.0.6.table
index b97357194..9ee97b73f 100644
--- a/definitions/grib2/tables/13/4.2.0.6.table
+++ b/definitions/grib2/tables/13/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/13/4.2.1.0.table b/definitions/grib2/tables/13/4.2.1.0.table
index 989c4ae28..cf56b08ee 100644
--- a/definitions/grib2/tables/13/4.2.1.0.table
+++ b/definitions/grib2/tables/13/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/13/4.2.2.0.table b/definitions/grib2/tables/13/4.2.2.0.table
index ed9e43eb7..93135b854 100644
--- a/definitions/grib2/tables/13/4.2.2.0.table
+++ b/definitions/grib2/tables/13/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/13/4.2.2.3.table b/definitions/grib2/tables/13/4.2.2.3.table
index 28284d4d4..2f6291077 100644
--- a/definitions/grib2/tables/13/4.2.2.3.table
+++ b/definitions/grib2/tables/13/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/14/4.2.0.13.table b/definitions/grib2/tables/14/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/14/4.2.0.13.table
+++ b/definitions/grib2/tables/14/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/14/4.2.0.19.table b/definitions/grib2/tables/14/4.2.0.19.table
index 0478ef16f..75101bd37 100644
--- a/definitions/grib2/tables/14/4.2.0.19.table
+++ b/definitions/grib2/tables/14/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 # 28-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/14/4.2.0.6.table b/definitions/grib2/tables/14/4.2.0.6.table
index cb160fa0b..702152741 100644
--- a/definitions/grib2/tables/14/4.2.0.6.table
+++ b/definitions/grib2/tables/14/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/14/4.2.1.0.table b/definitions/grib2/tables/14/4.2.1.0.table
index 989c4ae28..cf56b08ee 100644
--- a/definitions/grib2/tables/14/4.2.1.0.table
+++ b/definitions/grib2/tables/14/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/14/4.2.2.0.table b/definitions/grib2/tables/14/4.2.2.0.table
index 958c4bf64..1853aa0fc 100644
--- a/definitions/grib2/tables/14/4.2.2.0.table
+++ b/definitions/grib2/tables/14/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/14/4.2.2.3.table b/definitions/grib2/tables/14/4.2.2.3.table
index 28284d4d4..2f6291077 100644
--- a/definitions/grib2/tables/14/4.2.2.3.table
+++ b/definitions/grib2/tables/14/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/15/4.2.0.13.table b/definitions/grib2/tables/15/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/15/4.2.0.13.table
+++ b/definitions/grib2/tables/15/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.0.19.table b/definitions/grib2/tables/15/4.2.0.19.table
index 0478ef16f..75101bd37 100644
--- a/definitions/grib2/tables/15/4.2.0.19.table
+++ b/definitions/grib2/tables/15/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 # 28-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/15/4.2.0.6.table b/definitions/grib2/tables/15/4.2.0.6.table
index 906eeb9ac..e28d8e4db 100644
--- a/definitions/grib2/tables/15/4.2.0.6.table
+++ b/definitions/grib2/tables/15/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/15/4.2.1.0.table b/definitions/grib2/tables/15/4.2.1.0.table
index 989c4ae28..cf56b08ee 100644
--- a/definitions/grib2/tables/15/4.2.1.0.table
+++ b/definitions/grib2/tables/15/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/15/4.2.2.0.table b/definitions/grib2/tables/15/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/15/4.2.2.0.table
+++ b/definitions/grib2/tables/15/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/15/4.2.2.3.table b/definitions/grib2/tables/15/4.2.2.3.table
index 56e66c83a..08ac880fe 100644
--- a/definitions/grib2/tables/15/4.2.2.3.table
+++ b/definitions/grib2/tables/15/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/16/4.2.0.13.table b/definitions/grib2/tables/16/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/16/4.2.0.13.table
+++ b/definitions/grib2/tables/16/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/16/4.2.0.19.table b/definitions/grib2/tables/16/4.2.0.19.table
index 35b9deb7f..ec2b9823d 100644
--- a/definitions/grib2/tables/16/4.2.0.19.table
+++ b/definitions/grib2/tables/16/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 # 29-191 Reserved 
 # 192-254 Reserved for local use 
diff --git a/definitions/grib2/tables/16/4.2.0.6.table b/definitions/grib2/tables/16/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/16/4.2.0.6.table
+++ b/definitions/grib2/tables/16/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/16/4.2.1.0.table b/definitions/grib2/tables/16/4.2.1.0.table
index 89083fa27..74c95f57b 100644
--- a/definitions/grib2/tables/16/4.2.1.0.table
+++ b/definitions/grib2/tables/16/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/16/4.2.2.0.table b/definitions/grib2/tables/16/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/16/4.2.2.0.table
+++ b/definitions/grib2/tables/16/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/16/4.2.2.3.table b/definitions/grib2/tables/16/4.2.2.3.table
index 9dd57a190..dff2f7953 100644
--- a/definitions/grib2/tables/16/4.2.2.3.table
+++ b/definitions/grib2/tables/16/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/17/4.2.0.13.table b/definitions/grib2/tables/17/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/17/4.2.0.13.table
+++ b/definitions/grib2/tables/17/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/17/4.2.0.19.table b/definitions/grib2/tables/17/4.2.0.19.table
index d2a4338d6..8705082c5 100644
--- a/definitions/grib2/tables/17/4.2.0.19.table
+++ b/definitions/grib2/tables/17/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
diff --git a/definitions/grib2/tables/17/4.2.0.6.table b/definitions/grib2/tables/17/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/17/4.2.0.6.table
+++ b/definitions/grib2/tables/17/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/17/4.2.1.0.table b/definitions/grib2/tables/17/4.2.1.0.table
index e906af726..bcd849c2e 100644
--- a/definitions/grib2/tables/17/4.2.1.0.table
+++ b/definitions/grib2/tables/17/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/17/4.2.2.0.table b/definitions/grib2/tables/17/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/17/4.2.2.0.table
+++ b/definitions/grib2/tables/17/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/17/4.2.2.3.table b/definitions/grib2/tables/17/4.2.2.3.table
index 447e4f9cb..690fab42b 100644
--- a/definitions/grib2/tables/17/4.2.2.3.table
+++ b/definitions/grib2/tables/17/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/18/4.2.0.13.table b/definitions/grib2/tables/18/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/18/4.2.0.13.table
+++ b/definitions/grib2/tables/18/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/18/4.2.0.19.table b/definitions/grib2/tables/18/4.2.0.19.table
index d2a4338d6..8705082c5 100644
--- a/definitions/grib2/tables/18/4.2.0.19.table
+++ b/definitions/grib2/tables/18/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
diff --git a/definitions/grib2/tables/18/4.2.0.6.table b/definitions/grib2/tables/18/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/18/4.2.0.6.table
+++ b/definitions/grib2/tables/18/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/18/4.2.1.0.table b/definitions/grib2/tables/18/4.2.1.0.table
index e906af726..bcd849c2e 100644
--- a/definitions/grib2/tables/18/4.2.1.0.table
+++ b/definitions/grib2/tables/18/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/18/4.2.2.0.table b/definitions/grib2/tables/18/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/18/4.2.2.0.table
+++ b/definitions/grib2/tables/18/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/18/4.2.2.3.table b/definitions/grib2/tables/18/4.2.2.3.table
index 447e4f9cb..690fab42b 100644
--- a/definitions/grib2/tables/18/4.2.2.3.table
+++ b/definitions/grib2/tables/18/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/19/4.2.0.13.table b/definitions/grib2/tables/19/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/19/4.2.0.13.table
+++ b/definitions/grib2/tables/19/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/19/4.2.0.19.table b/definitions/grib2/tables/19/4.2.0.19.table
index 0e49286a7..1d7b4da91 100644
--- a/definitions/grib2/tables/19/4.2.0.19.table
+++ b/definitions/grib2/tables/19/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
diff --git a/definitions/grib2/tables/19/4.2.0.6.table b/definitions/grib2/tables/19/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/19/4.2.0.6.table
+++ b/definitions/grib2/tables/19/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/19/4.2.1.0.table b/definitions/grib2/tables/19/4.2.1.0.table
index e906af726..bcd849c2e 100644
--- a/definitions/grib2/tables/19/4.2.1.0.table
+++ b/definitions/grib2/tables/19/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/19/4.2.2.0.table b/definitions/grib2/tables/19/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/19/4.2.2.0.table
+++ b/definitions/grib2/tables/19/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/19/4.2.2.3.table b/definitions/grib2/tables/19/4.2.2.3.table
index 447e4f9cb..690fab42b 100644
--- a/definitions/grib2/tables/19/4.2.2.3.table
+++ b/definitions/grib2/tables/19/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/20/4.2.0.13.table b/definitions/grib2/tables/20/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/20/4.2.0.13.table
+++ b/definitions/grib2/tables/20/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/20/4.2.0.19.table b/definitions/grib2/tables/20/4.2.0.19.table
index e4a4e2d04..d28010f2f 100644
--- a/definitions/grib2/tables/20/4.2.0.19.table
+++ b/definitions/grib2/tables/20/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
diff --git a/definitions/grib2/tables/20/4.2.0.6.table b/definitions/grib2/tables/20/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/20/4.2.0.6.table
+++ b/definitions/grib2/tables/20/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/20/4.2.1.0.table b/definitions/grib2/tables/20/4.2.1.0.table
index e906af726..bcd849c2e 100644
--- a/definitions/grib2/tables/20/4.2.1.0.table
+++ b/definitions/grib2/tables/20/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/20/4.2.2.0.table b/definitions/grib2/tables/20/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/20/4.2.2.0.table
+++ b/definitions/grib2/tables/20/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/20/4.2.2.3.table b/definitions/grib2/tables/20/4.2.2.3.table
index 447e4f9cb..690fab42b 100644
--- a/definitions/grib2/tables/20/4.2.2.3.table
+++ b/definitions/grib2/tables/20/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/21/4.2.0.13.table b/definitions/grib2/tables/21/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/21/4.2.0.13.table
+++ b/definitions/grib2/tables/21/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/21/4.2.0.19.table b/definitions/grib2/tables/21/4.2.0.19.table
index e4a4e2d04..d28010f2f 100644
--- a/definitions/grib2/tables/21/4.2.0.19.table
+++ b/definitions/grib2/tables/21/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
diff --git a/definitions/grib2/tables/21/4.2.0.6.table b/definitions/grib2/tables/21/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/21/4.2.0.6.table
+++ b/definitions/grib2/tables/21/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/21/4.2.1.0.table b/definitions/grib2/tables/21/4.2.1.0.table
index e906af726..bcd849c2e 100644
--- a/definitions/grib2/tables/21/4.2.1.0.table
+++ b/definitions/grib2/tables/21/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/21/4.2.2.0.table b/definitions/grib2/tables/21/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/21/4.2.2.0.table
+++ b/definitions/grib2/tables/21/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/21/4.2.2.3.table b/definitions/grib2/tables/21/4.2.2.3.table
index 447e4f9cb..690fab42b 100644
--- a/definitions/grib2/tables/21/4.2.2.3.table
+++ b/definitions/grib2/tables/21/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/23/4.2.0.13.table b/definitions/grib2/tables/23/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/23/4.2.0.13.table
+++ b/definitions/grib2/tables/23/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/23/4.2.0.19.table b/definitions/grib2/tables/23/4.2.0.19.table
index e4a4e2d04..d28010f2f 100644
--- a/definitions/grib2/tables/23/4.2.0.19.table
+++ b/definitions/grib2/tables/23/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
diff --git a/definitions/grib2/tables/23/4.2.0.6.table b/definitions/grib2/tables/23/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/23/4.2.0.6.table
+++ b/definitions/grib2/tables/23/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/23/4.2.1.0.table b/definitions/grib2/tables/23/4.2.1.0.table
index e906af726..bcd849c2e 100644
--- a/definitions/grib2/tables/23/4.2.1.0.table
+++ b/definitions/grib2/tables/23/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/23/4.2.2.0.table b/definitions/grib2/tables/23/4.2.2.0.table
index f11616d7c..81548840c 100644
--- a/definitions/grib2/tables/23/4.2.2.0.table
+++ b/definitions/grib2/tables/23/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/23/4.2.2.3.table b/definitions/grib2/tables/23/4.2.2.3.table
index 447e4f9cb..690fab42b 100644
--- a/definitions/grib2/tables/23/4.2.2.3.table
+++ b/definitions/grib2/tables/23/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/24/4.2.0.13.table b/definitions/grib2/tables/24/4.2.0.13.table
index e9feb097f..5086101ad 100644
--- a/definitions/grib2/tables/24/4.2.0.13.table
+++ b/definitions/grib2/tables/24/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.0.19.table b/definitions/grib2/tables/24/4.2.0.19.table
index c8d0f991e..015a49a45 100644
--- a/definitions/grib2/tables/24/4.2.0.19.table
+++ b/definitions/grib2/tables/24/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -24,9 +24,9 @@
 22 22 Clear air turbulence (CAT) (%)
 23 23 Supercooled large droplet probability (%)
 24 24 Convective turbulent kinetic energy (J/kg)
-25 25 Weather ((Code table 4.225))
-26 26 Convective outlook ((Code table 4.224))
-27 27 Icing scenario ((Code table 4.227))
+25 25 Weather (Code table 4.225)
+26 26 Convective outlook (Code table 4.224)
+27 27 Icing scenario (Code table 4.227)
 28 28 Mountain wave turbulence (eddy dissipation rate) (m2/3 s-1)
 29 29 Clear air turbulence (CAT) (m2/3 s-1)
 30 30 Eddy dissipation parameter (m2/3 s-1)
@@ -35,7 +35,7 @@
 33 33 Visibility through liquid fog (m)
 34 34 Visibility through ice fog (m)
 35 35 Visibility through blowing snow (m)
-36 36 Presence of snow squalls ((Code table 4.222))
+36 36 Presence of snow squalls (Code table 4.222)
 # 37-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/24/4.2.0.6.table b/definitions/grib2/tables/24/4.2.0.6.table
index 1483d8cb3..4cec0c8aa 100644
--- a/definitions/grib2/tables/24/4.2.0.6.table
+++ b/definitions/grib2/tables/24/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/24/4.2.1.0.table b/definitions/grib2/tables/24/4.2.1.0.table
index e906af726..bcd849c2e 100644
--- a/definitions/grib2/tables/24/4.2.1.0.table
+++ b/definitions/grib2/tables/24/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/24/4.2.2.0.table b/definitions/grib2/tables/24/4.2.2.0.table
index ca8651cba..849c2f1e4 100644
--- a/definitions/grib2/tables/24/4.2.2.0.table
+++ b/definitions/grib2/tables/24/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/24/4.2.2.3.table b/definitions/grib2/tables/24/4.2.2.3.table
index 447e4f9cb..690fab42b 100644
--- a/definitions/grib2/tables/24/4.2.2.3.table
+++ b/definitions/grib2/tables/24/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Code table 4.2 - Parameter number by product discipline and parameter category
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/5/4.2.0.13.table b/definitions/grib2/tables/5/4.2.0.13.table
index e37f26629..8aaeeb308 100644
--- a/definitions/grib2/tables/5/4.2.0.13.table
+++ b/definitions/grib2/tables/5/4.2.0.13.table
@@ -1,3 +1,3 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Aerosol type (code table (4.205))
+0 0 Aerosol type (code table (4.205)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/5/4.2.0.19.table b/definitions/grib2/tables/5/4.2.0.19.table
index 2ed0264d6..21200f05b 100644
--- a/definitions/grib2/tables/5/4.2.0.19.table
+++ b/definitions/grib2/tables/5/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 mixed layer depth (m)
-4 4 Volcanic ash (code table (4.206))
+4 4 Volcanic ash (code table (4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing (code table (4.207))
+7 7 Icing (code table (4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence (code table (4.208))
+10 10 Turbulence (code table (4.208)
 11 11 Turbulent kinetic energy (J kg-1)
-12 12 Planetary boundary layer regime (code table (4.209))
-13 13 Contrail intensity (code table (4.210))
-14 14 Contrail engine type (code table (4.211))
+12 12 Planetary boundary layer regime (code table (4.209)
+13 13 Contrail intensity (code table (4.210)
+14 14 Contrail engine type (code table (4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
diff --git a/definitions/grib2/tables/5/4.2.0.6.table b/definitions/grib2/tables/5/4.2.0.6.table
index 58ad17ca7..e0edd3444 100644
--- a/definitions/grib2/tables/5/4.2.0.6.table
+++ b/definitions/grib2/tables/5/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type (code table (4.203))
+8 8 Cloud type (code table (4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage (code table (4.204))
+10 10 Thunderstorm coverage (code table (4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/5/4.2.1.0.table b/definitions/grib2/tables/5/4.2.1.0.table
index 9d1f78180..babfba396 100644
--- a/definitions/grib2/tables/5/4.2.1.0.table
+++ b/definitions/grib2/tables/5/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely sensed snow cover ((code table 4.215))
-3 3 Elevation of snow covered terrain ((code table 4.216))
+2 2 Remotely sensed snow cover (code table 4.215)
+3 3 Elevation of snow covered terrain (code table 4.216)
 4 4 Snow water equivalent percent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/5/4.2.2.0.table b/definitions/grib2/tables/5/4.2.2.0.table
index 77b9faac3..8541d6bb7 100644
--- a/definitions/grib2/tables/5/4.2.2.0.table
+++ b/definitions/grib2/tables/5/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg -2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use (code table (4.212))
+8 8 Land use (code table (4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/5/4.2.2.3.table b/definitions/grib2/tables/5/4.2.2.3.table
index c5dea241d..dce6558d7 100644
--- a/definitions/grib2/tables/5/4.2.2.3.table
+++ b/definitions/grib2/tables/5/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Soil type (code table (4.213))
+0 0 Soil type (code table (4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/6/4.2.0.13.table b/definitions/grib2/tables/6/4.2.0.13.table
index e37f26629..8aaeeb308 100644
--- a/definitions/grib2/tables/6/4.2.0.13.table
+++ b/definitions/grib2/tables/6/4.2.0.13.table
@@ -1,3 +1,3 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Aerosol type (code table (4.205))
+0 0 Aerosol type (code table (4.205)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/6/4.2.0.19.table b/definitions/grib2/tables/6/4.2.0.19.table
index a710602e2..a1ae140ef 100644
--- a/definitions/grib2/tables/6/4.2.0.19.table
+++ b/definitions/grib2/tables/6/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 mixed layer depth (m)
-4 4 Volcanic ash (code table (4.206))
+4 4 Volcanic ash (code table (4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing (code table (4.207))
+7 7 Icing (code table (4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence (code table (4.208))
+10 10 Turbulence (code table (4.208)
 11 11 Turbulent kinetic energy (J kg-1)
-12 12 Planetary boundary layer regime (code table (4.209))
-13 13 Contrail intensity (code table (4.210))
-14 14 Contrail engine type (code table (4.211))
+12 12 Planetary boundary layer regime (code table (4.209)
+13 13 Contrail intensity (code table (4.210)
+14 14 Contrail engine type (code table (4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
diff --git a/definitions/grib2/tables/6/4.2.0.6.table b/definitions/grib2/tables/6/4.2.0.6.table
index 9555b7496..ca5688e25 100644
--- a/definitions/grib2/tables/6/4.2.0.6.table
+++ b/definitions/grib2/tables/6/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type (code table (4.203))
+8 8 Cloud type (code table (4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage (code table (4.204))
+10 10 Thunderstorm coverage (code table (4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/6/4.2.1.0.table b/definitions/grib2/tables/6/4.2.1.0.table
index 9d1f78180..babfba396 100644
--- a/definitions/grib2/tables/6/4.2.1.0.table
+++ b/definitions/grib2/tables/6/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely sensed snow cover ((code table 4.215))
-3 3 Elevation of snow covered terrain ((code table 4.216))
+2 2 Remotely sensed snow cover (code table 4.215)
+3 3 Elevation of snow covered terrain (code table 4.216)
 4 4 Snow water equivalent percent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/6/4.2.2.0.table b/definitions/grib2/tables/6/4.2.2.0.table
index 900206620..f7fa333f1 100644
--- a/definitions/grib2/tables/6/4.2.2.0.table
+++ b/definitions/grib2/tables/6/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg -2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use (code table (4.212))
+8 8 Land use (code table (4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/6/4.2.2.3.table b/definitions/grib2/tables/6/4.2.2.3.table
index e5b989239..c46c49d9c 100644
--- a/definitions/grib2/tables/6/4.2.2.3.table
+++ b/definitions/grib2/tables/6/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Soil type (code table (4.213))
+0 0 Soil type (code table (4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/7/4.2.0.13.table b/definitions/grib2/tables/7/4.2.0.13.table
index 00fe9b34d..58f38e3dd 100644
--- a/definitions/grib2/tables/7/4.2.0.13.table
+++ b/definitions/grib2/tables/7/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Aerosol type (code table (4.205))
+0 0 Aerosol type (code table (4.205)
 #1-191 1-191 Reserved (-)
 #192-254 192-254 Reserved for local use (-)
 255 255 Missing (-)
diff --git a/definitions/grib2/tables/7/4.2.0.19.table b/definitions/grib2/tables/7/4.2.0.19.table
index 10df7506a..46cb8515d 100644
--- a/definitions/grib2/tables/7/4.2.0.19.table
+++ b/definitions/grib2/tables/7/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 mixed layer depth (m)
-4 4 Volcanic ash (code table (4.206))
+4 4 Volcanic ash (code table (4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing (code table (4.207))
+7 7 Icing (code table (4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence (code table (4.208))
+10 10 Turbulence (code table (4.208)
 11 11 Turbulent kinetic energy (J kg-1)
-12 12 Planetary boundary layer regime (code table (4.209))
-13 13 Contrail intensity (code table (4.210))
-14 14 Contrail engine type (code table (4.211))
+12 12 Planetary boundary layer regime (code table (4.209)
+13 13 Contrail intensity (code table (4.210)
+14 14 Contrail engine type (code table (4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
@@ -25,7 +25,7 @@
 23 23 Supercooled large droplet probability (see Note 4) (%)
 24 24 Convective turbulent kinetic energy - validation (J kg-1)
 25 25 Weather Interpretation ww (WMO) - validation
-26 26 Convective outlook (code table (4.224))
+26 26 Convective outlook (code table (4.224)
 #27-191 26-191 Reserved
 #192-254 192-254 Reserved for local use (-)
 255 255 Missing
diff --git a/definitions/grib2/tables/7/4.2.0.6.table b/definitions/grib2/tables/7/4.2.0.6.table
index f46fbc253..b7f10a431 100644
--- a/definitions/grib2/tables/7/4.2.0.6.table
+++ b/definitions/grib2/tables/7/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type (code table (4.203))
+8 8 Cloud type (code table (4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage (code table (4.204))
+10 10 Thunderstorm coverage (code table (4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/7/4.2.1.0.table b/definitions/grib2/tables/7/4.2.1.0.table
index f8efa7a12..277ecf6d9 100644
--- a/definitions/grib2/tables/7/4.2.1.0.table
+++ b/definitions/grib2/tables/7/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely sensed snow cover ((code table 4.215))
-3 3 Elevation of snow covered terrain ((code table 4.216))
+2 2 Remotely sensed snow cover (code table 4.215)
+3 3 Elevation of snow covered terrain (code table 4.216)
 4 4 Snow water equivalent percent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/7/4.2.2.0.table b/definitions/grib2/tables/7/4.2.2.0.table
index 5970dfff1..948baa63c 100644
--- a/definitions/grib2/tables/7/4.2.2.0.table
+++ b/definitions/grib2/tables/7/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg -2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use (code table (4.212))
+8 8 Land use (code table (4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/7/4.2.2.3.table b/definitions/grib2/tables/7/4.2.2.3.table
index 52574791a..8f377590b 100644
--- a/definitions/grib2/tables/7/4.2.2.3.table
+++ b/definitions/grib2/tables/7/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Soil type (code table (4.213))
+0 0 Soil type (code table (4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/7/4.2.2.4.table b/definitions/grib2/tables/7/4.2.2.4.table
index 3ff054d8e..db102b02b 100644
--- a/definitions/grib2/tables/7/4.2.2.4.table
+++ b/definitions/grib2/tables/7/4.2.2.4.table
@@ -1,3 +1,3 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Fire outlook (code table (4.224))
-1 1 Fire outlook due to dry thunderstorm (code table (4.224))
+0 0 Fire outlook (code table (4.224)
+1 1 Fire outlook due to dry thunderstorm (code table (4.224)
diff --git a/definitions/grib2/tables/8/4.2.0.13.table b/definitions/grib2/tables/8/4.2.0.13.table
index 2a4fcbef1..b9979f0d3 100644
--- a/definitions/grib2/tables/8/4.2.0.13.table
+++ b/definitions/grib2/tables/8/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/8/4.2.0.19.table b/definitions/grib2/tables/8/4.2.0.19.table
index a2adb1d1e..1bbbd4243 100644
--- a/definitions/grib2/tables/8/4.2.0.19.table
+++ b/definitions/grib2/tables/8/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
diff --git a/definitions/grib2/tables/8/4.2.0.6.table b/definitions/grib2/tables/8/4.2.0.6.table
index 72394191f..462727d0b 100644
--- a/definitions/grib2/tables/8/4.2.0.6.table
+++ b/definitions/grib2/tables/8/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/8/4.2.1.0.table b/definitions/grib2/tables/8/4.2.1.0.table
index 4e72e1ab3..bf1e3e93f 100644
--- a/definitions/grib2/tables/8/4.2.1.0.table
+++ b/definitions/grib2/tables/8/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/8/4.2.2.0.table b/definitions/grib2/tables/8/4.2.2.0.table
index 359a12e62..b440b9426 100644
--- a/definitions/grib2/tables/8/4.2.2.0.table
+++ b/definitions/grib2/tables/8/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/8/4.2.2.3.table b/definitions/grib2/tables/8/4.2.2.3.table
index 6c135b8cd..80113a4bd 100644
--- a/definitions/grib2/tables/8/4.2.2.3.table
+++ b/definitions/grib2/tables/8/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)
diff --git a/definitions/grib2/tables/9/4.2.0.13.table b/definitions/grib2/tables/9/4.2.0.13.table
index 2a4fcbef1..b9979f0d3 100644
--- a/definitions/grib2/tables/9/4.2.0.13.table
+++ b/definitions/grib2/tables/9/4.2.0.13.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Aerosol type ((Code table 4.205))
+0 0 Aerosol type (Code table 4.205)
 # 1-191 Reserved 
 # 192-254 Reserved for local use 
 255 255 Missing 
diff --git a/definitions/grib2/tables/9/4.2.0.19.table b/definitions/grib2/tables/9/4.2.0.19.table
index 101103cb4..5831b567c 100644
--- a/definitions/grib2/tables/9/4.2.0.19.table
+++ b/definitions/grib2/tables/9/4.2.0.19.table
@@ -3,17 +3,17 @@
 1 1 Albedo (%)
 2 2 Thunderstorm probability (%)
 3 3 Mixed layer depth (m)
-4 4 Volcanic ash ((Code table 4.206))
+4 4 Volcanic ash (Code table 4.206)
 5 5 Icing top (m)
 6 6 Icing base (m)
-7 7 Icing ((Code table 4.207))
+7 7 Icing (Code table 4.207)
 8 8 Turbulence top (m)
 9 9 Turbulence base (m)
-10 10 Turbulence ((Code table 4.208))
+10 10 Turbulence (Code table 4.208)
 11 11 Turbulent kinetic energy (J/kg)
-12 12 Planetary boundary-layer regime ((Code table 4.209))
-13 13 Contrail intensity ((Code table 4.210))
-14 14 Contrail engine type ((Code table 4.211))
+12 12 Planetary boundary-layer regime (Code table 4.209)
+13 13 Contrail intensity (Code table 4.210)
+14 14 Contrail engine type (Code table 4.211)
 15 15 Contrail top (m)
 16 16 Contrail base (m)
 17 17 Maximum snow albedo (%)
diff --git a/definitions/grib2/tables/9/4.2.0.6.table b/definitions/grib2/tables/9/4.2.0.6.table
index 055df76a5..fd4b23014 100644
--- a/definitions/grib2/tables/9/4.2.0.6.table
+++ b/definitions/grib2/tables/9/4.2.0.6.table
@@ -7,9 +7,9 @@
 5 5 High cloud cover (%)
 6 6 Cloud water (kg m-2)
 7 7 Cloud amount (%)
-8 8 Cloud type ((Code table 4.203))
+8 8 Cloud type (Code table 4.203)
 9 9 Thunderstorm maximum tops (m)
-10 10 Thunderstorm coverage ((Code table 4.204))
+10 10 Thunderstorm coverage (Code table 4.204)
 11 11 Cloud base (m)
 12 12 Cloud top (m)
 13 13 Ceiling (m)
diff --git a/definitions/grib2/tables/9/4.2.1.0.table b/definitions/grib2/tables/9/4.2.1.0.table
index 4e72e1ab3..bf1e3e93f 100644
--- a/definitions/grib2/tables/9/4.2.1.0.table
+++ b/definitions/grib2/tables/9/4.2.1.0.table
@@ -1,8 +1,8 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
 0 0 Flash flood guidance (Encoded as an accumulation over a floating subinterval of time between the reference time and valid time) (kg m-2)
 1 1 Flash flood runoff (Encoded as an accumulation over a floating subinterval of time) (kg m-2)
-2 2 Remotely-sensed snow cover ((Code table 4.215))
-3 3 Elevation of snow-covered terrain ((Code table 4.216))
+2 2 Remotely-sensed snow cover (Code table 4.215)
+3 3 Elevation of snow-covered terrain (Code table 4.216)
 4 4 Snow water equivalent per cent of normal (%)
 5 5 Baseflow-groundwater runoff (kg m-2)
 6 6 Storm surface runoff (kg m-2)
diff --git a/definitions/grib2/tables/9/4.2.2.0.table b/definitions/grib2/tables/9/4.2.2.0.table
index 3e43b501c..ed4a85093 100644
--- a/definitions/grib2/tables/9/4.2.2.0.table
+++ b/definitions/grib2/tables/9/4.2.2.0.table
@@ -7,7 +7,7 @@
 5 5 Water runoff (kg m-2)
 6 6 Evapotranspiration (kg-2 s-1)
 7 7 Model terrain height (m)
-8 8 Land use ((Code table 4.212))
+8 8 Land use (Code table 4.212)
 9 9 Volumetric soil moisture content (Proportion)
 10 10 Ground heat flux (W m-2)
 11 11 Moisture availability (%)
diff --git a/definitions/grib2/tables/9/4.2.2.3.table b/definitions/grib2/tables/9/4.2.2.3.table
index 6c135b8cd..80113a4bd 100644
--- a/definitions/grib2/tables/9/4.2.2.3.table
+++ b/definitions/grib2/tables/9/4.2.2.3.table
@@ -1,5 +1,5 @@
 # Automatically generated by ./create_tables.pl from database fm92_grib2@grib-param-db-prod.ecmwf.int, do not edit
-0 0 Soil type ((Code table 4.213))
+0 0 Soil type (Code table 4.213)
 1 1 Upper layer soil temperature (K)
 2 2 Upper layer soil moisture (kg m-3)
 3 3 Lower layer soil moisture (kg m-3)

From 5dc40557cc392339748f9cae13343792e48180fb Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 26 Nov 2019 10:54:41 +0000
Subject: [PATCH 29/38] ECC-1030: grib_get: Add '-B' option for ordering

---
 tests/CMakeLists.txt   |  1 +
 tests/grib_ecc-1030.sh | 51 ++++++++++++++++++++++++++++++++++++++++++
 tools/grib_get.c       |  6 +----
 tools/grib_options.c   |  6 ++---
 4 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100755 tests/grib_ecc-1030.sh

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f62ad4a13..36878b44f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -118,6 +118,7 @@ list( APPEND tests_data_reqd
     grib_ecc-984
     grib_ecc-1000
     grib_ecc-1001
+    grib_ecc-1030
     bufr_ecc-556
     gts_get
     gts_ls
diff --git a/tests/grib_ecc-1030.sh b/tests/grib_ecc-1030.sh
new file mode 100755
index 000000000..96a102110
--- /dev/null
+++ b/tests/grib_ecc-1030.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+# Copyright 2005-2019 ECMWF.
+#
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
+#
+# In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
+# virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
+#
+
+. ./include.sh
+set -u
+# ---------------------------------------------------------
+# This is the test for the JIRA issue ECC-1030
+# grib_get with the ordering option '-B'
+# ---------------------------------------------------------
+label="grib_ecc-1030-test"
+tempRef=temp.${label}.ref
+tempOut=temp.${label}.out
+
+# Test 1
+# ------
+input=${data_dir}/pad.grib
+${tools_dir}/grib_get -p count,level -B'level:i' $input > $tempOut
+cat > $tempRef <<EOF
+1 0
+2 0
+3 0
+4 1
+5 1000
+6 1000
+EOF
+diff -w $tempRef $tempOut
+
+# Test 2
+# ------
+input=${data_dir}/pad.grib
+${tools_dir}/grib_get -p count,level -B'level:i desc' $input > $tempOut
+cat > $tempRef <<EOF
+1 1000
+2 1000
+3 1
+4 0
+5 0
+6 0
+EOF
+diff -w $tempRef $tempOut
+
+
+# Clean up
+rm -f $tempRef $tempOut
diff --git a/tools/grib_get.c b/tools/grib_get.c
index 43741f63c..3f0e5c07c 100644
--- a/tools/grib_get.c
+++ b/tools/grib_get.c
@@ -8,11 +8,6 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-/*
- * C Implementation: grib_get
- *
- */
-
 #include "grib_tools.h"
 
 grib_option grib_options[]={
@@ -20,6 +15,7 @@ grib_option grib_options[]={
         {"f",0,0,0,1,0},
         {"p:",0,0,0,1,0},
         {"F:",0,0,1,1,"%g"},
+        {"B:",0,0,0,1,0},
         {"l:",0,0,0,1,0},
         {"P:",0,0,0,1,0},
         {"w:",0,0,0,1,0},
diff --git a/tools/grib_options.c b/tools/grib_options.c
index 20ee5b0e9..fec745b32 100644
--- a/tools/grib_options.c
+++ b/tools/grib_options.c
@@ -29,9 +29,9 @@ static grib_options_help grib_options_help_list[] ={
   {"a",0,"Dump aliases.\n"},
   {"b:","key,key,...",
      "\n\t\tAll the keys in this list are skipped in the comparison. Bit-by-bit compare on.\n"},
-  {"B:","order by directive",
-     "\n\t\tOrder by. The output will be ordered according to the order by directive."
-     "\n\t\tOrder by example: \"step:i asc, centre desc\" (step numeric ascending and centre descending)\n"},
+  {"B:","'order by' directive",
+     "\n\t\tOrder by. The output will be ordered according to the 'order by' directive."
+     "\n\t\tExample: \"step:i asc, centre desc\" (step numeric ascending and centre descending)\n"},
      {"c:","key[:i|d|s|n],key[:i|d|s|n],...",
    "\n\t\tOnly the listed keys or namespaces (:n) are compared. The optional letter after the colon is used "
    "\n\t\tto force the type in the comparison: i->integer, d->float, s->string, n->namespace."

From 10b9aa136affe0830c99f07f5cf403493030a6f9 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 26 Nov 2019 15:40:58 +0000
Subject: [PATCH 30/38] REVERT ECC-827 and ECC-962 due to regression. See
 SD-27528

---
 tools/grib_to_netcdf.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/grib_to_netcdf.c b/tools/grib_to_netcdf.c
index d20d45d0c..176c18782 100644
--- a/tools/grib_to_netcdf.c
+++ b/tools/grib_to_netcdf.c
@@ -1989,11 +1989,14 @@ static void validation_time(request *r)
     if(ndate)
     {
         const char* p = get_value(r, "date", 0);
-        const char* hdate = get_value(r, "hdate", 0);
-        /* All hindcast Data. See GRIB-699, GRIB-762 and ECC-962 */
-        if (hdate) {
-            grib_context_log(ctx, GRIB_LOG_DEBUG, "grib_to_netcdf: Hindcast data hdate=%s", hdate);
-            p = hdate; /* Don't use 'date'. Use the hindcast date instead */
+        const char* marsClass = get_value(r, "class", 0);
+        if (eq_string(marsClass, "s2")) {
+            /* S2S Data. See GRIB-699 and GRIB-762 */
+            const char* hdate = get_value(r, "hdate", 0);
+            grib_context_log(ctx, GRIB_LOG_DEBUG, "grib_to_netcdf: S2S Data");
+            if (hdate) {
+                p = hdate; /* This is a hindcast */
+            }
         }
         if(is_number(p))
             date = atol(p);

From fa4bad3f56facd6a075de7a628269a8e24dcfeb0 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 26 Nov 2019 15:48:56 +0000
Subject: [PATCH 31/38] Remove the error message. In IFS 1000s of messages are
 posted. Need to track the guilty party

---
 src/grib_accessor_class_ascii.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/grib_accessor_class_ascii.c b/src/grib_accessor_class_ascii.c
index 6ec67e107..10207e0ed 100644
--- a/src/grib_accessor_class_ascii.c
+++ b/src/grib_accessor_class_ascii.c
@@ -256,7 +256,7 @@ static int unpack_double (grib_accessor* a, double*v, size_t *len)
         return GRIB_SUCCESS;
     }
 
-    grib_context_log(a->context,GRIB_LOG_ERROR,"Cannot unpack %s as double. Hint: Try unpacking as string",a->name);
+    grib_context_log(a->context,GRIB_LOG_WARNING,"Cannot unpack %s as double. Hint: Try unpacking as string",a->name);
 
     return GRIB_NOT_IMPLEMENTED;
 }

From 260b31f6717a30458b7b5f4e6ffb1b3725727a24 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 26 Nov 2019 18:06:09 +0000
Subject: [PATCH 32/38] Remove unused file

---
 definitions/grib2/tables/0/stepType.table  | 3 ---
 definitions/grib2/tables/1/stepType.table  | 3 ---
 definitions/grib2/tables/10/stepType.table | 2 --
 definitions/grib2/tables/11/stepType.table | 2 --
 definitions/grib2/tables/12/stepType.table | 2 --
 definitions/grib2/tables/13/stepType.table | 2 --
 definitions/grib2/tables/14/stepType.table | 2 --
 definitions/grib2/tables/15/stepType.table | 2 --
 definitions/grib2/tables/16/stepType.table | 2 --
 definitions/grib2/tables/17/stepType.table | 2 --
 definitions/grib2/tables/18/stepType.table | 2 --
 definitions/grib2/tables/19/stepType.table | 2 --
 definitions/grib2/tables/2/stepType.table  | 4 ----
 definitions/grib2/tables/20/stepType.table | 2 --
 definitions/grib2/tables/21/stepType.table | 2 --
 definitions/grib2/tables/23/stepType.table | 2 --
 definitions/grib2/tables/24/stepType.table | 2 --
 definitions/grib2/tables/3/stepType.table  | 2 --
 definitions/grib2/tables/4/stepType.table  | 2 --
 definitions/grib2/tables/5/stepType.table  | 2 --
 definitions/grib2/tables/6/stepType.table  | 2 --
 definitions/grib2/tables/7/stepType.table  | 2 --
 definitions/grib2/tables/8/stepType.table  | 2 --
 definitions/grib2/tables/9/stepType.table  | 2 --
 definitions/grib3/tables/0/stepType.table  | 4 ----
 definitions/grib3/tables/1/stepType.table  | 4 ----
 26 files changed, 60 deletions(-)
 delete mode 100644 definitions/grib2/tables/0/stepType.table
 delete mode 100644 definitions/grib2/tables/1/stepType.table
 delete mode 100644 definitions/grib2/tables/2/stepType.table
 delete mode 100644 definitions/grib3/tables/0/stepType.table
 delete mode 100644 definitions/grib3/tables/1/stepType.table

diff --git a/definitions/grib2/tables/0/stepType.table b/definitions/grib2/tables/0/stepType.table
deleted file mode 100644
index 10721eb25..000000000
--- a/definitions/grib2/tables/0/stepType.table
+++ /dev/null
@@ -1,3 +0,0 @@
-
-0 instant  Instant
-1 interval Interval
diff --git a/definitions/grib2/tables/1/stepType.table b/definitions/grib2/tables/1/stepType.table
deleted file mode 100644
index 10721eb25..000000000
--- a/definitions/grib2/tables/1/stepType.table
+++ /dev/null
@@ -1,3 +0,0 @@
-
-0 instant  Instant
-1 interval Interval
diff --git a/definitions/grib2/tables/10/stepType.table b/definitions/grib2/tables/10/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/10/stepType.table
+++ b/definitions/grib2/tables/10/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/11/stepType.table b/definitions/grib2/tables/11/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/11/stepType.table
+++ b/definitions/grib2/tables/11/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/12/stepType.table b/definitions/grib2/tables/12/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/12/stepType.table
+++ b/definitions/grib2/tables/12/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/13/stepType.table b/definitions/grib2/tables/13/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/13/stepType.table
+++ b/definitions/grib2/tables/13/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/14/stepType.table b/definitions/grib2/tables/14/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/14/stepType.table
+++ b/definitions/grib2/tables/14/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/15/stepType.table b/definitions/grib2/tables/15/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/15/stepType.table
+++ b/definitions/grib2/tables/15/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/16/stepType.table b/definitions/grib2/tables/16/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/16/stepType.table
+++ b/definitions/grib2/tables/16/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/17/stepType.table b/definitions/grib2/tables/17/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/17/stepType.table
+++ b/definitions/grib2/tables/17/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/18/stepType.table b/definitions/grib2/tables/18/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/18/stepType.table
+++ b/definitions/grib2/tables/18/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/19/stepType.table b/definitions/grib2/tables/19/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/19/stepType.table
+++ b/definitions/grib2/tables/19/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/2/stepType.table b/definitions/grib2/tables/2/stepType.table
deleted file mode 100644
index d88e44123..000000000
--- a/definitions/grib2/tables/2/stepType.table
+++ /dev/null
@@ -1,4 +0,0 @@
-# CODE TABLE Step Type
-
-0 instant  Instant
-1 interval Interval
diff --git a/definitions/grib2/tables/20/stepType.table b/definitions/grib2/tables/20/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/20/stepType.table
+++ b/definitions/grib2/tables/20/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/21/stepType.table b/definitions/grib2/tables/21/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/21/stepType.table
+++ b/definitions/grib2/tables/21/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/23/stepType.table b/definitions/grib2/tables/23/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/23/stepType.table
+++ b/definitions/grib2/tables/23/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/24/stepType.table b/definitions/grib2/tables/24/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/24/stepType.table
+++ b/definitions/grib2/tables/24/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/3/stepType.table b/definitions/grib2/tables/3/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/3/stepType.table
+++ b/definitions/grib2/tables/3/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/4/stepType.table b/definitions/grib2/tables/4/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/4/stepType.table
+++ b/definitions/grib2/tables/4/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/5/stepType.table b/definitions/grib2/tables/5/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/5/stepType.table
+++ b/definitions/grib2/tables/5/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/6/stepType.table b/definitions/grib2/tables/6/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/6/stepType.table
+++ b/definitions/grib2/tables/6/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/7/stepType.table b/definitions/grib2/tables/7/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/7/stepType.table
+++ b/definitions/grib2/tables/7/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/8/stepType.table b/definitions/grib2/tables/8/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/8/stepType.table
+++ b/definitions/grib2/tables/8/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib2/tables/9/stepType.table b/definitions/grib2/tables/9/stepType.table
index d88e44123..4ec73e7a1 100644
--- a/definitions/grib2/tables/9/stepType.table
+++ b/definitions/grib2/tables/9/stepType.table
@@ -1,4 +1,2 @@
-# CODE TABLE Step Type
-
 0 instant  Instant
 1 interval Interval
diff --git a/definitions/grib3/tables/0/stepType.table b/definitions/grib3/tables/0/stepType.table
deleted file mode 100644
index d88e44123..000000000
--- a/definitions/grib3/tables/0/stepType.table
+++ /dev/null
@@ -1,4 +0,0 @@
-# CODE TABLE Step Type
-
-0 instant  Instant
-1 interval Interval
diff --git a/definitions/grib3/tables/1/stepType.table b/definitions/grib3/tables/1/stepType.table
deleted file mode 100644
index d88e44123..000000000
--- a/definitions/grib3/tables/1/stepType.table
+++ /dev/null
@@ -1,4 +0,0 @@
-# CODE TABLE Step Type
-
-0 instant  Instant
-1 interval Interval

From 1fe7b8d75b1ad5bdc54c57137995564b550bdee2 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 27 Nov 2019 11:40:29 +0000
Subject: [PATCH 33/38] Bump up version

---
 .appveyor.yml | 2 +-
 VERSION.cmake | 2 +-
 version.sh    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index ebf87f9ea..8f35ef331 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -2,7 +2,7 @@
 #      general configuration      #
 #---------------------------------#
 
-version: 2.15.0-{build}-{branch}
+version: 2.16.0-{build}-{branch}
 
 branches:
   only:
diff --git a/VERSION.cmake b/VERSION.cmake
index ef8ca29cf..5034baae0 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1 +1 @@
-set( ${PROJECT_NAME}_VERSION_STR  "2.15.0" )
+set( ${PROJECT_NAME}_VERSION_STR  "2.16.0" )
diff --git a/version.sh b/version.sh
index c70f25f7b..3f86d5967 100644
--- a/version.sh
+++ b/version.sh
@@ -3,7 +3,7 @@ PACKAGE_NAME='eccodes'
 
 # Package version
 ECCODES_MAJOR_VERSION=2
-ECCODES_MINOR_VERSION=15
+ECCODES_MINOR_VERSION=16
 ECCODES_REVISION_VERSION=0
 
 ECCODES_CURRENT=1

From aa3d620db7d74e19cf8d10458b477c6a2b860797 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 27 Nov 2019 13:37:40 +0000
Subject: [PATCH 34/38] Testing: GRIB ieee to simple packing

---
 tests/grib_change_packing.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/grib_change_packing.sh b/tests/grib_change_packing.sh
index 0ea017449..015aeca61 100755
--- a/tests/grib_change_packing.sh
+++ b/tests/grib_change_packing.sh
@@ -69,6 +69,16 @@ res2=`${tools_dir}/grib_get '-F%.1f' -p avg,enorm $temp`
 rm -f $temp
 
 
+# IEEE to Simple Packing
+# -----------------------
+input=${data_dir}/grid_ieee.grib
+${tools_dir}/grib_set -r -s packingType=grid_simple $input $temp
+grib_check_key_equals $temp packingType 'grid_simple'
+stats1=`${tools_dir}/grib_get -F%.2f -p skew,kurt $input`
+stats2=`${tools_dir}/grib_get -F%.2f -p skew,kurt $temp`
+[ "$stats1" = "$stats2" ]
+
+
 # Change grib packing test
 # -------------------------
 test_packing $grib1 $packing1

From 97717273ffa8af00c983ae70b58f5e3cf248ea9f Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Wed, 27 Nov 2019 17:12:08 +0000
Subject: [PATCH 35/38] More error reporting

---
 src/grib_accessor_class_data_g1simple_packing.c | 2 +-
 src/grib_accessor_class_data_g2simple_packing.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/grib_accessor_class_data_g1simple_packing.c b/src/grib_accessor_class_data_g1simple_packing.c
index 0dd23b033..33e4def97 100644
--- a/src/grib_accessor_class_data_g1simple_packing.c
+++ b/src/grib_accessor_class_data_g1simple_packing.c
@@ -283,7 +283,7 @@ static int pack_double(grib_accessor* a, const double* cval, size_t *len)
     case GRIB_SUCCESS:
         break;
     default:
-        grib_context_log(a->context,GRIB_LOG_ERROR,"GRIB1 simple packing: unable to set values");
+        grib_context_log(a->context,GRIB_LOG_ERROR,"GRIB1 simple packing: unable to set values (%s)", grib_get_error_message(ret));
         return ret;
     }
 
diff --git a/src/grib_accessor_class_data_g2simple_packing.c b/src/grib_accessor_class_data_g2simple_packing.c
index 033b4848a..80283cc5f 100644
--- a/src/grib_accessor_class_data_g2simple_packing.c
+++ b/src/grib_accessor_class_data_g2simple_packing.c
@@ -218,7 +218,7 @@ static int pack_double(grib_accessor* a, const double* cval, size_t *len)
     case GRIB_SUCCESS:
         break;
     default:
-        grib_context_log(a->context,GRIB_LOG_ERROR,"GRIB2 simple packing: unable to set values");
+        grib_context_log(a->context,GRIB_LOG_ERROR,"GRIB2 simple packing: unable to set values (%s)", grib_get_error_message(ret));
         return ret;
     }
 

From 4eb03d28e3fa2891e52216089d55562c39c3199a Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Thu, 28 Nov 2019 11:23:44 +0000
Subject: [PATCH 36/38] Improved error message

---
 src/grib_accessor_class_data_ccsds_packing.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/grib_accessor_class_data_ccsds_packing.c b/src/grib_accessor_class_data_ccsds_packing.c
index b937915c7..6fcb8925b 100644
--- a/src/grib_accessor_class_data_ccsds_packing.c
+++ b/src/grib_accessor_class_data_ccsds_packing.c
@@ -544,7 +544,7 @@ static void print_error_msg(grib_context* c)
 {
     grib_context_log(c, GRIB_LOG_ERROR,
             "grib_accessor_data_ccsds_packing: CCSDS support not enabled. "
-            "Please rebuild with -DENABLE_AEC=ON");
+            "Please rebuild with -DENABLE_AEC=ON (Adaptive Entropy Coding library)");
 }
 static int unpack_double(grib_accessor* a, double* val, size_t *len)
 {

From cf8a57ea0b4e3345ce27bc5ced27d008f0b7593c Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Fri, 29 Nov 2019 11:13:18 +0000
Subject: [PATCH 37/38] Fix broken Windows build

---
 tests/bufr_extract_headers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/bufr_extract_headers.c b/tests/bufr_extract_headers.c
index a029f613a..520d0532e 100644
--- a/tests/bufr_extract_headers.c
+++ b/tests/bufr_extract_headers.c
@@ -11,6 +11,7 @@
 #include "eccodes.h"
 #include <assert.h>
 
+#define MAX_KEYS 100
 int main(int argc, char* argv[])
 {
     char *filename, *keys;
@@ -19,7 +20,6 @@ int main(int argc, char* argv[])
     codes_bufr_header* header_array = NULL;
     codes_context* c = codes_context_get_default();
     const int strict_mode = 1;
-    const int MAX_KEYS=100;
     int requested_print_keys_count = MAX_KEYS;
     codes_values requested_print_keys[MAX_KEYS];
 

From 4204d7bd3f4b17e52cb00dd831c06671286202a5 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Fri, 29 Nov 2019 12:43:48 +0000
Subject: [PATCH 38/38] Fix MEMFS build: remove empty tables

---
 definitions/grib2/tables/0/4.2.table  | 0
 definitions/grib2/tables/1/4.2.table  | 0
 definitions/grib2/tables/10/4.2.table | 5 -----
 definitions/grib2/tables/2/4.2.table  | 5 -----
 definitions/grib2/tables/3/4.2.table  | 5 -----
 definitions/grib2/tables/4/4.2.table  | 5 -----
 definitions/grib2/tables/5/4.2.table  | 5 -----
 definitions/grib2/tables/6/4.2.table  | 5 -----
 definitions/grib2/tables/7/4.2.table  | 5 -----
 definitions/grib2/tables/8/4.2.table  | 5 -----
 definitions/grib2/tables/9/4.2.table  | 5 -----
 11 files changed, 45 deletions(-)
 delete mode 100644 definitions/grib2/tables/0/4.2.table
 delete mode 100644 definitions/grib2/tables/1/4.2.table
 delete mode 100644 definitions/grib2/tables/10/4.2.table
 delete mode 100644 definitions/grib2/tables/2/4.2.table
 delete mode 100644 definitions/grib2/tables/3/4.2.table
 delete mode 100644 definitions/grib2/tables/4/4.2.table
 delete mode 100644 definitions/grib2/tables/5/4.2.table
 delete mode 100644 definitions/grib2/tables/6/4.2.table
 delete mode 100644 definitions/grib2/tables/7/4.2.table
 delete mode 100644 definitions/grib2/tables/8/4.2.table
 delete mode 100644 definitions/grib2/tables/9/4.2.table

diff --git a/definitions/grib2/tables/0/4.2.table b/definitions/grib2/tables/0/4.2.table
deleted file mode 100644
index e69de29bb..000000000
diff --git a/definitions/grib2/tables/1/4.2.table b/definitions/grib2/tables/1/4.2.table
deleted file mode 100644
index e69de29bb..000000000
diff --git a/definitions/grib2/tables/10/4.2.table b/definitions/grib2/tables/10/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/10/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/2/4.2.table b/definitions/grib2/tables/2/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/2/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/3/4.2.table b/definitions/grib2/tables/3/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/3/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/4/4.2.table b/definitions/grib2/tables/4/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/4/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/5/4.2.table b/definitions/grib2/tables/5/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/5/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/6/4.2.table b/definitions/grib2/tables/6/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/6/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/7/4.2.table b/definitions/grib2/tables/7/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/7/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/8/4.2.table b/definitions/grib2/tables/8/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/8/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing
diff --git a/definitions/grib2/tables/9/4.2.table b/definitions/grib2/tables/9/4.2.table
deleted file mode 100644
index ff9553645..000000000
--- a/definitions/grib2/tables/9/4.2.table
+++ /dev/null
@@ -1,5 +0,0 @@
-# CODE TABLE 4.2, Parameter number by product discipline and parameter category
-# 4 4  unknown
-# 151 151  unknown
-# 192 192  unknown
-# 255 255     Missing