diff --git a/examples/C/Makefile.am b/examples/C/Makefile.am
index 1d58efb48..8b4bbe241 100644
--- a/examples/C/Makefile.am
+++ b/examples/C/Makefile.am
@@ -52,7 +52,7 @@ bufr_subset_SOURCES 	= bufr_subset.c
 
 INCLUDES =  -I$(top_builddir)/src
 
-LDADD = $(top_builddir)/src/libgrib_api.la
+LDADD = $(top_builddir)/src/libeccodes.la
 DEPENDENCIES = $(LDADD)
 
 EXTRA_DIST =$(TESTS) include.sh CMakeLists.txt include.ctest.sh.in
diff --git a/examples/F90/Makefile.am b/examples/F90/Makefile.am
index 6f40cda70..189483357 100644
--- a/examples/F90/Makefile.am
+++ b/examples/F90/Makefile.am
@@ -51,7 +51,7 @@ INCLUDES =  -I$(top_builddir)/src
 
 AM_FCFLAGS = $(F90_MODULE_FLAG)$(top_builddir)/fortran
 
-LDADD = $(top_builddir)/fortran/libgrib_api_f90.la $(top_builddir)/src/libgrib_api.la
+LDADD = $(top_builddir)/fortran/libeccodes_f90.la $(top_builddir)/src/libeccodes.la
 DEPENDENCIES = $(LDADD)
 
 EXTRA_DIST =$(TESTS) include.sh CMakeLists.txt include.ctest.sh.in
diff --git a/examples/python/Makefile.am b/examples/python/Makefile.am
index 12325eca3..525d6f96f 100644
--- a/examples/python/Makefile.am
+++ b/examples/python/Makefile.am
@@ -12,7 +12,7 @@ p_print_data_SOURCES = print_data.c
 p_iterator_SOURCES = iterator.c
 p_count_messages_SOURCES = count_messages.c
 INCLUDES =  -I$(top_builddir)/src
-LDADD = $(top_builddir)/src/libgrib_api.la
+LDADD = $(top_builddir)/src/libeccodes.la
 DEPENDENCIES = $(LDADD)
 
 EXTRA_DIST = $(TESTS) include.sh clone.py count_messages.py get.py index.py iterator.py keys_iterator.py multi_write.py \
diff --git a/fortran/Makefile.am b/fortran/Makefile.am
index 10e3319de..41028f5b4 100644
--- a/fortran/Makefile.am
+++ b/fortran/Makefile.am
@@ -2,18 +2,18 @@
 
 AM_CFLAGS =  @WARN_PEDANTIC@
 
-lib_LTLIBRARIES = libgrib_api_f77.la libgrib_api_f90.la
+lib_LTLIBRARIES = libeccodes_f77.la libeccodes_f90.la
 include_HEADERS = grib_api_f77.h
 
-libgrib_api_f77_la_SOURCES= grib_fortran.c grib_f77.c 
-libgrib_api_f77_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la
-libgrib_api_f77_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
+libeccodes_f77_la_SOURCES= grib_fortran.c grib_f77.c 
+libeccodes_f77_la_DEPENDENCIES = $(top_builddir)/src/libeccodes.la
+libeccodes_f77_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
 
-libgrib_api_f90_la_SOURCES= grib_fortran.c grib_f90.f90 eccodes_f90.f90
-libgrib_api_f90_la_DEPENDENCIES = $(top_builddir)/src/libgrib_api.la grib_api_externals.h grib_api_visibility.h grib_api_constants.h grib_kinds.h
-libgrib_api_f90_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
+libeccodes_f90_la_SOURCES= grib_fortran.c grib_f90.f90 eccodes_f90.f90
+libeccodes_f90_la_DEPENDENCIES = $(top_builddir)/src/libeccodes.la grib_api_externals.h grib_api_visibility.h grib_api_constants.h grib_kinds.h
+libeccodes_f90_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
 
-libgrib_api_fortran_prototypes= grib_fortran.c
+libeccodes_fortran_prototypes= grib_fortran.c
 
 if  UPPER_CASE_MOD_FALSE
 nodist_include_HEADERS = grib_api.mod
@@ -30,7 +30,7 @@ INCLUDES=  -I$(top_builddir)/src
 
 ## Make sure these will be cleaned even when they're not built by
 ## default.
-CLEANFILES = libgrib_api_f77.la libgrib_api_f90.la grib_f90.f90 eccodes_f90.f90 *.mod grib_types grib_kinds.h same_int_long same_int_size_t
+CLEANFILES = libeccodes_f77.la libeccodes_f90.la grib_f90.f90 eccodes_f90.f90 *.mod grib_types grib_kinds.h same_int_long same_int_size_t
 
 #noinst_HEADERS = 
 
diff --git a/python/Makefile.am b/python/Makefile.am
index 08a58fc6b..8809d06d3 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -7,7 +7,7 @@ if CREATING_SHARED_LIBS
 pkgpyexec_LTLIBRARIES = _gribapi_swig.la
 
 _gribapi_swig_la_SOURCES = gribapi_swig_wrap.c grib_interface.c grib_interface.h
-_gribapi_swig_la_LIBADD = $(top_builddir)/src/libgrib_api.la $(PYTHON_LIBS)
+_gribapi_swig_la_LIBADD = $(top_builddir)/src/libeccodes.la $(PYTHON_LIBS)
 _gribapi_swig_la_LDFLAGS = -module -avoid-version $(PYTHON_LDFLAGS)
 
 INCLUDES = $(PYTHON_INCLUDES) -I$(NUMPY_INCLUDE)
diff --git a/python/setup.py.in b/python/setup.py.in
index 311461277..4b4b43f0f 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -19,7 +19,7 @@ add_attribute = lambda **args: [list.append(attdict[key],value) for key,value in
 build_dir = '@BUILD_DIR@'
 add_attribute(
     include_dirs = os.path.join(build_dir,'src'),
-    extra_objects = os.path.join(build_dir, 'src', '.libs', 'libgrib_api.a')
+    extra_objects = os.path.join(build_dir, 'src', '.libs', 'libeccodes.a')
 )
 
 with_jasper = '@LIB_JASPER@'
diff --git a/rpms/grib_api.pc.in b/rpms/grib_api.pc.in
index fb46130fc..a69c56622 100644
--- a/rpms/grib_api.pc.in
+++ b/rpms/grib_api.pc.in
@@ -4,9 +4,9 @@ bindir=@bindir@
 includedir=@includedir@
 libdir=@libdir@
 
-Name: grib_api
-Description: The grib_api library
+Name: eccodes
+Description: The eccodes library
 Version: @VERSION@
 Cflags: -I${includedir}
-Libs: -L${libdir} -lgrib_api
-Libs.private: -L${libdir} -lgrib_api @LIBS@
+Libs: -L${libdir} -leccodes
+Libs.private: -L${libdir} -leccodes @LIBS@
diff --git a/rpms/grib_api.spec.in b/rpms/grib_api.spec.in
index 366b49ee9..d7a64969a 100644
--- a/rpms/grib_api.spec.in
+++ b/rpms/grib_api.spec.in
@@ -71,8 +71,8 @@ make DESTDIR="$RPM_BUILD_ROOT" install
 %doc ChangeLog README AUTHORS NEWS LICENSE
 #%doc doc/*
 %prefix/bin/*
-%prefix/lib*/libgrib_api.so
-%prefix/lib*/libgrib_api.so.*
+%prefix/lib*/libeccodes.so
+%prefix/lib*/libeccodes.so.*
 %prefix/share/grib_api/definitions/*
 
 # If you install a library
@@ -93,8 +93,8 @@ The ECMWF GRIB API is an application program interface accessible from C and FOR
 #%doc doc
 %prefix/include/grib_api.h
 %prefix/include/grib_windef.h
-%prefix/lib*/libgrib_api.a
-%prefix/lib*/libgrib_api.la
+%prefix/lib*/libeccodes.a
+%prefix/lib*/libeccodes.la
 %prefix/lib*/pkgconfig/*
 %prefix/share/grib_api/samples/*
 %prefix/share/grib_api/ifs_samples/*
diff --git a/rpms/grib_api_f90.pc.in b/rpms/grib_api_f90.pc.in
index 3ca32e26b..e91278889 100644
--- a/rpms/grib_api_f90.pc.in
+++ b/rpms/grib_api_f90.pc.in
@@ -5,9 +5,9 @@ includedir=@includedir@
 libdir=@libdir@
 FC=@FC@
 
-Name: grib_api_f90
-Description: The grib_api library for Fortran 90
+Name: eccodes_f90
+Description: The eccodes library for Fortran 90
 Version: @VERSION@
 Cflags: @F90_MODULE_FLAG@@includedir@
-Libs: -L${libdir} -lgrib_api_f90 -lgrib_api
-Libs.private: -L${libdir} -lgrib_api_f90 -lgrib_api @LIBS@
+Libs: -L${libdir} -leccodes_f90 -leccodes
+Libs.private: -L${libdir} -leccodes_f90 -leccodes @LIBS@
diff --git a/src/Makefile.am b/src/Makefile.am
index c668019aa..540221214 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,10 +9,10 @@ AM_CPPFLAGS = -DECCODES_SAMPLES_PATH=\"$(ECCODES_SAMPLES_PATH)\" \
 #  -DYYDEBUG
 
 
-lib_LTLIBRARIES = libgrib_api.la
+lib_LTLIBRARIES = libeccodes.la
 include_HEADERS = grib_api.h eccodes.h grib_windef.h
 
-libgrib_api_la_prototypes= \
+libeccodes_la_prototypes= \
 	action.c \
 	action_class_alias.c \
 	action_class_gen.c \
@@ -346,20 +346,20 @@ libgrib_api_la_prototypes= \
 	functions.c \
 	grib_api_version.c
 
-libgrib_api_extra_prototypes = grib_bits_any_endian.c grib_bits_any_endian_simple.c
+libeccodes_extra_prototypes = grib_bits_any_endian.c grib_bits_any_endian_simple.c
 
-libgrib_api_la_SOURCES = $(libgrib_api_la_prototypes) eccodes.c grib_yacc.c  grib_lex.c md5.c
+libeccodes_la_SOURCES = $(libeccodes_la_prototypes) eccodes.c grib_yacc.c  grib_lex.c md5.c
 
-libgrib_api_la_LIBADD = @LIBOBJS@
-libgrib_api_la_DEPENDENCIES = grib_api.h $(libgrib_api_la_LIBADD)
-libgrib_api_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
+libeccodes_la_LIBADD = @LIBOBJS@
+libeccodes_la_DEPENDENCIES = grib_api.h $(libeccodes_la_LIBADD)
+libeccodes_la_LDFLAGS = -version-info $(GRIB_ABI_CURRENT):$(GRIB_ABI_REVISION):$(GRIB_ABI_AGE)
 
 # set the include path
 INCLUDES=  -I.
 
 ## Make sure these will be cleaned even when they're not built by
 ## default.
-CLEANFILES = libgrib_api.la
+CLEANFILES = libeccodes.la
 
 noinst_HEADERS = grib_api_internal.h \
                  md5.h \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9753accf3..6b29a169b 100755
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -43,7 +43,7 @@ ccsds_perf_SOURCES  = ccsds_perf.c
 gribex_perf_SOURCES = gribex_perf.c
 gauss_sub_SOURCES = gauss_sub.c
 
-LDADD = $(top_builddir)/src/libgrib_api.la $(EMOS_LIB)
+LDADD = $(top_builddir)/src/libeccodes.la $(EMOS_LIB)
 
 INCLUDES   = -I$(top_builddir)/src
 
diff --git a/tigge/Makefile.am b/tigge/Makefile.am
index 3c8ed16c8..43d3413ef 100755
--- a/tigge/Makefile.am
+++ b/tigge/Makefile.am
@@ -12,6 +12,6 @@ tigge_accumulations_SOURCES      =  tigge_accumulations.c
 
 INCLUDES =  -I$(top_builddir)/src
 
-LDADD = $(top_builddir)/src/libgrib_api.la
+LDADD = $(top_builddir)/src/libeccodes.la
 DEPENDENCIES = $(LDADD)
 EXTRA_DIST = CMakeLists.txt
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9fca7b25a..b766a4d9d 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -82,12 +82,12 @@ taf_filter_SOURCES   = taf_filter.c
 gts_copy_SOURCES = gts_copy.c
 gts_dump_SOURCES = gts_dump.c
 gts_filter_SOURCES = gts_filter.c
-gts_get_SOURCES = gts_get.c
+#gts_get_SOURCES = gts_get.c
 gts_ls_SOURCES = gts_ls.c
 
 INCLUDES =  -I$(top_builddir)/src
 
-LDADD = libgrib_tools.la $(top_builddir)/src/libgrib_api.la
+LDADD = libgrib_tools.la $(top_builddir)/src/libeccodes.la
 DEPENDENCIES = $(LDADD)
 
 grib_to_netcdf_LDADD = $(LDADD) $(NETCDF_LDFLAGS)