diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def
index c7127c6b8..fb44e69f7 100644
--- a/definitions/grib1/localConcepts/ecmf/cfVarName.def
+++ b/definitions/grib1/localConcepts/ecmf/cfVarName.def
@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def
index 771bdb452..333b91989 100644
--- a/definitions/grib1/localConcepts/ecmf/name.def
+++ b/definitions/grib1/localConcepts/ecmf/name.def
@@ -1294,13 +1294,13 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
-'Surface short-wave radiation downwards' = {
+#Surface short-wave (solar) radiation downwards
+'Surface short-wave (solar) radiation downwards' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
-'Surface short-wave radiation downwards' = {
+#Surface short-wave (solar) radiation downwards
+'Surface short-wave (solar) radiation downwards' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
 	}
@@ -1379,83 +1379,83 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
-'Surface long-wave radiation downwards' = {
+#Surface long-wave (thermal) radiation downwards
+'Surface long-wave (thermal) radiation downwards' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
-'Surface long-wave radiation downwards' = {
+#Surface long-wave (thermal) radiation downwards
+'Surface long-wave (thermal) radiation downwards' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
-'Surface net short-wave radiation' = {
+#Surface net short-wave (solar) radiation
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
-'Surface net short-wave radiation' = {
+#Surface net short-wave (solar) radiation
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
-'Surface net short-wave radiation' = {
+#Surface net short-wave (solar) radiation
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
-'Surface net short-wave radiation' = {
+#Surface net short-wave (solar) radiation
+'Surface net short-wave (solar) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
-'Surface net long-wave radiation' = {
+#Surface net long-wave (thermal) radiation
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
-'Surface net long-wave radiation' = {
+#Surface net long-wave (thermal) radiation
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
-'Surface net long-wave radiation' = {
+#Surface net long-wave (thermal) radiation
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
-'Surface net long-wave radiation' = {
+#Surface net long-wave (thermal) radiation
+'Surface net long-wave (thermal) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
-'Top net short-wave radiation' = {
+#Top net short-wave (solar) radiation
+'Top net short-wave (solar) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
-'Top net short-wave radiation' = {
+#Top net short-wave (solar) radiation
+'Top net short-wave (solar) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
-'Top net short-wave radiation' = {
+#Top net short-wave (solar) radiation
+'Top net short-wave (solar) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
-'Top net long-wave radiation' = {
+#Top net long-wave (thermal) radiation
+'Top net long-wave (thermal) radiation' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
-'Top net long-wave radiation' = {
+#Top net long-wave (thermal) radiation
+'Top net long-wave (thermal) radiation' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
-'Top net long-wave radiation' = {
+#Top net long-wave (thermal) radiation
+'Top net long-wave (thermal) radiation' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
 	}
@@ -1749,13 +1749,13 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
-'Surface net short-wave radiation, clear sky' = {
+#Surface net short-wave (solar) radiation, clear sky
+'Surface net short-wave (solar) radiation, clear sky' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
-'Surface net long-wave radiation, clear sky' = {
+#Surface net long-wave (thermal) radiation, clear sky
+'Surface net long-wave (thermal) radiation, clear sky' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
 	}
diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def
index f91ce39c0..f3b8f7896 100644
--- a/definitions/grib1/localConcepts/ecmf/paramId.def
+++ b/definitions/grib1/localConcepts/ecmf/paramId.def
@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 '169' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 '169' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 '175' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 '175' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 '210' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 '211' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def
index 38f2257db..6e6f9d620 100644
--- a/definitions/grib1/localConcepts/ecmf/shortName.def
+++ b/definitions/grib1/localConcepts/ecmf/shortName.def
@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def
index 8a57c3b5f..6af17e2c0 100644
--- a/definitions/grib1/localConcepts/ecmf/units.def
+++ b/definitions/grib1/localConcepts/ecmf/units.def
@@ -1294,12 +1294,12 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 168 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 169 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 169 ;
@@ -1379,82 +1379,82 @@
 	 table2Version = 190 ;
 	 indicatorOfParameter = 174 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 175 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 176 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 170 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 177 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 178 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 160 ;
 	 indicatorOfParameter = 179 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 table2Version = 190 ;
 	 indicatorOfParameter = 179 ;
@@ -1749,12 +1749,12 @@
 	 table2Version = 128 ;
 	 indicatorOfParameter = 209 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 210 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'J m**-2' = {
 	 table2Version = 128 ;
 	 indicatorOfParameter = 211 ;
diff --git a/definitions/grib2/cfName.def b/definitions/grib2/cfName.def
index dd2057a4a..7055d11f9 100644
--- a/definitions/grib2/cfName.def
+++ b/definitions/grib2/cfName.def
@@ -21,7 +21,7 @@
 	 parameterNumber = 20 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'surface_downwelling_shortwave_flux_in_air' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -29,7 +29,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'toa_net_upward_shortwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -59,7 +59,7 @@
 	 parameterCategory = 14 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'surface_net_downward_shortwave_flux_assuming_clear_sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -67,7 +67,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'surface_net_downward_longwave_flux_assuming_clear_sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -339,7 +339,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'surface_net_downward_shortwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -347,7 +347,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'surface_net_upward_longwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -355,7 +355,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'toa_outgoing_longwave_flux' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def
index b230d5094..31baf1ea0 100644
--- a/definitions/grib2/cfVarName.def
+++ b/definitions/grib2/cfVarName.def
@@ -223,7 +223,7 @@
 	 parameterNumber = 20 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -231,7 +231,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -239,7 +239,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -301,7 +301,7 @@
 	 typeOfFirstFixedSurface = 8 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -309,7 +309,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5235,7 +5235,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5243,7 +5243,7 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5251,7 +5251,7 @@
 	 typeOfStatisticalProcessing = 1 ;
 	 typeOfFirstFixedSurface = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def
index e968bc7e6..5b200a5e5 100644
--- a/definitions/grib2/name.def
+++ b/definitions/grib2/name.def
@@ -223,24 +223,24 @@
 	 parameterNumber = 20 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface short-wave radiation downwards
-'Surface short-wave radiation downwards' = {
+#Surface short-wave (solar) radiation downwards
+'Surface short-wave (solar) radiation downwards' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 7 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
-'Surface long-wave radiation downwards' = {
+#Surface long-wave (thermal) radiation downwards
+'Surface long-wave (thermal) radiation downwards' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 3 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
-'Top net short-wave radiation' = {
+#Top net short-wave (solar) radiation
+'Top net short-wave (solar) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 1 ;
@@ -301,16 +301,16 @@
 	 typeOfFirstFixedSurface = 8 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
-'Surface net short-wave radiation, clear sky' = {
+#Surface net short-wave (solar) radiation, clear sky
+'Surface net short-wave (solar) radiation, clear sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 11 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
-'Surface net long-wave radiation, clear sky' = {
+#Surface net long-wave (thermal) radiation, clear sky
+'Surface net long-wave (thermal) radiation, clear sky' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 6 ;
@@ -5235,24 +5235,24 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
-'Surface net short-wave radiation' = {
+#Surface net short-wave (solar) radiation
+'Surface net short-wave (solar) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
 	 parameterNumber = 9 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
-'Surface net long-wave radiation' = {
+#Surface net long-wave (thermal) radiation
+'Surface net long-wave (thermal) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 5 ;
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
-'Top net long-wave radiation' = {
+#Top net long-wave (thermal) radiation
+'Top net long-wave (thermal) radiation' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
 	 parameterNumber = 5 ;
diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def
index d44a86f11..157d46980 100644
--- a/definitions/grib2/paramId.def
+++ b/definitions/grib2/paramId.def
@@ -223,7 +223,7 @@
 	 parameterNumber = 20 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 '169' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -231,7 +231,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 '175' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -239,7 +239,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 '178' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -301,7 +301,7 @@
 	 typeOfFirstFixedSurface = 8 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 '210' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -309,7 +309,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 '211' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5235,7 +5235,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 '176' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5243,7 +5243,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 '177' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5251,7 +5251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 '179' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def
index e07aae67b..d205bb264 100644
--- a/definitions/grib2/shortName.def
+++ b/definitions/grib2/shortName.def
@@ -223,7 +223,7 @@
 	 parameterNumber = 20 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'ssrd' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -231,7 +231,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'strd' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -239,7 +239,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'tsr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -301,7 +301,7 @@
 	 typeOfFirstFixedSurface = 8 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'ssrc' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -309,7 +309,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'strc' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5235,7 +5235,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'ssr' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5243,7 +5243,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'str' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5251,7 +5251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'ttr' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def
index 17e5ed6df..aad260155 100644
--- a/definitions/grib2/units.def
+++ b/definitions/grib2/units.def
@@ -223,7 +223,7 @@
 	 parameterNumber = 20 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface short-wave radiation downwards
+#Surface short-wave (solar) radiation downwards
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -231,7 +231,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface long-wave radiation downwards
+#Surface long-wave (thermal) radiation downwards
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -239,7 +239,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net short-wave radiation
+#Top net short-wave (solar) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -301,7 +301,7 @@
 	 typeOfFirstFixedSurface = 8 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net short-wave radiation, clear sky
+#Surface net short-wave (solar) radiation, clear sky
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -309,7 +309,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation, clear sky
+#Surface net long-wave (thermal) radiation, clear sky
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5235,7 +5235,7 @@
 	 parameterCategory = 0 ;
 	 parameterNumber = 1 ;
 	}
-#Surface net short-wave radiation
+#Surface net short-wave (solar) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 4 ;
@@ -5243,7 +5243,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Surface net long-wave radiation
+#Surface net long-wave (thermal) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;
@@ -5251,7 +5251,7 @@
 	 typeOfFirstFixedSurface = 1 ;
 	 typeOfStatisticalProcessing = 1 ;
 	}
-#Top net long-wave radiation
+#Top net long-wave (thermal) radiation
 'J m**-2' = {
 	 discipline = 0 ;
 	 parameterCategory = 5 ;