diff --git a/rgbnir_definition.json b/rgbnir_definition.json
index 5ab52ff49c29ce6f8309cf8e04ee3f46fd5774a4..5ca1717cfebd20beab51fb8431dc1c9023288e33 100644
--- a/rgbnir_definition.json
+++ b/rgbnir_definition.json
@@ -254,26 +254,10 @@
                 "allowed_value_ranges": [
                     [0, 65535]
                 ]
-            },
-            {
-                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
-                "description": "Gray Channel",
-                "gdal_interpretation": "GrayBand",
-                "identifier": "gray",
-                "name": "gray",
-                "nil_values": [{
-                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
-                    "value": 0
-                }],
-                "uom": "W.m-2.Sr-1",
-                "significant_figures": 5,
-                "allowed_value_ranges": [
-                    [0, 65535]
-                ]
             }
         ],
         "data_type": "Uint16",
-        "name": "sar_hh_gray"
+        "name": "hh_uint16"
     }, {
         "bands": [{
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
@@ -306,26 +290,10 @@
                 "allowed_value_ranges": [
                     [0, 65535]
                 ]
-            },
-            {
-                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
-                "description": "Gray Channel",
-                "gdal_interpretation": "GrayBand",
-                "identifier": "gray",
-                "name": "gray",
-                "nil_values": [{
-                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
-                    "value": 0
-                }],
-                "uom": "W.m-2.Sr-1",
-                "significant_figures": 5,
-                "allowed_value_ranges": [
-                    [0, 65535]
-                ]
             }
         ],
         "data_type": "Uint16",
-        "name": "sar_hh_vv_gray"
+        "name": "hh_vv_uint16"
     }, {
         "bands": [{
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
@@ -390,26 +358,10 @@
                 "allowed_value_ranges": [
                     [0, 65535]
                 ]
-            },
-            {
-                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
-                "description": "Gray Channel",
-                "gdal_interpretation": "GrayBand",
-                "identifier": "gray",
-                "name": "gray",
-                "nil_values": [{
-                    "reason": "http://www.opengis.net/def/nil/OGC/0/unknown",
-                    "value": 0
-                }],
-                "uom": "W.m-2.Sr-1",
-                "significant_figures": 5,
-                "allowed_value_ranges": [
-                    [0, 65535]
-                ]
             }
         ],
         "data_type": "Uint16",
-        "name": "sar_hh_hv_vh_vv_gray"
+        "name": "hh_hv_vh_vv_unit16"
     }, {
         "bands": [{
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",