diff --git a/samples/BUFR3.bufr.tmpl b/samples/BUFR3.tmpl
similarity index 100%
rename from samples/BUFR3.bufr.tmpl
rename to samples/BUFR3.tmpl
diff --git a/samples/BUFR3_local.bufr.tmpl b/samples/BUFR3_local.tmpl
similarity index 100%
rename from samples/BUFR3_local.bufr.tmpl
rename to samples/BUFR3_local.tmpl
diff --git a/samples/BUFR3_local_satellite.bufr.tmpl b/samples/BUFR3_local_satellite.tmpl
similarity index 100%
rename from samples/BUFR3_local_satellite.bufr.tmpl
rename to samples/BUFR3_local_satellite.tmpl
diff --git a/samples/BUFR4.bufr.tmpl b/samples/BUFR4.tmpl
similarity index 100%
rename from samples/BUFR4.bufr.tmpl
rename to samples/BUFR4.tmpl
diff --git a/samples/BUFR4_local.bufr.tmpl b/samples/BUFR4_local.tmpl
similarity index 100%
rename from samples/BUFR4_local.bufr.tmpl
rename to samples/BUFR4_local.tmpl
diff --git a/samples/BUFR4_local_satellite.bufr.tmpl b/samples/BUFR4_local_satellite.tmpl
similarity index 100%
rename from samples/BUFR4_local_satellite.bufr.tmpl
rename to samples/BUFR4_local_satellite.tmpl
diff --git a/src/grib_dumper_class_fortran.c b/src/grib_dumper_class_fortran.c
index 7c91dfb74..5f0454fca 100644
--- a/src/grib_dumper_class_fortran.c
+++ b/src/grib_dumper_class_fortran.c
@@ -807,11 +807,11 @@ static void header(grib_dumper* d, grib_handle* h)
     if (localSectionPresent && bufrHeaderCentre==98 ) {
         grib_get_long(h,"isSatellite",&isSatellite);
         if (isSatellite)
-            sprintf(sampleName,"BUFR%ld_local_satellite.bufr",edition);
+            sprintf(sampleName,"BUFR%ld_local_satellite",edition);
         else
-            sprintf(sampleName,"BUFR%ld_local.bufr",edition);
+            sprintf(sampleName,"BUFR%ld_local",edition);
     } else {
-        sprintf(sampleName,"BUFR%ld.bufr",edition);
+        sprintf(sampleName,"BUFR%ld",edition);
     }
 
     if (d->count<2) {
diff --git a/src/grib_dumper_class_python.c b/src/grib_dumper_class_python.c
index 83d6e7208..d1373c101 100644
--- a/src/grib_dumper_class_python.c
+++ b/src/grib_dumper_class_python.c
@@ -785,11 +785,11 @@ static void header(grib_dumper* d, grib_handle* h)
     if (localSectionPresent && bufrHeaderCentre==98 ) {
         grib_get_long(h,"isSatellite",&isSatellite);
         if (isSatellite)
-            sprintf(sampleName,"BUFR%ld_local_satellite.bufr",edition);
+            sprintf(sampleName,"BUFR%ld_local_satellite",edition);
         else
-            sprintf(sampleName,"BUFR%ld_local.bufr",edition);
+            sprintf(sampleName,"BUFR%ld_local",edition);
     } else {
-        sprintf(sampleName,"BUFR%ld.bufr",edition);
+        sprintf(sampleName,"BUFR%ld",edition);
     }
 
     if (d->count<2) {