diff --git a/examples/C/bufr_attributes.sh b/examples/C/bufr_attributes.sh
index a35033b60..f4150f680 100755
--- a/examples/C/bufr_attributes.sh
+++ b/examples/C/bufr_attributes.sh
@@ -12,7 +12,7 @@
 
 
 #Define a common label for all the tmp files
-label="bufr_attributes_test_c"
+label="examples_c_bufr_attributes"
 
 #Define tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_clone.sh b/examples/C/bufr_clone.sh
index 96a5c7eaa..881449afd 100755
--- a/examples/C/bufr_clone.sh
+++ b/examples/C/bufr_clone.sh
@@ -10,7 +10,7 @@
 . ./include.ctest.sh
 
 # Define a common label for all the tmp files
-label="bufr_clone_test_c"
+label="examples_c_bufr_clone"
 
 fBufrTmp1=${label}.cloned1.bufr
 fBufrTmp2=${label}.cloned2.bufr
diff --git a/examples/C/bufr_copy_data.sh b/examples/C/bufr_copy_data.sh
index 1fa49a4fe..25f5099ba 100755
--- a/examples/C/bufr_copy_data.sh
+++ b/examples/C/bufr_copy_data.sh
@@ -10,7 +10,7 @@
 . ./include.ctest.sh
 
 #Define a common label for all the tmp files
-label="bufr_copy_data_c"
+label="examples_c_bufr_copy_data"
 
 TEMP_BUFR=$label.out.bufr
 TEMP_TEXT=$label.out.txt
diff --git a/examples/C/bufr_expanded.sh b/examples/C/bufr_expanded.sh
index bfedf30f2..5ceb41ede 100755
--- a/examples/C/bufr_expanded.sh
+++ b/examples/C/bufr_expanded.sh
@@ -10,7 +10,7 @@
 . ./include.ctest.sh
 
 #Define a common label for all the tmp files
-label="bufr_expanded_test_c"
+label="examples_c_bufr_expanded"
 
 #Prepare tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_get_keys.sh b/examples/C/bufr_get_keys.sh
index 677397381..e34c44b92 100755
--- a/examples/C/bufr_get_keys.sh
+++ b/examples/C/bufr_get_keys.sh
@@ -12,7 +12,7 @@
 
 
 #Define a common label for all the tmp files
-label="bufr_get_keys_test_c"
+label="examples_c_bufr_get_keys"
 
 #Define tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_get_string_array.sh b/examples/C/bufr_get_string_array.sh
index 1fbed170b..583e12d18 100755
--- a/examples/C/bufr_get_string_array.sh
+++ b/examples/C/bufr_get_string_array.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 # Define a common label for all the tmp files
-label="bufr_get_string_array_test_c"
+label="examples_c_bufr_get_string_array"
 
 # Define tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_keys_iterator.sh b/examples/C/bufr_keys_iterator.sh
index ba73558bd..1bc56ef9a 100755
--- a/examples/C/bufr_keys_iterator.sh
+++ b/examples/C/bufr_keys_iterator.sh
@@ -8,12 +8,11 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
 
-set -x
 . ./include.ctest.sh
 
 
 # Define a common label for all the tmp files
-label="bufr_keys_iterator_test_c"
+label="examples_c_bufr_keys_iterator"
 
 # Define tmp file
 fTmp=${label}".tmp.txt"
diff --git a/examples/C/bufr_missing.sh b/examples/C/bufr_missing.sh
index 0a0c70a51..5ba14d920 100755
--- a/examples/C/bufr_missing.sh
+++ b/examples/C/bufr_missing.sh
@@ -12,7 +12,7 @@
 
 
 #Define a common label for all the tmp files
-label="bufr_missing_test_c"
+label="examples_c_bufr_missing"
 
 #Define tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_read_header.sh b/examples/C/bufr_read_header.sh
index 37087aa33..620d7668f 100755
--- a/examples/C/bufr_read_header.sh
+++ b/examples/C/bufr_read_header.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 #Define a common label for all the tmp files
-label="bufr_read_header_test_c"
+label="examples_c_bufr_read_header"
 
 #Prepare tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_read_scatterometer.sh b/examples/C/bufr_read_scatterometer.sh
index 197e9e6fd..66e5bdbfc 100755
--- a/examples/C/bufr_read_scatterometer.sh
+++ b/examples/C/bufr_read_scatterometer.sh
@@ -12,7 +12,7 @@
 
 
 # Define a common label for all the tmp files
-label="bufr_read_scatterometer_c"
+label="examples_c_bufr_read_scatterometer"
 
 # Define tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_read_synop.sh b/examples/C/bufr_read_synop.sh
index c56cab752..c7e953b08 100755
--- a/examples/C/bufr_read_synop.sh
+++ b/examples/C/bufr_read_synop.sh
@@ -10,9 +10,8 @@
 
 . ./include.ctest.sh
 
-
 #Define a common label for all the tmp files
-label="bufr_read_synop_test_c"
+label="examples_c_bufr_read_synop_test"
 
 #Define tmp file
 fTmp=${label}".tmp.txt"
diff --git a/examples/C/bufr_read_temp.sh b/examples/C/bufr_read_temp.sh
index 9640ae3de..de582841e 100755
--- a/examples/C/bufr_read_temp.sh
+++ b/examples/C/bufr_read_temp.sh
@@ -10,9 +10,8 @@
 
 . ./include.ctest.sh
 
-
 #Define a common label for all the tmp files
-label="bufr_read_temp_c"
+label="examples_c_bufr_read_temp"
 
 #Define tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/bufr_read_tempf.sh b/examples/C/bufr_read_tempf.sh
index cc4131e7f..34c862f0b 100755
--- a/examples/C/bufr_read_tempf.sh
+++ b/examples/C/bufr_read_tempf.sh
@@ -10,9 +10,8 @@
 
 . ./include.ctest.sh
 
-
 #Define a common label for all the tmp files
-label="bufr_read_tempf_c"
+label="examples_c_bufr_read_tempf"
 tempOut=temp.${label}.txt
 tempRef=temp.${label}.ref
 rm -f $tempRef $tempOut
diff --git a/examples/C/bufr_set_keys.sh b/examples/C/bufr_set_keys.sh
index 3131463cf..861eae8dd 100755
--- a/examples/C/bufr_set_keys.sh
+++ b/examples/C/bufr_set_keys.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 # Define a common label for all the tmp files
-label="bufr_set_keys_test_c"
+label="examples_c_bufr_set_keys"
 REDIRECT=/dev/null
 fBufrTmp=${label}.tmp.bufr
 rm -f $fBufrTmp
diff --git a/examples/C/bufr_subset.sh b/examples/C/bufr_subset.sh
index c42890296..cbd7a2b0a 100755
--- a/examples/C/bufr_subset.sh
+++ b/examples/C/bufr_subset.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 #Define a common label for all the tmp files
-label="bufr_subset_test_c"
+label="examples_c_bufr_subset"
 
 #Prepare tmp file
 fTmp=${label}.tmp.txt
diff --git a/examples/C/get_product_kind.sh b/examples/C/get_product_kind.sh
index 609274efc..65659310d 100755
--- a/examples/C/get_product_kind.sh
+++ b/examples/C/get_product_kind.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="get_product_kind_c"
+label="examples_c_get_product_kind"
 fTmp=${label}.tmp
 fOut=${label}.tmp.out
 fRef=${label}.tmp.ref
diff --git a/examples/C/get_product_kind_samples.sh b/examples/C/get_product_kind_samples.sh
index 7aaecb8c7..9f1cf83ab 100755
--- a/examples/C/get_product_kind_samples.sh
+++ b/examples/C/get_product_kind_samples.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="get_product_kind_samples_c"
+label="examples_c_get_product_kind_samples"
 fTmp=${label}.tmp
 
 sample_grib1=${ECCODES_SAMPLES_PATH}/GRIB1.tmpl
diff --git a/examples/C/grib_index.sh b/examples/C/grib_index.sh
index 06244169e..b8322fcd5 100755
--- a/examples/C/grib_index.sh
+++ b/examples/C/grib_index.sh
@@ -9,7 +9,7 @@
 
 . ./include.ctest.sh
 
-label="grib_index_c"
+label="examples_c_grib_index"
 tempIndex=temp.$label.idx
 tempText=temp.$label.txt
 
diff --git a/examples/C/grib_mars_param.sh b/examples/C/grib_mars_param.sh
index 483cf184b..ae1fc2d58 100755
--- a/examples/C/grib_mars_param.sh
+++ b/examples/C/grib_mars_param.sh
@@ -10,7 +10,7 @@
 
 . ./include.ctest.sh
 
-label="grib_mars_param_c"
+label="examples_c_grib_mars_param"
 fTmp=${label}.tmp
 fOut=${label}.tmp.out
 fRef=${label}.tmp.ref
diff --git a/examples/C/grib_multi_write.sh b/examples/C/grib_multi_write.sh
index 73942c663..0b5e11804 100755
--- a/examples/C/grib_multi_write.sh
+++ b/examples/C/grib_multi_write.sh
@@ -9,7 +9,7 @@
 
 . ./include.ctest.sh
 
-label="grib_multi_write_c"
+label="examples_c_grib_multi_write"
 tempGrib=temp.$label.grib
 tempText=temp.$label.txt
 
diff --git a/examples/C/grib_nearest.sh b/examples/C/grib_nearest.sh
index 114a01876..f827f7931 100755
--- a/examples/C/grib_nearest.sh
+++ b/examples/C/grib_nearest.sh
@@ -15,7 +15,7 @@ if [ $HAVE_GEOGRAPHY -eq 0 ]; then
     exit 0
 fi
 
-label="grib_nearest_c"
+label="examples_c_grib_nearest"
 tempTxt=temp.$label.txt
 tempRef=temp.$label.ref
 
diff --git a/examples/C/grib_nearest_multiple.sh b/examples/C/grib_nearest_multiple.sh
index 0d06f0a5b..de273454f 100755
--- a/examples/C/grib_nearest_multiple.sh
+++ b/examples/C/grib_nearest_multiple.sh
@@ -14,7 +14,7 @@ if [ $HAVE_GEOGRAPHY -eq 0 ]; then
     exit 0
 fi
 
-label="grib_nearest_multiple_c"
+label="examples_c_grib_nearest_multiple"
 temp1=$label.temp1.$$
 temp2=$label.temp2.$$
 tempRef=$label.ref.$$
diff --git a/examples/C/grib_values_check.sh b/examples/C/grib_values_check.sh
index 943028848..1f9d8d1d6 100755
--- a/examples/C/grib_values_check.sh
+++ b/examples/C/grib_values_check.sh
@@ -11,7 +11,7 @@
 . ./include.ctest.sh
 
 # Define a common label for all the tmp files
-label="grib_values_check_c"
+label="examples_c_grib_values_check"
 tempErr=${label}.tmp.err
 tempRef=${label}.tmp.ref