diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
index efc2a1890..338df3d08 100644
--- a/examples/python/CMakeLists.txt
+++ b/examples/python/CMakeLists.txt
@@ -60,7 +60,7 @@ list( APPEND tests
    get_product_kind
    gts_get_keys
    metar_get_keys
-   ecc-448
+   bufr_ecc-448
 )
 
 # The high level python test requires new features in the unittest
diff --git a/examples/python/ecc-448.py b/examples/python/bufr_ecc-448.py
similarity index 100%
rename from examples/python/ecc-448.py
rename to examples/python/bufr_ecc-448.py
diff --git a/examples/python/ecc-448.sh b/examples/python/bufr_ecc-448.sh
similarity index 90%
rename from examples/python/ecc-448.sh
rename to examples/python/bufr_ecc-448.sh
index e85b8ff04..a75431aef 100755
--- a/examples/python/ecc-448.sh
+++ b/examples/python/bufr_ecc-448.sh
@@ -11,7 +11,7 @@
 . ./include.sh
 
 #Define a common label for all the tmp files
-label="ecc_448_test_p"
+label="bufr_ecc_448_test_p"
 
 #Define tmp file
 fTmp=${label}".tmp.txt"
@@ -23,7 +23,7 @@ REDIRECT=/dev/null
 f=${data_dir}/bufr/syno_1.bufr
 
 #The input ($f) is hardcoded in the example!!!
-$PYTHON $examples_src/ecc-448.py 2> $REDIRECT > $fTmp
+$PYTHON $examples_src/bufr_ecc-448.py 2> $REDIRECT > $fTmp
 
 #TODO: check the output
 grep -q '#6#cloudType->percentConfidence' $fTmp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 3a3cb5453..d69f6d2e6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -25,7 +25,7 @@ list( APPEND test_bins
       optimize_scaling
       optimize_scaling_sh
       grib_ecc-386
-      ecc-517
+      bufr_ecc-517
       bufr_get_element
       sh_ieee64
       ieee
@@ -51,8 +51,8 @@ list( APPEND tests_no_data_reqd
     uerra
     grib_2nd_order_numValues
     julian
-    ecc-359
-    ecc-517
+    bufr_ecc-359
+    bufr_ecc-517
 )
 # These tests do require data downloads
 list( APPEND tests_data_reqd
@@ -75,15 +75,15 @@ list( APPEND tests_data_reqd
     bufr_keys_iter
     bufr_get_element
     bufr_wmo_tables
-    ecc-197
-    ecc-286
-    ecc-288
-    ecc-313
-    ecc-379
-    ecc-393
-    ecc-433
+    bufr_ecc-197
+    bufr_ecc-286
+    bufr_ecc-288
+    bufr_ecc-313
+    bufr_ecc-379
+    bufr_ecc-393
+    bufr_ecc-433
     grib_ecc-490
-    ecc-556
+    bufr_ecc-556
     gts_get
     gts_ls
     gts_compare
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4f28f030b..b26df9fe5 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -63,9 +63,9 @@ TESTS = definitions.sh \
         md5.sh \
         grib_util_set_spec.sh \
         grib_neg_fctime.sh \
-        ecc-197.sh \
-        ecc-286.sh \
-        ecc-288.sh
+        bufr_ecc-197.sh \
+        bufr_ecc-286.sh \
+        bufr_ecc-288.sh
 
 # First download all the necessary data for testing
 # Note: if download fails, no tests will be done
diff --git a/tests/ecc-197.sh b/tests/bufr_ecc-197.sh
similarity index 98%
rename from tests/ecc-197.sh
rename to tests/bufr_ecc-197.sh
index 477e9a959..f7fdf3bb7 100755
--- a/tests/ecc-197.sh
+++ b/tests/bufr_ecc-197.sh
@@ -15,7 +15,7 @@
 # It tests decoding a BUFR file which cannot be done unless
 # we extend the definitions to include extra files
 # ---------------------------------------------------------
-label="ecc-197-test"
+label="bufr_ecc-197-test"
 
 input=${data_dir}/bufr/vos308014_v3_26.bufr
 if [ ! -f $input ]; then
diff --git a/tests/ecc-286.sh b/tests/bufr_ecc-286.sh
similarity index 97%
rename from tests/ecc-286.sh
rename to tests/bufr_ecc-286.sh
index a05daf9e3..c026b18a8 100755
--- a/tests/ecc-286.sh
+++ b/tests/bufr_ecc-286.sh
@@ -15,7 +15,7 @@
 # It tests setting a key which starts with a digit
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="ecc_286_test"
+label="bufr_ecc_286_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.out
diff --git a/tests/ecc-288.sh b/tests/bufr_ecc-288.sh
similarity index 97%
rename from tests/ecc-288.sh
rename to tests/bufr_ecc-288.sh
index a6908b9a8..6ef1b412f 100755
--- a/tests/ecc-288.sh
+++ b/tests/bufr_ecc-288.sh
@@ -15,7 +15,7 @@
 # It tests bufr_compare with a relative tolerance
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="ecc_288_test"
+label="bufr_ecc_288_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.out
diff --git a/tests/ecc-313.sh b/tests/bufr_ecc-313.sh
similarity index 98%
rename from tests/ecc-313.sh
rename to tests/bufr_ecc-313.sh
index 35ae7e5c8..70ee852f6 100755
--- a/tests/ecc-313.sh
+++ b/tests/bufr_ecc-313.sh
@@ -16,7 +16,7 @@
 # Currently we cannot ENCODE with this operator. This test is
 # for DECODING only
 # ---------------------------------------------------------
-label="ecc-313-test"
+label="bufr_ecc-313-test"
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.txt
 tempRef=temp.${label}.ref
diff --git a/tests/ecc-359.sh b/tests/bufr_ecc-359.sh
similarity index 96%
rename from tests/ecc-359.sh
rename to tests/bufr_ecc-359.sh
index 0899e37a3..0679fc69d 100755
--- a/tests/ecc-359.sh
+++ b/tests/bufr_ecc-359.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-359.
 # It tests calling 'pack=1' and nothing else!
 # ---------------------------------------------------------
-label="ecc_359_test"
+label="bufr_ecc_359_test"
 
 tempOut=temp.${label}.out
 BufrFile=$ECCODES_SAMPLES_PATH/BUFR4.tmpl
diff --git a/tests/ecc-379.sh b/tests/bufr_ecc-379.sh
similarity index 98%
rename from tests/ecc-379.sh
rename to tests/bufr_ecc-379.sh
index d30db8472..a153fc4ab 100755
--- a/tests/ecc-379.sh
+++ b/tests/bufr_ecc-379.sh
@@ -15,7 +15,7 @@
 # BUFR encoding failing when value out of range
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="ecc_379_test"
+label="bufr_ecc_379_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.bufr
diff --git a/tests/ecc-393.sh b/tests/bufr_ecc-393.sh
similarity index 98%
rename from tests/ecc-393.sh
rename to tests/bufr_ecc-393.sh
index aedee5549..68c00fd09 100755
--- a/tests/ecc-393.sh
+++ b/tests/bufr_ecc-393.sh
@@ -15,7 +15,7 @@
 # It tests bufr_compare with a blacklist with rank
 # ---------------------------------------------------------
 cd ${data_dir}/bufr
-label="ecc_393_test"
+label="bufr_ecc_393_test"
 
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.bufr
diff --git a/tests/ecc-433.sh b/tests/bufr_ecc-433.sh
similarity index 98%
rename from tests/ecc-433.sh
rename to tests/bufr_ecc-433.sh
index 17625c772..701df2976 100755
--- a/tests/ecc-433.sh
+++ b/tests/bufr_ecc-433.sh
@@ -14,7 +14,7 @@
 # This is the test for the JIRA issue ECC-433.
 # It tests decoding a BUFR file which uses the operator 206YYY.
 # ---------------------------------------------------------
-label="ecc-433-test"
+label="bufr_ecc-433-test"
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.txt
 tempRef=temp.${label}.ref
diff --git a/tests/ecc-517.c b/tests/bufr_ecc-517.c
similarity index 100%
rename from tests/ecc-517.c
rename to tests/bufr_ecc-517.c
diff --git a/tests/ecc-517.sh b/tests/bufr_ecc-517.sh
similarity index 95%
rename from tests/ecc-517.sh
rename to tests/bufr_ecc-517.sh
index e72a5847c..89b8006fd 100755
--- a/tests/ecc-517.sh
+++ b/tests/bufr_ecc-517.sh
@@ -14,7 +14,7 @@ OUTPUT=temp.ecc-517.bufr
 TEMP=temp.ecc-517.txt
 
 # Run program to create output BUFR file with replication
-${test_dir}/ecc-517 $OUTPUT
+${test_dir}/bufr_ecc-517 $OUTPUT
 
 # Check file is OK and has the expected number of descriptors
 ${tools_dir}/bufr_dump -jf $OUTPUT > $TEMP
diff --git a/tests/ecc-556.sh b/tests/bufr_ecc-556.sh
similarity index 97%
rename from tests/ecc-556.sh
rename to tests/bufr_ecc-556.sh
index e63c111f3..b4fb12d69 100755
--- a/tests/ecc-556.sh
+++ b/tests/bufr_ecc-556.sh
@@ -15,7 +15,7 @@ set -u
 # This is the test for the JIRA issue ECC-556.
 # It tests typicalDate for BUFR edition 4
 # ---------------------------------------------------------
-label="ecc-556-test"
+label="bufr_ecc-556-test"
 
 # In this BUFR message the typicalYear should have been encoded
 # as 2012 but it is actually 12!
diff --git a/tests/grib_ecc-386.sh b/tests/grib_ecc-386.sh
index 81bb8fa70..a312ffb56 100755
--- a/tests/grib_ecc-386.sh
+++ b/tests/grib_ecc-386.sh
@@ -11,4 +11,4 @@
 . ./include.sh
 
 input=${data_dir}/test_file.grib2
-exec ${test_dir}/ecc-386 $input
+exec ${test_dir}/grib_ecc-386 $input
diff --git a/tests/grib_ecc-490.sh b/tests/grib_ecc-490.sh
index afbb2d885..17a422569 100755
--- a/tests/grib_ecc-490.sh
+++ b/tests/grib_ecc-490.sh
@@ -14,7 +14,7 @@ set -u
 # This is the test for the JIRA issue ECC-490.
 # It tests changing GRIB templates
 # ---------------------------------------------------------
-label="ecc-490-test"
+label="grib_ecc-490-test"
 tempSample=temp.${label}.sample.grib
 tempRules=temp.${label}.filter
 tempOut=temp.${label}.grib