diff --git a/src/cdi_int.c b/src/cdi_int.c
index b74fe8daa7427be66881d012170e0c4cab90b28a..c05492230b2375d7a356f717f79df0c0fd4ffe3d 100644
--- a/src/cdi_int.c
+++ b/src/cdi_int.c
@@ -123,19 +123,19 @@ void cdiPrintVersion(void)
 {
   fprintf(stderr, "     CDI library version : %s\n", cdiLibraryVersion());
 #ifdef  HAVE_LIBCGRIBEX
-  fprintf(stderr, " CGRIBEX library version : %s\n", cgribexLibraryVersion());
+  fprintf(stderr, " cgribex library version : %s\n", cgribexLibraryVersion());
 #endif
 #ifdef  HAVE_LIBGRIB_API
-  fprintf(stderr, "GRIB_API library version : %s\n", gribapiLibraryVersionString());
+  fprintf(stderr, " ecCodes library version : %s\n", gribapiLibraryVersionString());
 #endif
 #ifdef  HAVE_LIBNETCDF
   fprintf(stderr, "  NetCDF library version : %s\n", cdfLibraryVersion());
 #endif
 #ifdef  HAVE_NC4HDF5
-  fprintf(stderr, "    HDF5 library version : %s\n", hdfLibraryVersion());
+  fprintf(stderr, "    hdf5 library version : %s\n", hdfLibraryVersion());
 #endif
 #ifdef  HAVE_LIBSERVICE
-  fprintf(stderr, "    EXSE library version : %s\n", srvLibraryVersion());
+  fprintf(stderr, "    exse library version : %s\n", srvLibraryVersion());
 #endif
   fprintf(stderr, "    FILE library version : %s\n", fileLibraryVersion());
 }
diff --git a/src/grb_read.c b/src/grb_read.c
index 03c2f647493f2ad16040c0d21c1e70163e151d24..c26fa1f9aaf420095ec2d69c7e157d8024e2e2b6 100644
--- a/src/grb_read.c
+++ b/src/grb_read.c
@@ -49,7 +49,7 @@ int grbDecode(int filetype, int memtype, void *cgribexp, void *gribbuffer, size_
 #else
     {
       (void)vlistID; (void)varID;
-      Error("GRIB_API support not compiled in!");
+      Error("ecCodes support not compiled in!");
     }
 #endif
 
diff --git a/src/grb_write.c b/src/grb_write.c
index db8b0001b9c9827f5d210219d7a1e5c1cd1de3cb..af356583f1b1040e81cb60f9890717d39dcfd5da 100644
--- a/src/grb_write.c
+++ b/src/grb_write.c
@@ -57,7 +57,7 @@ size_t grbEncode(int filetype, int memtype, int varID, int levelID, int vlistID,
     }
 #else
     {
-      Error("GRIB_API support not compiled in!");
+      Error("ecCodes support not compiled in!");
       (void)gribContainer;
       (void)comptype;
     }
@@ -143,7 +143,7 @@ void grbCopyRecord(stream_t * streamptr2, stream_t * streamptr1)
     }
 #else
     {
-      Error("GRIB_API support not compiled in!");
+      Error("ecCodes support not compiled in!");
     }
 #endif