diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-export.c
similarity index 100%
rename from plug-ins/common/file-gif-save.c
rename to plug-ins/common/file-gif-export.c
diff --git a/plug-ins/common/file-pdf-save.c b/plug-ins/common/file-pdf-export.c
similarity index 99%
rename from plug-ins/common/file-pdf-save.c
rename to plug-ins/common/file-pdf-export.c
index 923582b18e..621ca9e16b 100644
--- a/plug-ins/common/file-pdf-save.c
+++ b/plug-ins/common/file-pdf-export.c
@@ -1,6 +1,6 @@
 /* GIMP - The GNU Image Manipulation Program
  *
- * file-pdf-save.c - PDF file exporter, based on the cairo PDF surface
+ * file-pdf-export.c - PDF file exporter, based on the cairo PDF surface
  *
  * Copyright (C) 2010 Barak Itkin <lightningismyname@gmail.com>
  *
diff --git a/plug-ins/common/gimprc.common b/plug-ins/common/gimprc.common
deleted file mode 100644
index 2f4e774933..0000000000
--- a/plug-ins/common/gimprc.common
+++ /dev/null
@@ -1,77 +0,0 @@
-align_layers_RC = align-layers.rc.o
-animation_optimize_RC = animation-optimize.rc.o
-animation_play_RC = animation-play.rc.o
-blinds_RC = blinds.rc.o
-border_average_RC = border-average.rc.o
-busy_dialog_RC = busy-dialog.rc.o
-checkerboard_RC = checkerboard.rc.o
-cml_explorer_RC = cml-explorer.rc.o
-colormap_remap_RC = colormap-remap.rc.o
-compose_RC = compose.rc.o
-contrast_retinex_RC = contrast-retinex.rc.o
-crop_zealous_RC = crop-zealous.rc.o
-curve_bend_RC = curve-bend.rc.o
-decompose_RC = decompose.rc.o
-depth_merge_RC = depth-merge.rc.o
-despeckle_RC = despeckle.rc.o
-destripe_RC = destripe.rc.o
-file_aa_RC = file-aa.rc.o
-file_cel_RC = file-cel.rc.o
-file_compressor_RC = file-compressor.rc.o
-file_csource_RC = file-csource.rc.o
-file_desktop_link_RC = file-desktop-link.rc.o
-file_dicom_RC = file-dicom.rc.o
-file_gbr_RC = file-gbr.rc.o
-file_gegl_RC = file-gegl.rc.o
-file_gif_load_RC = file-gif-load.rc.o
-file_gif_save_RC = file-gif-save.rc.o
-file_gih_RC = file-gih.rc.o
-file_glob_RC = file-glob.rc.o
-file_header_RC = file-header.rc.o
-file_heif_RC = file-heif.rc.o
-file_html_table_RC = file-html-table.rc.o
-file_jp2_load_RC = file-jp2-load.rc.o
-file_jpegxl_RC = file-jpegxl.rc.o
-file_mng_RC = file-mng.rc.o
-file_pat_RC = file-pat.rc.o
-file_pcx_RC = file-pcx.rc.o
-file_pdf_load_RC = file-pdf-load.rc.o
-file_pdf_save_RC = file-pdf-save.rc.o
-file_pix_RC = file-pix.rc.o
-file_png_RC = file-png.rc.o
-file_pnm_RC = file-pnm.rc.o
-file_ps_RC = file-ps.rc.o
-file_psp_RC = file-psp.rc.o
-file_raw_data_RC = file-raw-data.rc.o
-file_sunras_RC = file-sunras.rc.o
-file_svg_RC = file-svg.rc.o
-file_tga_RC = file-tga.rc.o
-file_wbmp_RC = file-wbmp.rc.o
-file_wmf_RC = file-wmf.rc.o
-file_xbm_RC = file-xbm.rc.o
-file_xmc_RC = file-xmc.rc.o
-file_xpm_RC = file-xpm.rc.o
-file_xwd_RC = file-xwd.rc.o
-film_RC = film.rc.o
-gradient_map_RC = gradient-map.rc.o
-grid_RC = grid.rc.o
-guillotine_RC = guillotine.rc.o
-hot_RC = hot.rc.o
-jigsaw_RC = jigsaw.rc.o
-mail_RC = mail.rc.o
-nl_filter_RC = nl-filter.rc.o
-plugin_browser_RC = plugin-browser.rc.o
-procedure_browser_RC = procedure-browser.rc.o
-qbist_RC = qbist.rc.o
-sample_colorize_RC = sample-colorize.rc.o
-smooth_palette_RC = smooth-palette.rc.o
-sparkle_RC = sparkle.rc.o
-sphere_designer_RC = sphere-designer.rc.o
-tile_RC = tile.rc.o
-tile_small_RC = tile-small.rc.o
-unit_editor_RC = unit-editor.rc.o
-van_gogh_lic_RC = van-gogh-lic.rc.o
-warp_RC = warp.rc.o
-wavelet_decompose_RC = wavelet-decompose.rc.o
-web_browser_RC = web-browser.rc.o
-web_page_RC = web-page.rc.o
diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
index c266ef10c4..e06e174343 100644
--- a/plug-ins/common/meson.build
+++ b/plug-ins/common/meson.build
@@ -33,7 +33,7 @@ common_plugins_list = [
   { 'name': 'file-gif-load',
     'deps': [ gtk3, gegl, gdk_pixbuf, cairo, ],
   },
-  { 'name': 'file-gif-save', },
+  { 'name': 'file-gif-export', },
   { 'name': 'file-gih', },
   { 'name': 'file-glob',
     'deps': [ gtk3, gegl, gdk_pixbuf, cairo,  ],
@@ -123,7 +123,7 @@ if libmng.found()
 endif
 
 if cairopdf.found()
-  common_plugins_list += { 'name': 'file-pdf-save',
+  common_plugins_list += { 'name': 'file-pdf-export',
     'deps': [ gtk3, gegl, gdk_pixbuf, poppler, cairo, cairopdf ],
   }
 endif
diff --git a/plug-ins/file-bmp/bmp-save.c b/plug-ins/file-bmp/bmp-export.c
similarity index 99%
rename from plug-ins/file-bmp/bmp-save.c
rename to plug-ins/file-bmp/bmp-export.c
index 0f9b929344..13aa9edbd5 100644
--- a/plug-ins/file-bmp/bmp-save.c
+++ b/plug-ins/file-bmp/bmp-export.c
@@ -37,7 +37,7 @@
 #include <libgimp/gimpui.h>
 
 #include "bmp.h"
-#include "bmp-save.h"
+#include "bmp-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-bmp/bmp-save.h b/plug-ins/file-bmp/bmp-export.h
similarity index 93%
rename from plug-ins/file-bmp/bmp-save.h
rename to plug-ins/file-bmp/bmp-export.h
index abbb114009..57d83af7ed 100644
--- a/plug-ins/file-bmp/bmp-save.h
+++ b/plug-ins/file-bmp/bmp-export.h
@@ -16,8 +16,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef __BMP_SAVE_H__
-#define __BMP_SAVE_H__
+#ifndef __BMP_EXPORT_H__
+#define __BMP_EXPORT_H__
 
 
 GimpPDBStatusType   export_image (GFile         *file,
@@ -29,4 +29,4 @@ GimpPDBStatusType   export_image (GFile         *file,
                                   GError       **error);
 
 
-#endif /* __BMP_SAVE_H__ */
+#endif /* __BMP_EXPORT_H__ */
diff --git a/plug-ins/file-bmp/bmp.c b/plug-ins/file-bmp/bmp.c
index 96112ff78d..333ea929b3 100644
--- a/plug-ins/file-bmp/bmp.c
+++ b/plug-ins/file-bmp/bmp.c
@@ -61,7 +61,7 @@
 
 #include "bmp.h"
 #include "bmp-load.h"
-#include "bmp-save.h"
+#include "bmp-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-bmp/meson.build b/plug-ins/file-bmp/meson.build
index 3b41ba8153..07bb880ac8 100644
--- a/plug-ins/file-bmp/meson.build
+++ b/plug-ins/file-bmp/meson.build
@@ -2,7 +2,7 @@ plugin_name = 'file-bmp'
 
 plugin_sources = [
   'bmp-load.c',
-  'bmp-save.c',
+  'bmp-export.c',
   'bmp.c',
 ]
 
diff --git a/plug-ins/file-icns/file-icns-save.c b/plug-ins/file-icns/file-icns-export.c
similarity index 99%
rename from plug-ins/file-icns/file-icns-save.c
rename to plug-ins/file-icns/file-icns-export.c
index 2c3ffb5210..3ee2c5896f 100644
--- a/plug-ins/file-icns/file-icns-save.c
+++ b/plug-ins/file-icns/file-icns-export.c
@@ -1,7 +1,7 @@
 /* GIMP - The GNU Image Manipulation Program
  * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
  *
- * file-icns-save.c
+ * file-icns-export.c
  * Copyright (C) 2004 Brion Vibber <brion@pobox.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
 #include "file-icns.h"
 #include "file-icns-data.h"
 #include "file-icns-load.h"
-#include "file-icns-save.h"
+#include "file-icns-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-icns/file-icns-save.h b/plug-ins/file-icns/file-icns-export.h
similarity index 90%
rename from plug-ins/file-icns/file-icns-save.h
rename to plug-ins/file-icns/file-icns-export.h
index c61272675b..cc997901ba 100644
--- a/plug-ins/file-icns/file-icns-save.h
+++ b/plug-ins/file-icns/file-icns-export.h
@@ -1,7 +1,7 @@
 /* GIMP - The GNU Image Manipulation Program
  * Copyright (C) 1995-1999 Spencer Kimball and Peter Mattis
  *
- * file-icns-save.h
+ * file-icns-export.h
  * Copyright (C) 2004 Brion Vibber <brion@pobox.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef __ICNS_SAVE_H__
-#define __ICNS_SAVE_H__
+#ifndef __ICNS_EXPORT_H__
+#define __ICNS_EXPORT_H__
 
 
 GimpPDBStatusType icns_save_image (GFile     *file,
@@ -27,4 +27,4 @@ GimpPDBStatusType icns_save_image (GFile     *file,
                                    gint32     run_mode,
                                    GError   **error);
 
-#endif /* __ICNS_SAVE_H__ */
+#endif /* __ICNS_EXPORT_H__ */
diff --git a/plug-ins/file-icns/file-icns.c b/plug-ins/file-icns/file-icns.c
index eafc7c0259..b25ceb2d26 100644
--- a/plug-ins/file-icns/file-icns.c
+++ b/plug-ins/file-icns/file-icns.c
@@ -32,7 +32,7 @@
 
 #include "file-icns.h"
 #include "file-icns-load.h"
-#include "file-icns-save.h"
+#include "file-icns-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-icns/meson.build b/plug-ins/file-icns/meson.build
index b39dcf7131..c96a421935 100644
--- a/plug-ins/file-icns/meson.build
+++ b/plug-ins/file-icns/meson.build
@@ -3,7 +3,7 @@ plugin_name = 'file-icns'
 plugin_sources = [
   'file-icns-data.c',
   'file-icns-load.c',
-  'file-icns-save.c',
+  'file-icns-export.c',
   'file-icns.c',
 ]
 
diff --git a/plug-ins/file-ico/ico-dialog.c b/plug-ins/file-ico/ico-dialog.c
index a531ca4898..e5f1fc87fa 100644
--- a/plug-ins/file-ico/ico-dialog.c
+++ b/plug-ins/file-ico/ico-dialog.c
@@ -28,7 +28,7 @@
 
 #include "ico.h"
 #include "ico-dialog.h"
-#include "ico-save.h"
+#include "ico-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-ico/ico-save.c b/plug-ins/file-ico/ico-export.c
similarity index 99%
rename from plug-ins/file-ico/ico-save.c
rename to plug-ins/file-ico/ico-export.c
index 231a2b4a66..a9a6c55330 100644
--- a/plug-ins/file-ico/ico-save.c
+++ b/plug-ins/file-ico/ico-export.c
@@ -34,7 +34,7 @@
 
 #include "ico.h"
 #include "ico-load.h"
-#include "ico-save.h"
+#include "ico-export.h"
 #include "ico-dialog.h"
 
 #include "libgimp/stdplugins-intl.h"
diff --git a/plug-ins/file-ico/ico-save.h b/plug-ins/file-ico/ico-export.h
similarity index 96%
rename from plug-ins/file-ico/ico-save.h
rename to plug-ins/file-ico/ico-export.h
index 9b49a9296f..25e620490d 100644
--- a/plug-ins/file-ico/ico-save.h
+++ b/plug-ins/file-ico/ico-export.h
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef __ICO_SAVE_H__
-#define __ICO_SAVE_H__
+#ifndef __ICO_EXPORT_H__
+#define __ICO_EXPORT_H__
 
 
 GimpPDBStatusType ico_export_image        (GFile         *file,
@@ -51,4 +51,4 @@ gboolean          ico_cmap_contains_black (const guchar  *cmap,
                                            gint           num_colors);
 
 
-#endif /* __ICO_SAVE_H__ */
+#endif /* __ICO_EXPORT_H__ */
diff --git a/plug-ins/file-ico/ico.c b/plug-ins/file-ico/ico.c
index abfe09c32a..81a64277cb 100644
--- a/plug-ins/file-ico/ico.c
+++ b/plug-ins/file-ico/ico.c
@@ -32,7 +32,7 @@
 
 #include "ico.h"
 #include "ico-load.h"
-#include "ico-save.h"
+#include "ico-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-ico/meson.build b/plug-ins/file-ico/meson.build
index 1f682057bd..b21a774b41 100644
--- a/plug-ins/file-ico/meson.build
+++ b/plug-ins/file-ico/meson.build
@@ -3,7 +3,7 @@ plugin_name = 'file-ico'
 plugin_sources = [
   'ico-dialog.c',
   'ico-load.c',
-  'ico-save.c',
+  'ico-export.c',
   'ico.c',
 ]
 
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-export.c
similarity index 99%
rename from plug-ins/file-jpeg/jpeg-save.c
rename to plug-ins/file-jpeg/jpeg-export.c
index 84edf74c9e..1044bce0c5 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-export.c
@@ -41,7 +41,7 @@
 #include "jpeg.h"
 #include "jpeg-icc.h"
 #include "jpeg-load.h"
-#include "jpeg-save.h"
+#include "jpeg-export.h"
 #include "jpeg-settings.h"
 
 /* See bugs #63610 and #61088 for a discussion about the quality settings */
@@ -642,7 +642,7 @@ export_image (GFile                *file,
   if (save_comment && comment && *comment)
     {
 #ifdef GIMP_UNSTABLE
-      g_print ("jpeg-save: saving image comment (%d bytes)\n",
+      g_print ("jpeg-export: saving image comment (%d bytes)\n",
                (int) strlen (comment));
 #endif
       jpeg_write_marker (&cinfo, JPEG_COM,
diff --git a/plug-ins/file-jpeg/jpeg-save.h b/plug-ins/file-jpeg/jpeg-export.h
similarity index 94%
rename from plug-ins/file-jpeg/jpeg-save.h
rename to plug-ins/file-jpeg/jpeg-export.h
index b9e503a941..28b864cb33 100644
--- a/plug-ins/file-jpeg/jpeg-save.h
+++ b/plug-ins/file-jpeg/jpeg-export.h
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef __JPEG_SAVE_H__
-#define __JPEG_SAVE_H__
+#ifndef __JPEG_EXPORT_H__
+#define __JPEG_EXPORT_H__
 
 
 extern GimpImage       *orig_image_global;
@@ -35,4 +35,4 @@ gboolean    save_dialog        (GimpProcedure        *procedure,
                                 GimpDrawable         *drawable,
                                 GimpImage            *image);
 
-#endif /* __JPEG_SAVE_H__ */
+#endif /* __JPEG_EXPORT_H__ */
diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c
index e984e583d1..d03c52bf4d 100644
--- a/plug-ins/file-jpeg/jpeg.c
+++ b/plug-ins/file-jpeg/jpeg.c
@@ -32,7 +32,7 @@
 #include "jpeg.h"
 #include "jpeg-settings.h"
 #include "jpeg-load.h"
-#include "jpeg-save.h"
+#include "jpeg-export.h"
 
 
 typedef struct _Jpeg      Jpeg;
diff --git a/plug-ins/file-jpeg/meson.build b/plug-ins/file-jpeg/meson.build
index b6c67e1b97..41c7f79536 100644
--- a/plug-ins/file-jpeg/meson.build
+++ b/plug-ins/file-jpeg/meson.build
@@ -4,7 +4,7 @@ plugin_sources = [
   'jpeg-icc.c',
   'jpeg-load.c',
   'jpeg-quality.c',
-  'jpeg-save.c',
+  'jpeg-export.c',
   'jpeg-settings.c',
   'jpeg.c',
 ]
diff --git a/plug-ins/file-psd/meson.build b/plug-ins/file-psd/meson.build
index d9cf84ff84..cf50d0e0f9 100644
--- a/plug-ins/file-psd/meson.build
+++ b/plug-ins/file-psd/meson.build
@@ -4,7 +4,7 @@ plugin_sources = [
   'psd-image-res-load.c',
   'psd-layer-res-load.c',
   'psd-load.c',
-  'psd-save.c',
+  'psd-export.c',
   'psd-thumb-load.c',
   'psd-util.c',
   'psd.c',
diff --git a/plug-ins/file-psd/psd-save.c b/plug-ins/file-psd/psd-export.c
similarity index 99%
rename from plug-ins/file-psd/psd-save.c
rename to plug-ins/file-psd/psd-export.c
index 7df3dd2e1e..541229f30b 100644
--- a/plug-ins/file-psd/psd-save.c
+++ b/plug-ins/file-psd/psd-export.c
@@ -77,7 +77,7 @@
 
 #include "psd.h"
 #include "psd-util.h"
-#include "psd-save.h"
+#include "psd-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
@@ -1119,7 +1119,7 @@ get_compress_channel_data (guchar  *channel_data,
   return len;
 }
 
-/* Ported /from plug-ins/file-tiff/file-tiff-save.c */
+/* Ported /from plug-ins/file-tiff/file-tiff-export.c */
 static void
 double_to_psd_fixed (gdouble  value,
                      gchar   *target)
@@ -1143,7 +1143,7 @@ double_to_psd_fixed (gdouble  value,
   target[3] = f & 0xFF;
 }
 
-/* Ported from /plug-ins/file-tiff/file-tiff-save.c */
+/* Ported from /plug-ins/file-tiff/file-tiff-export.c */
 static void
 save_paths (GOutputStream  *output,
             GimpImage      *image)
@@ -1238,7 +1238,7 @@ save_paths (GOutputStream  *output,
               num_points > 65535 ||
               num_points % 6)
             {
-              g_printerr ("psd-save: unsupported stroke type: "
+              g_printerr ("psd-export: unsupported stroke type: "
                           "%d (%d points)\n", type, num_points);
               continue;
             }
diff --git a/plug-ins/file-psd/psd-save.h b/plug-ins/file-psd/psd-export.h
similarity index 93%
rename from plug-ins/file-psd/psd-save.h
rename to plug-ins/file-psd/psd-export.h
index f4cd412ff5..8734bd14e8 100644
--- a/plug-ins/file-psd/psd-save.h
+++ b/plug-ins/file-psd/psd-export.h
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef __PSD_SAVE_H__
-#define __PSD_SAVE_H__
+#ifndef __PSD_EXPORT_H__
+#define __PSD_EXPORT_H__
 
 
 gboolean   export_image (GFile      *file,
@@ -28,4 +28,4 @@ gboolean   save_dialog  (GimpImage     *image,
                          GimpProcedure *procedure,
                          GObject       *config);
 
-#endif /* __PSD_SAVE_H__ */
+#endif /* __PSD_EXPORT_H__ */
diff --git a/plug-ins/file-psd/psd.c b/plug-ins/file-psd/psd.c
index 677d224475..bc9855953c 100644
--- a/plug-ins/file-psd/psd.c
+++ b/plug-ins/file-psd/psd.c
@@ -27,7 +27,7 @@
 
 #include "psd.h"
 #include "psd-load.h"
-#include "psd-save.h"
+#include "psd-export.h"
 #include "psd-thumb-load.h"
 
 #include "libgimp/stdplugins-intl.h"
diff --git a/plug-ins/file-tiff/file-tiff-save.c b/plug-ins/file-tiff/file-tiff-export.c
similarity index 99%
rename from plug-ins/file-tiff/file-tiff-save.c
rename to plug-ins/file-tiff/file-tiff-export.c
index 3d76fde2ac..cf0b477528 100644
--- a/plug-ins/file-tiff/file-tiff-save.c
+++ b/plug-ins/file-tiff/file-tiff-export.c
@@ -55,7 +55,7 @@
 
 #include "file-tiff.h"
 #include "file-tiff-io.h"
-#include "file-tiff-save.h"
+#include "file-tiff-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
@@ -196,7 +196,7 @@ save_paths (TIFF      *tif,
               num_points > 65535 ||
               num_points % 6)
             {
-              g_printerr ("tiff-save: unsupported stroke type: "
+              g_printerr ("tiff-export: unsupported stroke type: "
                           "%d (%d points)\n", type, num_points);
               continue;
             }
diff --git a/plug-ins/file-tiff/file-tiff-save.h b/plug-ins/file-tiff/file-tiff-export.h
similarity index 94%
rename from plug-ins/file-tiff/file-tiff-save.h
rename to plug-ins/file-tiff/file-tiff-export.h
index 005e41355d..6fee0cfc38 100644
--- a/plug-ins/file-tiff/file-tiff-save.h
+++ b/plug-ins/file-tiff/file-tiff-export.h
@@ -19,8 +19,8 @@
  * pablo.dangelo@web.de -- 16 Jan 2004
  */
 
-#ifndef __FILE_TIFF_SAVE_H__
-#define __FILE_TIFF_SAVE_H__
+#ifndef __FILE_TIFF_EXPORT_H__
+#define __FILE_TIFF_EXPORT_H__
 
 
 gboolean  export_image (GFile         *file,
@@ -40,4 +40,4 @@ gboolean  save_dialog  (GimpImage     *image,
                         gboolean       classic_tiff_failed);
 
 
-#endif /* __FILE_TIFF_SAVE_H__ */
+#endif /* __FILE_TIFF_EXPORT_H__ */
diff --git a/plug-ins/file-tiff/file-tiff.c b/plug-ins/file-tiff/file-tiff.c
index bb742a58e6..fab9424ba5 100644
--- a/plug-ins/file-tiff/file-tiff.c
+++ b/plug-ins/file-tiff/file-tiff.c
@@ -52,7 +52,7 @@
 #include "file-tiff.h"
 #include "file-tiff-io.h"
 #include "file-tiff-load.h"
-#include "file-tiff-save.h"
+#include "file-tiff-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-tiff/meson.build b/plug-ins/file-tiff/meson.build
index adc11fd61b..32134d7141 100644
--- a/plug-ins/file-tiff/meson.build
+++ b/plug-ins/file-tiff/meson.build
@@ -2,7 +2,7 @@ plugin_name = 'file-tiff'
 
 plugin_sources = [
   'file-tiff-io.c',
-  'file-tiff-save.c',
+  'file-tiff-export.c',
   'file-tiff.c',
   'file-tiff-load.c',
 ]
diff --git a/plug-ins/file-webp/file-webp-save.c b/plug-ins/file-webp/file-webp-export.c
similarity index 99%
rename from plug-ins/file-webp/file-webp-save.c
rename to plug-ins/file-webp/file-webp-export.c
index cfe5076522..20fc807190 100644
--- a/plug-ins/file-webp/file-webp-save.c
+++ b/plug-ins/file-webp/file-webp-export.c
@@ -37,7 +37,7 @@
 #include <webp/encode.h>
 #include <webp/mux.h>
 
-#include "file-webp-save.h"
+#include "file-webp-export.h"
 
 #include "libgimp/stdplugins-intl.h"
 
diff --git a/plug-ins/file-webp/file-webp-save.h b/plug-ins/file-webp/file-webp-export.h
similarity index 94%
rename from plug-ins/file-webp/file-webp-save.h
rename to plug-ins/file-webp/file-webp-export.h
index 1807136d7f..3aaa6749a2 100644
--- a/plug-ins/file-webp/file-webp-save.h
+++ b/plug-ins/file-webp/file-webp-export.h
@@ -19,8 +19,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef __WEBP_SAVE_H__
-#define __WEBP_SAVE_H__
+#ifndef __WEBP_EXPORT_H__
+#define __WEBP_EXPORT_H__
 
 
 gboolean   save_layer     (GFile         *file,
@@ -37,4 +37,4 @@ gboolean   save_animation (GFile         *file,
                            GError       **error);
 
 
-#endif /* __WEBP_SAVE_H__ */
+#endif /* __WEBP_EXPORT_H__ */
diff --git a/plug-ins/file-webp/file-webp.c b/plug-ins/file-webp/file-webp.c
index e924289523..80aeb615bf 100644
--- a/plug-ins/file-webp/file-webp.c
+++ b/plug-ins/file-webp/file-webp.c
@@ -30,7 +30,7 @@
 
 #include "file-webp-dialog.h"
 #include "file-webp-load.h"
-#include "file-webp-save.h"
+#include "file-webp-export.h"
 #include "file-webp.h"
 
 #include "libgimp/stdplugins-intl.h"
diff --git a/plug-ins/file-webp/meson.build b/plug-ins/file-webp/meson.build
index 5fb81e19f5..8a856ab7ca 100644
--- a/plug-ins/file-webp/meson.build
+++ b/plug-ins/file-webp/meson.build
@@ -5,7 +5,7 @@ plugin_name = 'file-webp'
 plugin_sources = [
   'file-webp-dialog.c',
   'file-webp-load.c',
-  'file-webp-save.c',
+  'file-webp-export.c',
   'file-webp.c',
 ]