diff --git a/src/grib_accessor_class_data_apply_bitmap.cc b/src/grib_accessor_class_data_apply_bitmap.cc
index 5ba13e1a4..4711e7215 100644
--- a/src/grib_accessor_class_data_apply_bitmap.cc
+++ b/src/grib_accessor_class_data_apply_bitmap.cc
@@ -435,7 +435,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
 
     grib_context_log(a->context, GRIB_LOG_DEBUG,
                      "grib_accessor_class_data_apply_bitmap: %s : creating %s, %d values",
-                     __PRETTY_FUNCTION__,
+                     __func__,
                      a->name, n_vals);
 
     for (i = 0; i < n_vals; i++) {
@@ -449,7 +449,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
                 grib_context_log(a->context, GRIB_LOG_ERROR,
                                  "grib_accessor_class_data_apply_bitmap [%s]:"
                                  " %s :  number of coded values does not match bitmap %ld %ld",
-                                 a->name, __PRETTY_FUNCTION__, coded_n_vals, n_vals);
+                                 a->name, __func__, coded_n_vals, n_vals);
 
                 return GRIB_ARRAY_TOO_SMALL;
             }
diff --git a/src/grib_accessor_class_data_ccsds_packing.cc b/src/grib_accessor_class_data_ccsds_packing.cc
index 45d644836..af46ea401 100644
--- a/src/grib_accessor_class_data_ccsds_packing.cc
+++ b/src/grib_accessor_class_data_ccsds_packing.cc
@@ -573,7 +573,7 @@ static int unpack(grib_accessor* a, T* val, size_t* len)
 
     if ((err = aec_buffer_decode(&strm)) != AEC_OK) {
         grib_context_log(a->context, GRIB_LOG_ERROR, "CCSDS %s: aec_buffer_decode error %d (%s)\n",
-                         __PRETTY_FUNCTION__, err, aec_get_error_message(err));
+                         __func__, err, aec_get_error_message(err));
         err = GRIB_ENCODING_ERROR;
         goto cleanup;
     }