diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3acf82c1a..983c41a9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,11 +197,11 @@ endif()
 
 ecbuild_generate_config_headers()
 
-configure_file( grib_api_config.h.in grib_api_config.h )
+configure_file( eccodes_config.h.in eccodes_config.h )
 
-add_definitions( -DHAVE_GRIB_API_CONFIG_H )
+add_definitions( -DHAVE_ECCODES_CONFIG_H )
 
-install( FILES ${CMAKE_CURRENT_BINARY_DIR}/grib_api_config.h DESTINATION ${INSTALL_INCLUDE_DIR} )
+install( FILES ${CMAKE_CURRENT_BINARY_DIR}/eccodes_config.h DESTINATION ${INSTALL_INCLUDE_DIR} )
 
 if( CMAKE_COMPILER_IS_GNUCC )
     cmake_add_c_flags("-pedantic")
diff --git a/Makefile.am b/Makefile.am
index bec3edd6d..2d9b60ced 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -376,7 +376,7 @@ EXTRA_DIST = README AUTHORS NOTICE LICENSE ChangeLog version.sh html \
 		CMakeLists.txt \
 		project_summary.cmake \
 		VERSION.cmake \
-		grib_api_config.h.in \
+		eccodes_config.h.in \
 		examples/CMakeLists.txt \
 		data/CMakeLists.txt \
 		data/tigge/CMakeLists.txt \
diff --git a/grib_api_config.h.in b/eccodes_config.h.in
similarity index 96%
rename from grib_api_config.h.in
rename to eccodes_config.h.in
index 15bc4a1a5..593c90cd7 100644
--- a/grib_api_config.h.in
+++ b/eccodes_config.h.in
@@ -8,8 +8,8 @@
  * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
  */
 
-#ifndef grib_api_config_h
-#define grib_api_config_h
+#ifndef eccodes_config_h
+#define eccodes_config_h
 
 #include "eccodes_ecbuild_config.h" /* generated by ecbuild */
 
@@ -95,4 +95,4 @@
 
 #cmakedefine HAVE_NETCDF
 
-#endif /* grib_api_config_h */
+#endif /* eccodes_config_h */
diff --git a/ifs_samples/grib1/CMakeLists.txt b/ifs_samples/grib1/CMakeLists.txt
index c879c1bb5..484e3e4d4 100644
--- a/ifs_samples/grib1/CMakeLists.txt
+++ b/ifs_samples/grib1/CMakeLists.txt
@@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
       sh_sfc.tmpl
 )
 
-install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
+install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
          DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
 
diff --git a/ifs_samples/grib1_mlgrib2/CMakeLists.txt b/ifs_samples/grib1_mlgrib2/CMakeLists.txt
index b8cfac5fb..e4e4908f5 100644
--- a/ifs_samples/grib1_mlgrib2/CMakeLists.txt
+++ b/ifs_samples/grib1_mlgrib2/CMakeLists.txt
@@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
       sh_sfc.tmpl
 )
 
-install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
+install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
          DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
 
diff --git a/ifs_samples/grib1_mlgrib2_ieee32/CMakeLists.txt b/ifs_samples/grib1_mlgrib2_ieee32/CMakeLists.txt
index 7769ad2e8..87e01f1c6 100644
--- a/ifs_samples/grib1_mlgrib2_ieee32/CMakeLists.txt
+++ b/ifs_samples/grib1_mlgrib2_ieee32/CMakeLists.txt
@@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
       sh_sfc.tmpl
 )
 
-install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
+install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
          DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
 
diff --git a/ifs_samples/grib1_mlgrib2_ieee64/CMakeLists.txt b/ifs_samples/grib1_mlgrib2_ieee64/CMakeLists.txt
index 8c737c4f9..4d7974a36 100644
--- a/ifs_samples/grib1_mlgrib2_ieee64/CMakeLists.txt
+++ b/ifs_samples/grib1_mlgrib2_ieee64/CMakeLists.txt
@@ -7,7 +7,7 @@ list( APPEND ifs_samples_${_basedir}
       sh_sfc.tmpl
 )
 
-install( FILES ${GRIB_API_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
+install( FILES ${ECCODES_SAMPLES_FILES} ${ifs_samples_${_basedir}}  
          DESTINATION ${ECCODES_IFS_SAMPLES_PATH}/${_basedir}
          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
 
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index fad57dc4c..ce7f1965e 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -5,11 +5,11 @@ install( FILES ${samples_files}
          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ )
 
 foreach( tmpl ${samples_files} )
-    list( APPEND GRIB_API_SAMPLES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tmpl} )
+    list( APPEND ECCODES_SAMPLES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${tmpl} )
 endforeach() 
 
-set( GRIB_API_SAMPLES_DIR   ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE )
-set( GRIB_API_SAMPLES_FILES ${GRIB_API_SAMPLES_FILES}   PARENT_SCOPE )
+set( ECCODES_SAMPLES_DIR   ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE )
+set( ECCODES_SAMPLES_FILES ${ECCODES_SAMPLES_FILES}    PARENT_SCOPE )
 
 # copy the samples to the build directory
 
diff --git a/src/grib_api_internal.h b/src/grib_api_internal.h
index 54c4569ef..f15c63d72 100644
--- a/src/grib_api_internal.h
+++ b/src/grib_api_internal.h
@@ -22,8 +22,8 @@ extern "C" {
 #endif
 
 /* cmake config header */
-#ifdef HAVE_GRIB_API_CONFIG_H 
-#include "grib_api_config.h"
+#ifdef HAVE_ECCODES_CONFIG_H 
+#include "eccodes_config.h"
 #endif
 
 /* autoconf config header */
diff --git a/tigge/tigge_accumulations.c b/tigge/tigge_accumulations.c
index 7718a106d..db320a77f 100755
--- a/tigge/tigge_accumulations.c
+++ b/tigge/tigge_accumulations.c
@@ -9,8 +9,8 @@
  */
 
 /* cmake config header */
-#ifdef HAVE_GRIB_API_CONFIG_H
-#include "grib_api_config.h"
+#ifdef HAVE_ECCODES_CONFIG_H
+#include "eccodes_config.h"
 #endif
 
 /* autoconf config header */
diff --git a/tigge/tigge_check.c b/tigge/tigge_check.c
index ed04ef126..5ece491fa 100755
--- a/tigge/tigge_check.c
+++ b/tigge/tigge_check.c
@@ -9,8 +9,8 @@
  */
 
 /* cmake config header */
-#ifdef HAVE_GRIB_API_CONFIG_H
-#include "grib_api_config.h"
+#ifdef HAVE_ECCODES_CONFIG_H
+#include "eccodes_config.h"
 #endif
 
 /* autoconf config header */
diff --git a/tigge/tigge_name.c b/tigge/tigge_name.c
index cf4429e5f..8adbfe41f 100755
--- a/tigge/tigge_name.c
+++ b/tigge/tigge_name.c
@@ -9,8 +9,8 @@
  */
 
 /* cmake config header */
-#ifdef HAVE_GRIB_API_CONFIG_H
-#include "grib_api_config.h"
+#ifdef HAVE_ECCODES_CONFIG_H
+#include "eccodes_config.h"
 #endif
 
 /* autoconf config header */
diff --git a/tigge/tigge_split.c b/tigge/tigge_split.c
index 2bab8e9e8..6343a07e9 100755
--- a/tigge/tigge_split.c
+++ b/tigge/tigge_split.c
@@ -9,8 +9,8 @@
  */
 
 /* cmake config header */
-#ifdef HAVE_GRIB_API_CONFIG_H
-#include "grib_api_config.h"
+#ifdef HAVE_ECCODES_CONFIG_H
+#include "eccodes_config.h"
 #endif
 
 /* autoconf config header */