diff --git a/configure.ac b/configure.ac
index 6d392875c..d058b86e5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_DEFUN([_AM_AUTOCONF_VERSION],[])
 
 AC_PREREQ([2.59])
-AC_INIT([grib_api],[ ], [Software.Support@ecmwf.int])
+AC_INIT([eccodes],[ ], [Software.Support@ecmwf.int])
 
 AC_CONFIG_AUX_DIR([config])
 
@@ -34,9 +34,9 @@ AC_CONFIG_HEADER([src/config.h])
 AC_CONFIG_FILES([rpms/grib_api.pc rpms/grib_api.spec rpms/grib_api_f90.pc])
 AM_INIT_AUTOMAKE($PACKAGE_NAME,[${PACKAGE_VERSION}],[http://www.ecmwf.int])
 
-definition_files_path="${datadir}/grib_api/definitions"
-samples_files_path="${datadir}/grib_api/samples"
-ifs_samples_files_path="${datadir}/grib_api/ifs_samples"
+definition_files_path="${datadir}/eccodes/definitions"
+samples_files_path="${datadir}/eccodes/samples"
+ifs_samples_files_path="${datadir}/eccodes/ifs_samples"
 default_perl_install="${prefix}/perl"
 
 AC_DEFINE_UNQUOTED(GRIB_API_MAIN_VERSION,$GRIB_API_MAIN_VERSION,Grib Api version)
diff --git a/version.sh b/version.sh
index 89135fc82..a5af3189b 100644
--- a/version.sh
+++ b/version.sh
@@ -10,7 +10,7 @@
 #
 #
 # Package base name
-PACKAGE_NAME='grib_api'
+PACKAGE_NAME='eccodes'
 
 # Package version
 GRIB_API_MAJOR_VERSION=0