diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae28cd5e5..433dc939a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,8 +206,8 @@ list( APPEND grib_api_srcs
     grib_accessor_class_data_g1second_order_general_packing.c
     grib_accessor_class_data_g1second_order_general_extended_packing.c
     grib_accessor_class_g2grid.c
-    grib_accessor_class_unexpanded_descriptors.c
-    grib_accessor_class_expanded_descriptors.c
+    grib_accessor_class_bufr_unexpanded_descriptors.c
+    grib_accessor_class_bufr_expanded_descriptors.c
     grib_accessor_class_bufrdc_expanded_descriptors.c
     grib_accessor_class_data_apply_bitmap.c
     grib_accessor_class_data_apply_boustrophedonic.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 266f1c84c..a279ece2f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -223,8 +223,8 @@ libeccodes_la_prototypes= \
 	grib_accessor_class_data_g1second_order_general_packing.c \
 	grib_accessor_class_data_g1second_order_general_extended_packing.c \
 	grib_accessor_class_g2grid.c \
-	grib_accessor_class_unexpanded_descriptors.c \
-	grib_accessor_class_expanded_descriptors.c \
+	grib_accessor_class_bufr_unexpanded_descriptors.c \
+	grib_accessor_class_bufr_expanded_descriptors.c \
 	grib_accessor_class_bufrdc_expanded_descriptors.c \
 	grib_accessor_class_data_apply_bitmap.c \
 	grib_accessor_class_data_apply_boustrophedonic.c \
diff --git a/src/grib_accessor_class_expanded_descriptors.c b/src/grib_accessor_class_bufr_expanded_descriptors.c
similarity index 100%
rename from src/grib_accessor_class_expanded_descriptors.c
rename to src/grib_accessor_class_bufr_expanded_descriptors.c
diff --git a/src/grib_accessor_class_unexpanded_descriptors.c b/src/grib_accessor_class_bufr_unexpanded_descriptors.c
similarity index 100%
rename from src/grib_accessor_class_unexpanded_descriptors.c
rename to src/grib_accessor_class_bufr_unexpanded_descriptors.c
diff --git a/src/grib_api_prototypes.h b/src/grib_api_prototypes.h
index be3e1e99d..51d18bd66 100644
--- a/src/grib_api_prototypes.h
+++ b/src/grib_api_prototypes.h
@@ -632,9 +632,9 @@ void accessor_variable_set_type(grib_accessor *a, int type);
 
 /* grib_accessor_class_g2grid.c */
 
-/* grib_accessor_class_unexpanded_descriptors.c */
+/* grib_accessor_class_bufr_unexpanded_descriptors.c */
 
-/* grib_accessor_class_expanded_descriptors.c */
+/* grib_accessor_class_bufr_expanded_descriptors.c */
 int grib_accessor_class_expanded_descriptors_set_do_expand(grib_accessor *a, long do_expand);
 bufr_descriptors_array *grib_accessor_class_expanded_descriptors_get_expanded(grib_accessor *a, int *err);
 
diff --git a/windows/msvc/grib_api_lib/grib_api_lib.vcproj b/windows/msvc/grib_api_lib/grib_api_lib.vcproj
index 8a52bc4ae..cfedf7700 100644
--- a/windows/msvc/grib_api_lib/grib_api_lib.vcproj
+++ b/windows/msvc/grib_api_lib/grib_api_lib.vcproj
@@ -757,7 +757,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\grib_accessor_class_expanded_descriptors.c"
+				RelativePath="..\..\..\src\grib_accessor_class_bufr_expanded_descriptors.c"
 				>
 			</File>
 			<File
@@ -1285,7 +1285,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\grib_accessor_class_unexpanded_descriptors.c"
+				RelativePath="..\..\..\src\grib_accessor_class_bufr_unexpanded_descriptors.c"
 				>
 			</File>
 			<File