diff --git a/rgbnir_definition.json b/rgbnir_definition.json
index 5ca1717cfebd20beab51fb8431dc1c9023288e33..796169422d93e7dc583bfd586b022dcd3bb393ca 100644
--- a/rgbnir_definition.json
+++ b/rgbnir_definition.json
@@ -260,22 +260,6 @@
         "name": "hh_uint16"
     }, {
         "bands": [{
-                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
-                "description": "Gray Channel",
-                "gdal_interpretation": "GrayBand",
-                "identifier": "hh",
-                "name": "hh",
-                "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]
-                ]
-            },
-            {
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
                 "description": "Gray Channel",
                 "gdal_interpretation": "GrayBand",
@@ -293,25 +277,9 @@
             }
         ],
         "data_type": "Uint16",
-        "name": "hh_vv_uint16"
+        "name": "vv_uint16"
     }, {
         "bands": [{
-                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
-                "description": "Gray Channel",
-                "gdal_interpretation": "GrayBand",
-                "identifier": "hh",
-                "name": "hh",
-                "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]
-                ]
-            },
-            {
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
                 "description": "Gray Channel",
                 "gdal_interpretation": "GrayBand",
@@ -326,8 +294,12 @@
                 "allowed_value_ranges": [
                     [0, 65535]
                 ]
-            },
-            {
+            }
+        ],
+        "data_type": "Uint16",
+        "name": "hv_unit16"
+    }, {
+        "bands": [{
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
                 "description": "Gray Channel",
                 "gdal_interpretation": "GrayBand",
@@ -342,26 +314,10 @@
                 "allowed_value_ranges": [
                     [0, 65535]
                 ]
-            },
-            {
-                "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",
-                "description": "Gray Channel",
-                "gdal_interpretation": "GrayBand",
-                "identifier": "vv",
-                "name": "vv",
-                "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": "hh_hv_vh_vv_unit16"
+        "name": "vh_unit16"
     }, {
         "bands": [{
                 "definition": "http://www.opengis.net/def/property/OGC/0/Radiance",