diff --git a/.gitignore b/.gitignore
index 5f51c49b3..1041aefbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,43 +129,43 @@ examples/C/c_grib_set_pv
 examples/C/c_values_check
 examples/C/*.sh.log
 examples/C/*.sh.trs
-examples/F90/f_bufr_expanded
-examples/F90/f_bufr_read_synop
-examples/F90/f_bufr_read_temp
-examples/F90/f_bufr_attributes
-examples/F90/f_bufr_set_keys
-examples/F90/f_bufr_get_keys
-examples/F90/f_bufr_keys_iterator
-examples/F90/f_bufr_subset
-examples/F90/f_bufr_clone
-examples/F90/f_bufr_read_header
-examples/F90/f_bufr_read_scatterometer
-examples/F90/f_grib_clone
-examples/F90/f_copy_message
-examples/F90/f_copy_namespace
-examples/F90/f_count_messages
-examples/F90/f_grib_get_keys
-examples/F90/f_get_data
-examples/F90/f_get_product_kind
-examples/F90/f_get_pl
-examples/F90/f_get_pv
-examples/F90/f_get_set_uuid
-examples/F90/f_grib_index
-examples/F90/f_grib_keys_iterator
-examples/F90/f_grib_multi
-examples/F90/f_grib_multi_write
-examples/F90/f_grib_nearest
-examples/F90/f_new_from_file
-examples/F90/f_grib_precision
-examples/F90/f_grib_print_data
-examples/F90/f_read_from_file
-examples/F90/f_read_message
-examples/F90/f_samples
-examples/F90/f_grib_set_keys
-examples/F90/f_grib_set_bitmap
-examples/F90/f_set_gvc
-examples/F90/f_set_missing
-examples/F90/f_grib_set_pv
+examples/F90/eccodes_f_bufr_expanded
+examples/F90/eccodes_f_bufr_read_synop
+examples/F90/eccodes_f_bufr_read_temp
+examples/F90/eccodes_f_bufr_attributes
+examples/F90/eccodes_f_bufr_set_keys
+examples/F90/eccodes_f_bufr_get_keys
+examples/F90/eccodes_f_bufr_keys_iterator
+examples/F90/eccodes_f_bufr_subset
+examples/F90/eccodes_f_bufr_clone
+examples/F90/eccodes_f_bufr_read_header
+examples/F90/eccodes_f_bufr_read_scatterometer
+examples/F90/eccodes_f_grib_clone
+examples/F90/eccodes_f_copy_message
+examples/F90/eccodes_f_copy_namespace
+examples/F90/eccodes_f_count_messages
+examples/F90/eccodes_f_grib_get_keys
+examples/F90/eccodes_f_get_data
+examples/F90/eccodes_f_get_product_kind
+examples/F90/eccodes_f_get_pl
+examples/F90/eccodes_f_get_pv
+examples/F90/eccodes_f_get_set_uuid
+examples/F90/eccodes_f_grib_index
+examples/F90/eccodes_f_grib_keys_iterator
+examples/F90/eccodes_f_grib_multi
+examples/F90/eccodes_f_grib_multi_write
+examples/F90/eccodes_f_grib_nearest
+examples/F90/eccodes_f_new_from_file
+examples/F90/eccodes_f_grib_precision
+examples/F90/eccodes_f_grib_print_data
+examples/F90/eccodes_f_read_from_file
+examples/F90/eccodes_f_read_message
+examples/F90/eccodes_f_samples
+examples/F90/eccodes_f_grib_set_keys
+examples/F90/eccodes_f_grib_set_bitmap
+examples/F90/eccodes_f_set_gvc
+examples/F90/eccodes_f_set_missing
+examples/F90/eccodes_f_grib_set_pv
 examples/F90/*.sh.log
 examples/F90/*.sh.trs
 examples/F90/test-suite.log
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 3ec754a61..7bee0d529 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -15,7 +15,7 @@ endif()
 
 
 # Download all data files doing md5 check on each
-ecbuild_get_test_multidata( TARGET get_gribs
+ecbuild_get_test_multidata( TARGET eccodes_get_gribs
                             NAMES ${files_to_download} )
 
 # Copy other files - e.g. reference data, text files etc from the source data dir
diff --git a/data/bufr/CMakeLists.txt b/data/bufr/CMakeLists.txt
index 5c225130e..5c08ab34b 100644
--- a/data/bufr/CMakeLists.txt
+++ b/data/bufr/CMakeLists.txt
@@ -13,7 +13,7 @@ STRING(REGEX REPLACE "\n" ";" bufr_refs_to_download "${bufr_refs_to_download}")
 
 
 ecbuild_get_test_multidata(
-     TARGET get_bufrs
+     TARGET eccodes_get_bufrs
      NOCHECK
      NAMES ${bufr_files_to_download} ${bufr_refs_to_download}
 )
diff --git a/data/gts/CMakeLists.txt b/data/gts/CMakeLists.txt
index c086fb090..01e9ca5ab 100644
--- a/data/gts/CMakeLists.txt
+++ b/data/gts/CMakeLists.txt
@@ -10,7 +10,7 @@ STRING(REGEX REPLACE "\n" ";" gts_refs_to_download "${gts_refs_to_download}")
 
 
 ecbuild_get_test_multidata(
-     TARGET get_gts
+     TARGET eccodes_get_gts
      NOCHECK
      NAMES ${gts_files_to_download} ${gts_refs_to_download}
 )
diff --git a/data/metar/CMakeLists.txt b/data/metar/CMakeLists.txt
index 28128a8db..cf06d0b2f 100644
--- a/data/metar/CMakeLists.txt
+++ b/data/metar/CMakeLists.txt
@@ -13,7 +13,7 @@ STRING(REGEX REPLACE "\n" ";" metar_refs_to_download "${metar_refs_to_download}"
 
 
 ecbuild_get_test_multidata(
-     TARGET get_metars
+     TARGET eccodes_get_metars
      NOCHECK
      NAMES ${metar_files_to_download} ${metar_refs_to_download}
 )
diff --git a/data/tigge/CMakeLists.txt b/data/tigge/CMakeLists.txt
index 6c6df6b4b..d39aa890d 100644
--- a/data/tigge/CMakeLists.txt
+++ b/data/tigge/CMakeLists.txt
@@ -5,5 +5,5 @@ file(READ "tigge_data_files.txt" tigge_files_to_download)
 string(REGEX REPLACE "\n" ";" tigge_files_to_download "${tigge_files_to_download}")
 
 # Download all data files doing md5 check on each
-ecbuild_get_test_multidata( TARGET get_tigge_gribs
+ecbuild_get_test_multidata( TARGET eccodes_get_tigge_gribs
                             NAMES ${tigge_files_to_download} )
diff --git a/examples/C/CMakeLists.txt b/examples/C/CMakeLists.txt
index 9ea8351a7..db7ea45cc 100644
--- a/examples/C/CMakeLists.txt
+++ b/examples/C/CMakeLists.txt
@@ -90,17 +90,17 @@ list( APPEND tests
    get_product_kind
 )
 foreach( test ${tests} )
-    ecbuild_add_test( TARGET c_${test}
+    ecbuild_add_test( TARGET eccodes_c_${test}
                   TYPE       SCRIPT
                   COMMAND    ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
-                  TEST_DEPENDS get_gribs get_bufrs
+                  TEST_DEPENDS eccodes_get_gribs eccodes_get_bufrs
     )
 endforeach()
 
 
 #############################################
 # Tests with no script
-ecbuild_add_test( TARGET    c_new_sample
+ecbuild_add_test( TARGET    eccodes_c_new_sample
                   SOURCES   new_sample.c
                   LIBS      eccodes
                   ARGS      "out.grib"
diff --git a/examples/F90/CMakeLists.txt b/examples/F90/CMakeLists.txt
index fdf5aec34..6d5b1597f 100644
--- a/examples/F90/CMakeLists.txt
+++ b/examples/F90/CMakeLists.txt
@@ -46,13 +46,13 @@ list( APPEND tests
 
 foreach( tool ${tests} )
 
-    ecbuild_add_test( TARGET f_${tool}
+    ecbuild_add_test( TARGET eccodes_f_${tool}
                       SOURCES   ${tool}.f90
                       LINKER_LANGUAGE Fortran
                       LIBS      eccodes_f90 eccodes
                       CONDITION HAVE_FORTRAN
                       COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${tool}.sh
-                      TEST_DEPENDS get_gribs get_bufrs
+                      TEST_DEPENDS eccodes_get_gribs eccodes_get_bufrs
     )
 endforeach()
 
@@ -82,7 +82,7 @@ ecbuild_add_executable( TARGET    f_set_gvc
 
 
 # # Note extra dependency
-# ecbuild_add_test( TARGET f_set_test
+# ecbuild_add_test( TARGET eccodes_f_set_test
 #                   TYPE SCRIPT
 #                   DEPENDS set_gvc set
 #                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/set.sh
diff --git a/examples/F90/Makefile.am b/examples/F90/Makefile.am
index 3033277ca..968d66515 100644
--- a/examples/F90/Makefile.am
+++ b/examples/F90/Makefile.am
@@ -8,51 +8,81 @@ TESTS = copy_message.sh grib_get_keys.sh get_data.sh get_pl.sh get_pv.sh grib_ke
         bufr_expanded.sh bufr_get_keys.sh bufr_read_header.sh bufr_read_synop.sh \
         bufr_set_keys.sh bufr_keys_iterator.sh bufr_subset.sh get_product_kind.sh bufr_read_temp.sh bufr_read_scatterometer.sh
 
-noinst_PROGRAMS  = f_grib_index f_copy_message f_grib_get_keys f_get_data f_get_pl f_get_pv f_grib_keys_iterator \
-                   f_grib_multi_write f_grib_multi f_grib_nearest f_grib_precision f_grib_print_data f_grib_set_keys \
-                   f_grib_set_bitmap f_set_missing f_grib_set_pv f_samples f_count_messages f_read_message \
-                   f_read_from_file f_new_from_file f_copy_namespace f_get_set_uuid f_set_gvc \
-                   f_grib_clone f_bufr_clone f_bufr_expanded f_bufr_get_keys f_bufr_read_header \
-                   f_bufr_read_synop f_bufr_set_keys f_bufr_keys_iterator f_bufr_subset f_bufr_attributes \
-                   f_get_product_kind f_bufr_read_temp f_bufr_read_scatterometer
+noinst_PROGRAMS  = eccodes_f_grib_index \
+                   eccodes_f_copy_message \
+                   eccodes_f_grib_get_keys \
+                   eccodes_f_get_data \
+                   eccodes_f_get_pl \
+                   eccodes_f_get_pv \
+                   eccodes_f_grib_keys_iterator \
+                   eccodes_f_grib_multi_write \
+                   eccodes_f_grib_multi \
+                   eccodes_f_grib_nearest \
+                   eccodes_f_grib_precision \
+                   eccodes_f_grib_print_data \
+                   eccodes_f_grib_set_keys \
+                   eccodes_f_grib_set_bitmap \
+                   eccodes_f_set_missing \
+                   eccodes_f_grib_set_pv \
+                   eccodes_f_samples \
+                   eccodes_f_count_messages \
+                   eccodes_f_read_message \
+                   eccodes_f_read_from_file \
+                   eccodes_f_new_from_file \
+                   eccodes_f_copy_namespace \
+                   eccodes_f_get_set_uuid \
+                   eccodes_f_set_gvc \
+                   eccodes_f_grib_clone \
+                   eccodes_f_bufr_clone \
+                   eccodes_f_bufr_expanded \
+                   eccodes_f_bufr_get_keys \
+                   eccodes_f_bufr_read_header \
+                   eccodes_f_bufr_read_synop \
+                   eccodes_f_bufr_set_keys \
+                   eccodes_f_bufr_keys_iterator \
+                   eccodes_f_bufr_subset \
+                   eccodes_f_bufr_attributes \
+                   eccodes_f_get_product_kind \
+                   eccodes_f_bufr_read_temp \
+                   eccodes_f_bufr_read_scatterometer
 
-f_grib_index_SOURCES=grib_index.f90
-f_copy_message_SOURCES=copy_message.f90
-f_grib_get_keys_SOURCES=grib_get_keys.f90
-f_get_data_SOURCES=get_data.f90
-f_get_pl_SOURCES=get_pl.f90
-f_get_pv_SOURCES=get_pv.f90
-f_grib_keys_iterator_SOURCES=grib_keys_iterator.f90
-f_grib_multi_write_SOURCES=grib_multi_write.f90
-f_grib_multi_SOURCES=grib_multi.f90
-f_grib_nearest_SOURCES=grib_nearest.f90
-f_grib_precision_SOURCES=grib_precision.f90
-f_grib_print_data_SOURCES=grib_print_data.f90
-f_grib_set_keys_SOURCES=grib_set_keys.f90
-f_grib_set_bitmap_SOURCES=grib_set_bitmap.f90
-f_set_missing_SOURCES=set_missing.f90
-f_grib_set_pv_SOURCES=grib_set_pv.f90
-f_samples_SOURCES=samples.f90
-f_count_messages_SOURCES=count_messages.f90
-f_read_message_SOURCES=read_message.f90
-f_read_from_file_SOURCES=read_from_file.f90
-f_new_from_file_SOURCES=new_from_file.f90
-f_copy_namespace_SOURCES=copy_namespace.f90
-f_get_set_uuid_SOURCES=get_set_uuid.f90
-f_set_gvc_SOURCES=set_gvc.f90
-f_grib_clone_SOURCES=grib_clone.f90
-f_bufr_attributes_SOURCES=bufr_attributes.f90
-f_bufr_clone_SOURCES=bufr_clone.f90
-f_bufr_expanded_SOURCES=bufr_expanded.f90
-f_bufr_get_keys_SOURCES=bufr_get_keys.f90
-f_bufr_keys_iterator_SOURCES=bufr_keys_iterator.f90
-f_bufr_read_header_SOURCES=bufr_read_header.f90
-f_bufr_read_scatterometer_SOURCES=bufr_read_scatterometer.f90
-f_bufr_read_synop_SOURCES=bufr_read_synop.f90
-f_bufr_read_temp_SOURCES=bufr_read_temp.f90
-f_bufr_set_keys_SOURCES=bufr_set_keys.f90
-f_bufr_subset_SOURCES=bufr_subset.f90
-f_get_product_kind_SOURCES=get_product_kind.f90
+eccodes_f_grib_index_SOURCES=grib_index.f90
+eccodes_f_copy_message_SOURCES=copy_message.f90
+eccodes_f_grib_get_keys_SOURCES=grib_get_keys.f90
+eccodes_f_get_data_SOURCES=get_data.f90
+eccodes_f_get_pl_SOURCES=get_pl.f90
+eccodes_f_get_pv_SOURCES=get_pv.f90
+eccodes_f_grib_keys_iterator_SOURCES=grib_keys_iterator.f90
+eccodes_f_grib_multi_write_SOURCES=grib_multi_write.f90
+eccodes_f_grib_multi_SOURCES=grib_multi.f90
+eccodes_f_grib_nearest_SOURCES=grib_nearest.f90
+eccodes_f_grib_precision_SOURCES=grib_precision.f90
+eccodes_f_grib_print_data_SOURCES=grib_print_data.f90
+eccodes_f_grib_set_keys_SOURCES=grib_set_keys.f90
+eccodes_f_grib_set_bitmap_SOURCES=grib_set_bitmap.f90
+eccodes_f_set_missing_SOURCES=set_missing.f90
+eccodes_f_grib_set_pv_SOURCES=grib_set_pv.f90
+eccodes_f_samples_SOURCES=samples.f90
+eccodes_f_count_messages_SOURCES=count_messages.f90
+eccodes_f_read_message_SOURCES=read_message.f90
+eccodes_f_read_from_file_SOURCES=read_from_file.f90
+eccodes_f_new_from_file_SOURCES=new_from_file.f90
+eccodes_f_copy_namespace_SOURCES=copy_namespace.f90
+eccodes_f_get_set_uuid_SOURCES=get_set_uuid.f90
+eccodes_f_set_gvc_SOURCES=set_gvc.f90
+eccodes_f_grib_clone_SOURCES=grib_clone.f90
+eccodes_f_bufr_attributes_SOURCES=bufr_attributes.f90
+eccodes_f_bufr_clone_SOURCES=bufr_clone.f90
+eccodes_f_bufr_expanded_SOURCES=bufr_expanded.f90
+eccodes_f_bufr_get_keys_SOURCES=bufr_get_keys.f90
+eccodes_f_bufr_keys_iterator_SOURCES=bufr_keys_iterator.f90
+eccodes_f_bufr_read_header_SOURCES=bufr_read_header.f90
+eccodes_f_bufr_read_scatterometer_SOURCES=bufr_read_scatterometer.f90
+eccodes_f_bufr_read_synop_SOURCES=bufr_read_synop.f90
+eccodes_f_bufr_read_temp_SOURCES=bufr_read_temp.f90
+eccodes_f_bufr_set_keys_SOURCES=bufr_set_keys.f90
+eccodes_f_bufr_subset_SOURCES=bufr_subset.f90
+eccodes_f_get_product_kind_SOURCES=get_product_kind.f90
 
 INCLUDES =  -I$(top_builddir)/src
 
diff --git a/examples/F90/bufr_attributes.sh b/examples/F90/bufr_attributes.sh
index 96132e563..8c8d226ff 100755
--- a/examples/F90/bufr_attributes.sh
+++ b/examples/F90/bufr_attributes.sh
@@ -24,7 +24,7 @@ rm -f ${fTmp} | true
 REDIRECT=/dev/null
 
 #Write the values into a file and compare with reference
-${examples_dir}/f_bufr_attributes #2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_attributes #2> $REDIRECT > $fTmp
 
 #TODO: check the results
 
diff --git a/examples/F90/bufr_clone.sh b/examples/F90/bufr_clone.sh
index ef04be117..360b48c62 100755
--- a/examples/F90/bufr_clone.sh
+++ b/examples/F90/bufr_clone.sh
@@ -22,11 +22,11 @@ f=${data_dir}/bufr/syno_multi.bufr
 REDIRECT=/dev/null
 
 #The input ($f) and output ($fBufrTmp) are hardcoded in the f90 example!!! 
-${examples_dir}/f_bufr_clone >$REDIRECT 2> $REDIRECT 
+${examples_dir}/eccodes_f_bufr_clone >$REDIRECT 2> $REDIRECT
 
 #Compare clone to the original
 set +e
-${tools_dir}/bufr_compare $f $fBufrTmp >$REDIRECT 2> $REDIRECT 
+${tools_dir}/bufr_compare $f $fBufrTmp >$REDIRECT 2> $REDIRECT
 
 #Check if clone is different
 if [ $? -eq 0 ]; then
diff --git a/examples/F90/bufr_expanded.sh b/examples/F90/bufr_expanded.sh
index 1617d0361..21cfedfb8 100755
--- a/examples/F90/bufr_expanded.sh
+++ b/examples/F90/bufr_expanded.sh
@@ -27,7 +27,7 @@ REDIRECT=/dev/null
 #hardcoded in the example
 
 #Write the values into a file
-${examples_dir}/f_bufr_expanded > $fTmp 2> $REDIRECT 
+${examples_dir}/eccodes_f_bufr_expanded > $fTmp 2> $REDIRECT
 
 #TODO: add a better check. It could be compared against the bufrdc
 # references.
diff --git a/examples/F90/bufr_get_keys.sh b/examples/F90/bufr_get_keys.sh
index 34d2f0f7f..f8de95416 100755
--- a/examples/F90/bufr_get_keys.sh
+++ b/examples/F90/bufr_get_keys.sh
@@ -24,7 +24,7 @@ rm -f ${fTmp} | true
 REDIRECT=/dev/null
 
 #Write the values into a file and compare with reference
-${examples_dir}/f_bufr_get_keys 2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_get_keys 2> $REDIRECT > $fTmp
 
 #TODO: check the results
 
diff --git a/examples/F90/bufr_keys_iterator.sh b/examples/F90/bufr_keys_iterator.sh
index d86f77322..33c167ed0 100755
--- a/examples/F90/bufr_keys_iterator.sh
+++ b/examples/F90/bufr_keys_iterator.sh
@@ -22,7 +22,7 @@ REDIRECT=/dev/null
 f=${data_dir}/bufr/syno_1.bufr
 
 #The input ($f) is hardcoded in the f90 example!!!
-${examples_dir}/f_bufr_keys_iterator 2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_keys_iterator 2> $REDIRECT > $fTmp
 
 #TODO: check the output
 
diff --git a/examples/F90/bufr_read_header.sh b/examples/F90/bufr_read_header.sh
index b539011a3..43e95d905 100755
--- a/examples/F90/bufr_read_header.sh
+++ b/examples/F90/bufr_read_header.sh
@@ -27,7 +27,7 @@ fRef=${f}.header.ref
 REDIRECT=/dev/null
 
 #Write the values into a file and compare with reference
-${examples_dir}/f_bufr_read_header  $f 2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_read_header  $f 2> $REDIRECT > $fTmp
 
 #We compare output to the reference by ignoring the whitespaces 
 diff -w $fRef $fTmp >$REDIRECT 2> $REDIRECT
diff --git a/examples/F90/bufr_read_scatterometer.sh b/examples/F90/bufr_read_scatterometer.sh
index 901ec3ec1..edc743975 100755
--- a/examples/F90/bufr_read_scatterometer.sh
+++ b/examples/F90/bufr_read_scatterometer.sh
@@ -25,7 +25,7 @@ rm -f $fTmp | true
 REDIRECT=/dev/null
 
 #Write the key values into a file
-${examples_dir}/f_bufr_read_scatterometer 2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_read_scatterometer 2> $REDIRECT > $fTmp
 
 # check the results
 
diff --git a/examples/F90/bufr_read_synop.sh b/examples/F90/bufr_read_synop.sh
index 68cbcc322..329da6b48 100755
--- a/examples/F90/bufr_read_synop.sh
+++ b/examples/F90/bufr_read_synop.sh
@@ -24,7 +24,7 @@ rm -f $fTmp | true
 REDIRECT=/dev/null
 
 #Write the values into a file and compare with reference
-${examples_dir}/f_bufr_read_synop #2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_read_synop #2> $REDIRECT > $fTmp
 
 #TODO: check the output
 
diff --git a/examples/F90/bufr_read_temp.sh b/examples/F90/bufr_read_temp.sh
index 680126396..ec84eccf7 100755
--- a/examples/F90/bufr_read_temp.sh
+++ b/examples/F90/bufr_read_temp.sh
@@ -24,7 +24,7 @@ rm -f $fTmp | true
 REDIRECT=/dev/null
 
 #Write the key values into a file
-${examples_dir}/f_bufr_read_temp 2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_read_temp 2> $REDIRECT > $fTmp
 
 #TODO: check the results
 
diff --git a/examples/F90/bufr_set_keys.sh b/examples/F90/bufr_set_keys.sh
index c6059a710..69b5fca7b 100755
--- a/examples/F90/bufr_set_keys.sh
+++ b/examples/F90/bufr_set_keys.sh
@@ -21,12 +21,12 @@ f=${data_dir}/bufr/syno_multi.bufr
 
 REDIRECT=/dev/null
 
-#The input ($f) and output ($fBufrTmp) are hardcoded in the f90 example!!! 
-${examples_dir}/f_bufr_set_keys >$REDIRECT 2> $REDIRECT 
+#The input ($f) and output ($fBufrTmp) are hardcoded in the f90 example!!!
+${examples_dir}/eccodes_f_bufr_set_keys >$REDIRECT 2> $REDIRECT
 
 #Compare modified file  to the original
 set +e
-${tools_dir}/bufr_compare $f $fBufrTmp >$REDIRECT 2> $REDIRECT 
+${tools_dir}/bufr_compare $f $fBufrTmp >$REDIRECT 2> $REDIRECT
 
 #Check if they are different
 if [ $? -eq 0 ]; then
diff --git a/examples/F90/bufr_subset.sh b/examples/F90/bufr_subset.sh
index 3093eb072..2df6ed276 100755
--- a/examples/F90/bufr_subset.sh
+++ b/examples/F90/bufr_subset.sh
@@ -23,7 +23,7 @@ rm -f $fTmp | true
 REDIRECT=/dev/null
 
 #Write the values into a file and compare with reference
-${examples_dir}/f_bufr_subset 2> $REDIRECT > $fTmp
+${examples_dir}/eccodes_f_bufr_subset 2> $REDIRECT > $fTmp
 
 #TODO: add a proper check when subsets are properly implemented
 
diff --git a/examples/F90/copy_message.sh b/examples/F90/copy_message.sh
index 28b463994..f9b2eee7b 100755
--- a/examples/F90/copy_message.sh
+++ b/examples/F90/copy_message.sh
@@ -9,5 +9,5 @@
 
 . ./include.sh
 
-${examples_dir}f_copy_message > /dev/null
+${examples_dir}eccodes_f_copy_message > /dev/null
 rm -f out.copy.grib1
diff --git a/examples/F90/count_messages.sh b/examples/F90/count_messages.sh
index d3f32b436..24e5d9671 100755
--- a/examples/F90/count_messages.sh
+++ b/examples/F90/count_messages.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_count_messages > /dev/null
+${examples_dir}eccodes_f_count_messages > /dev/null
diff --git a/examples/F90/get_data.sh b/examples/F90/get_data.sh
index 8c57ae381..f0d32a749 100755
--- a/examples/F90/get_data.sh
+++ b/examples/F90/get_data.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_get_data > /dev/null
+${examples_dir}eccodes_f_get_data > /dev/null
diff --git a/examples/F90/get_pl.sh b/examples/F90/get_pl.sh
index 69f72cb3f..00057ca83 100755
--- a/examples/F90/get_pl.sh
+++ b/examples/F90/get_pl.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_get_pl > /dev/null
+${examples_dir}eccodes_f_get_pl > /dev/null
diff --git a/examples/F90/get_product_kind.sh b/examples/F90/get_product_kind.sh
index cccbb7b79..652e9d0be 100755
--- a/examples/F90/get_product_kind.sh
+++ b/examples/F90/get_product_kind.sh
@@ -16,6 +16,6 @@ fTmp=${label}.tmp
 # Create a file containing both GRIB and BUFR messages
 cat ${data_dir}/sample.grib2 ${data_dir}/bufr/syno_multi.bufr >$fTmp
 
-${examples_dir}/f_get_product_kind $fTmp >/dev/null 2>&1
+${examples_dir}/eccodes_f_get_product_kind $fTmp >/dev/null 2>&1
 
 rm -f ${fTmp}
diff --git a/examples/F90/get_pv.sh b/examples/F90/get_pv.sh
index 568aaadd9..ca3f6baa5 100755
--- a/examples/F90/get_pv.sh
+++ b/examples/F90/get_pv.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_get_pv > /dev/null
+${examples_dir}eccodes_f_get_pv > /dev/null
diff --git a/examples/F90/get_set_uuid.sh b/examples/F90/get_set_uuid.sh
index 24ee420d0..2accecd2c 100755
--- a/examples/F90/get_set_uuid.sh
+++ b/examples/F90/get_set_uuid.sh
@@ -14,7 +14,7 @@ uuid=`${tools_dir}/grib_get -w count=1 -p uuidOfVGrid:s ${data_dir}/test_uuid.gr
 [ "$uuid" = "08b1e836bc6911e1951fb51b5624ad8d" ]
 
 # This reads the file in data/test_uuid.grib2 and creates test_uuid.grib2
-${examples_dir}f_get_set_uuid > /dev/null
+${examples_dir}eccodes_f_get_set_uuid > /dev/null
 
 # Check output was written
 output=out_uuid.grib2
diff --git a/examples/F90/grib_clone.sh b/examples/F90/grib_clone.sh
index bc2c006c1..1fc0545bc 100755
--- a/examples/F90/grib_clone.sh
+++ b/examples/F90/grib_clone.sh
@@ -9,5 +9,5 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_clone > /dev/null
+${examples_dir}eccodes_f_grib_clone > /dev/null
 rm -f out.clone.grib1
diff --git a/examples/F90/grib_get_keys.sh b/examples/F90/grib_get_keys.sh
index 120812e46..a99a15b22 100755
--- a/examples/F90/grib_get_keys.sh
+++ b/examples/F90/grib_get_keys.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_get_keys > /dev/null
+${examples_dir}eccodes_f_grib_get_keys > /dev/null
diff --git a/examples/F90/grib_index.sh b/examples/F90/grib_index.sh
index 972745498..7a876ded2 100755
--- a/examples/F90/grib_index.sh
+++ b/examples/F90/grib_index.sh
@@ -11,11 +11,11 @@
 
 # if an index file does not exist then
 # create index and save to disk
-${examples_dir}f_grib_index > index_f90.out
+${examples_dir}eccodes_f_grib_index > index_f90.out
 diff index_f90.out ${data_dir}/index_f90.ok
 
 # if an index file exists then load the index from it
-${examples_dir}f_grib_index > index_f90.out
+${examples_dir}eccodes_f_grib_index > index_f90.out
 diff index_f90.out ${data_dir}/index_f90.ok
 
 rm -f index.idx index_f90.out
diff --git a/examples/F90/grib_keys_iterator.sh b/examples/F90/grib_keys_iterator.sh
index 19137e8fc..6a614090f 100755
--- a/examples/F90/grib_keys_iterator.sh
+++ b/examples/F90/grib_keys_iterator.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_keys_iterator > /dev/null
+${examples_dir}eccodes_f_grib_keys_iterator > /dev/null
diff --git a/examples/F90/grib_multi.sh b/examples/F90/grib_multi.sh
index 97bf93c39..35723976f 100755
--- a/examples/F90/grib_multi.sh
+++ b/examples/F90/grib_multi.sh
@@ -9,6 +9,6 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_multi > multi.out
+${examples_dir}eccodes_f_grib_multi > multi.out
 diff multi.out ${data_dir}/multi.ok
 rm -f multi.out
diff --git a/examples/F90/grib_multi_write.sh b/examples/F90/grib_multi_write.sh
index ce63432a7..f25bc5815 100755
--- a/examples/F90/grib_multi_write.sh
+++ b/examples/F90/grib_multi_write.sh
@@ -9,7 +9,7 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_multi_write > /dev/null
+${examples_dir}eccodes_f_grib_multi_write > /dev/null
 
 ${tools_dir}/grib_compare ${data_dir}/multi_created.grib2 multi_created.grib2
 
diff --git a/examples/F90/grib_nearest.sh b/examples/F90/grib_nearest.sh
index ea0cd407a..a7011f4b1 100755
--- a/examples/F90/grib_nearest.sh
+++ b/examples/F90/grib_nearest.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_nearest > /dev/null
+${examples_dir}eccodes_f_grib_nearest > /dev/null
diff --git a/examples/F90/grib_precision.sh b/examples/F90/grib_precision.sh
index fa63597d8..1c30a465d 100755
--- a/examples/F90/grib_precision.sh
+++ b/examples/F90/grib_precision.sh
@@ -9,5 +9,5 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_precision > /dev/null
+${examples_dir}eccodes_f_grib_precision > /dev/null
 rm -f ${data_dir}/regular_latlon_surface_prec.grib1
diff --git a/examples/F90/grib_print_data.sh b/examples/F90/grib_print_data.sh
index d679f3fa7..c5445f96c 100755
--- a/examples/F90/grib_print_data.sh
+++ b/examples/F90/grib_print_data.sh
@@ -9,4 +9,4 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_print_data > /dev/null
+${examples_dir}eccodes_f_grib_print_data > /dev/null
diff --git a/examples/F90/grib_set_bitmap.sh b/examples/F90/grib_set_bitmap.sh
index 86e4b383f..ab441077c 100755
--- a/examples/F90/grib_set_bitmap.sh
+++ b/examples/F90/grib_set_bitmap.sh
@@ -8,5 +8,5 @@
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 
 . ./include.sh
-${examples_dir}f_grib_set_bitmap > /dev/null
+${examples_dir}eccodes_f_grib_set_bitmap > /dev/null
 rm -f out.bmp.grib
diff --git a/examples/F90/grib_set_keys.sh b/examples/F90/grib_set_keys.sh
index e80bd95e2..fc98f186a 100755
--- a/examples/F90/grib_set_keys.sh
+++ b/examples/F90/grib_set_keys.sh
@@ -9,9 +9,9 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_set_keys > /dev/null
+${examples_dir}eccodes_f_grib_set_keys > /dev/null
 
-${examples_dir}f_set_gvc > /dev/null
+${examples_dir}eccodes_f_set_gvc > /dev/null
 [ -f out_gvc.grib2 ]
 
 rm -f out.set.grib1 out_gvc.grib2
diff --git a/examples/F90/grib_set_pv.sh b/examples/F90/grib_set_pv.sh
index d5229a63b..f47d189a6 100755
--- a/examples/F90/grib_set_pv.sh
+++ b/examples/F90/grib_set_pv.sh
@@ -9,5 +9,5 @@
 
 . ./include.sh
 
-${examples_dir}f_grib_set_pv > /dev/null
+${examples_dir}eccodes_f_grib_set_pv > /dev/null
 rm -f out.pv.grib1
diff --git a/examples/F90/read_from_file.sh b/examples/F90/read_from_file.sh
index f13cb6791..b6e6c369e 100755
--- a/examples/F90/read_from_file.sh
+++ b/examples/F90/read_from_file.sh
@@ -13,4 +13,4 @@
 # Check program completed successfully. We have to resort to testing
 # the output as there is no way in Fortran to set the exit code
 #
-${examples_dir}f_read_from_file | grep 'Passed' >/dev/null
+${examples_dir}eccodes_f_read_from_file | grep 'Passed' >/dev/null
diff --git a/examples/F90/read_message.sh b/examples/F90/read_message.sh
index a371a4668..e4526876c 100755
--- a/examples/F90/read_message.sh
+++ b/examples/F90/read_message.sh
@@ -14,7 +14,7 @@ out=out.readmsg.grib
 
 rm -f $out | true
 
-${examples_dir}f_read_message > /dev/null
+${examples_dir}eccodes_f_read_message > /dev/null
 
 ${tools_dir}grib_compare $in $out
 
diff --git a/examples/F90/samples.sh b/examples/F90/samples.sh
index 71d4388ed..ac2ba2f66 100755
--- a/examples/F90/samples.sh
+++ b/examples/F90/samples.sh
@@ -16,12 +16,12 @@ cp ${data_dir}/regular_latlon_surface.grib1 ${data_dir}/regular_latlon_surface.g
 # Change the ECCODES_SAMPLES_PATH: put the data dir first
 ECCODES_SAMPLES_PATH=${data_dir}:${samples_dir}
 export ECCODES_SAMPLES_PATH
-${examples_dir}f_samples > /dev/null
+${examples_dir}eccodes_f_samples > /dev/null
 
 # Extend the ECCODES_SAMPLES_PATH: put the data dir second
 ECCODES_SAMPLES_PATH=${samples_dir}:${data_dir}
 export ECCODES_SAMPLES_PATH
-${examples_dir}f_samples > /dev/null
+${examples_dir}eccodes_f_samples > /dev/null
 
 rm -f out.samples.grib1
 rm -f ${data_dir}/regular_latlon_surface.grib1.tmpl
diff --git a/examples/F90/set_missing.sh b/examples/F90/set_missing.sh
index b5bb5cdc1..f073ab74a 100755
--- a/examples/F90/set_missing.sh
+++ b/examples/F90/set_missing.sh
@@ -9,5 +9,5 @@
 
 . ./include.sh
 
-${examples_dir}f_set_missing > /dev/null
+${examples_dir}eccodes_f_set_missing > /dev/null
 rm -f out_surface_level.grib2
diff --git a/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
index 9c8468f97..0196fe70f 100644
--- a/examples/python/CMakeLists.txt
+++ b/examples/python/CMakeLists.txt
@@ -58,13 +58,13 @@ list( APPEND tests
    metar_get_keys
 )
 foreach( test ${tests} )
-    ecbuild_add_test( TARGET p_${test}_test
+    ecbuild_add_test( TARGET eccodes_p_${test}_test
                   TYPE       SCRIPT
                   DEPENDS    ${ptools}
                   COMMAND    ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
                   CONDITION  HAVE_PYTHON
                   RESOURCES  ${test}.py
                   ENVIRONMENT PYTHON=${PYTHON_EXECUTABLE}
-                  TEST_DEPENDS get_gribs get_tigge_gribs get_bufrs
+                  TEST_DEPENDS eccodes_get_gribs eccodes_get_tigge_gribs eccodes_get_bufrs
     )
 endforeach()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 038db9230..a26183f3c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -88,7 +88,7 @@ list( APPEND tests2
 
 # These tests do not require any data downloads
 foreach( test ${tests1} )
-    ecbuild_add_test( TARGET t_${test}
+    ecbuild_add_test( TARGET eccodes_t_${test}
                   TYPE SCRIPT
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
     )
@@ -98,40 +98,40 @@ endforeach()
 #       means they will be downloaded at "make" time
 #       rather than when you do "make test". Use TEST_DEPENDS instead
 foreach( test ${tests2} )
-    ecbuild_add_test( TARGET t_${test}
+    ecbuild_add_test( TARGET eccodes_t_${test}
                   TYPE SCRIPT
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/${test}.sh
-                  TEST_DEPENDS get_gribs get_tigge_gribs get_bufrs get_metars get_gts
+                  TEST_DEPENDS eccodes_get_gribs eccodes_get_tigge_gribs eccodes_get_bufrs eccodes_get_metars eccodes_get_gts
     )
 endforeach()
 
 ###########################################
 # Note: the reference file is in the tests dir not data dir!
-ecbuild_add_test( TARGET t_lamb_az_eq_area
+ecbuild_add_test( TARGET eccodes_t_lamb_az_eq_area
                   TYPE SCRIPT
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/lamb_az_eq_area.sh
                   RESOURCES lamb_az_eq_area.ref
-                  TEST_DEPENDS get_gribs
+                  TEST_DEPENDS eccodes_get_gribs
 )
 
 # These ones are conditional
-ecbuild_add_test( TARGET t_grib_to_netcdf
+ecbuild_add_test( TARGET eccodes_t_grib_to_netcdf
                   TYPE SCRIPT
                   CONDITION HAVE_NETCDF
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/grib_to_netcdf.sh
-                  TEST_DEPENDS get_gribs
+                  TEST_DEPENDS eccodes_get_gribs
 )
 
-ecbuild_add_test( TARGET t_jpeg
+ecbuild_add_test( TARGET eccodes_t_jpeg
                   TYPE SCRIPT
                   CONDITION HAVE_JPEG
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jpeg.sh
-                  TEST_DEPENDS get_gribs
+                  TEST_DEPENDS eccodes_get_gribs
 )
 
-ecbuild_add_test( TARGET t_ccsds
+ecbuild_add_test( TARGET eccodes_t_ccsds
                   TYPE SCRIPT
                   CONDITION HAVE_AEC
                   COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/ccsds.sh
-                  TEST_DEPENDS get_gribs
+                  TEST_DEPENDS eccodes_get_gribs
 )