diff --git a/configure.ac b/configure.ac
index 61f1641ca..8bd42df8b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -27,9 +27,9 @@ AC_SUBST(ECCODES_MAJOR_VERSION)
 AC_SUBST(ECCODES_MINOR_VERSION)
 AC_SUBST(ECCODES_PATCH_VERSION)
 
-AC_SUBST(GRIB_ABI_CURRENT)
-AC_SUBST(GRIB_ABI_REVISION)
-AC_SUBST(GRIB_ABI_AGE)
+AC_SUBST(ECCODES_CURRENT)
+AC_SUBST(ECCODES_REVISION)
+AC_SUBST(ECCODES_AGE)
 
 echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}"
 
@@ -52,9 +52,9 @@ AC_DEFINE_UNQUOTED(ECCODES_MAJOR_VERSION,$ECCODES_MAJOR_VERSION,ecCodes Major re
 AC_DEFINE_UNQUOTED(ECCODES_MINOR_VERSION,$ECCODES_MINOR_VERSION,ecCodes Minor release)
 AC_DEFINE_UNQUOTED(ECCODES_REVISION_VERSION,$ECCODES_REVISION_VERSION,ecCodes Revision release)
 
-AC_DEFINE_UNQUOTED(GRIB_ABI_CURRENT,$GRIB_ABI_CURRENT,ecCodes Current ABI version)
-AC_DEFINE_UNQUOTED(GRIB_ABI_REVISION,$GRIB_ABI_REVISION,ecCodes Revision ABI version)
-AC_DEFINE_UNQUOTED(GRIB_ABI_AGE,$GRIB_ABI_AGE,ecCodes Age of ABI version)
+AC_DEFINE_UNQUOTED(ECCODES_CURRENT,$ECCODES_CURRENT,ecCodes Current ABI version)
+AC_DEFINE_UNQUOTED(ECCODES_REVISION,$ECCODES_REVISION,ecCodes Revision ABI version)
+AC_DEFINE_UNQUOTED(ECCODES_AGE,$ECCODES_AGE,ecCodes Age of ABI version)
 
 
 AH_TEMPLATE([_LARGE_FILE_API],
diff --git a/fortran/Makefile.am b/fortran/Makefile.am
index 533105c0b..d66637885 100644
--- a/fortran/Makefile.am
+++ b/fortran/Makefile.am
@@ -7,11 +7,11 @@ include_HEADERS = eccodes_f77.h
 
 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)
+libeccodes_f77_la_LDFLAGS = -version-info $(ECCODES_CURRENT):$(ECCODES_REVISION):$(ECCODES_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)
+libeccodes_f90_la_LDFLAGS = -version-info $(ECCODES_CURRENT):$(ECCODES_REVISION):$(ECCODES_AGE)
 
 libeccodes_fortran_prototypes= grib_fortran.c
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b5aeffce3..88f0fd9d4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -352,7 +352,7 @@ libeccodes_la_SOURCES = $(libeccodes_la_prototypes) eccodes.c grib_yacc.c  grib_
 
 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)
+libeccodes_la_LDFLAGS = -version-info $(ECCODES_CURRENT):$(ECCODES_REVISION):$(ECCODES_AGE)
 
 # set the include path
 INCLUDES=  -I.
diff --git a/version.sh b/version.sh
index de5db9130..d4409bfa4 100644
--- a/version.sh
+++ b/version.sh
@@ -17,6 +17,6 @@ ECCODES_MAJOR_VERSION=0
 ECCODES_MINOR_VERSION=10
 ECCODES_REVISION_VERSION=0
 
-GRIB_ABI_CURRENT=1
-GRIB_ABI_REVISION=0
-GRIB_ABI_AGE=0
+ECCODES_CURRENT=1
+ECCODES_REVISION=0
+ECCODES_AGE=0