diff --git a/wrlib/Makefile.am b/wrlib/Makefile.am
index 910c1f7e..617e4536 100644
--- a/wrlib/Makefile.am
+++ b/wrlib/Makefile.am
@@ -36,28 +36,28 @@ libwraster_la_SOURCES = 	\
 	convolve.c	\
 	save_xpm.c	\
 	xutil.c		\
-	ppm.c
+	load_ppm.c
 
 if USE_GIF
-libwraster_la_SOURCES += gif.c
+libwraster_la_SOURCES += load_gif.c
 endif
 
 if USE_JPEG
-libwraster_la_SOURCES += jpeg.c
+libwraster_la_SOURCES += load_jpeg.c
 endif
 
 if USE_PNG
-libwraster_la_SOURCES += png.c
+libwraster_la_SOURCES += load_png.c
 endif
 
 if USE_TIFF
-libwraster_la_SOURCES += tiff.c
+libwraster_la_SOURCES += load_tiff.c
 endif
 
 if USE_XPM
-libwraster_la_SOURCES += xpm.c
+libwraster_la_SOURCES += load_xpm.c
 else
-libwraster_la_SOURCES += nxpm.c
+libwraster_la_SOURCES += load_xpm_normalized.c
 endif
 
 LTCOMPILE2=`echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//`
diff --git a/wrlib/gif.c b/wrlib/load_gif.c
similarity index 100%
rename from wrlib/gif.c
rename to wrlib/load_gif.c
diff --git a/wrlib/jpeg.c b/wrlib/load_jpeg.c
similarity index 100%
rename from wrlib/jpeg.c
rename to wrlib/load_jpeg.c
diff --git a/wrlib/png.c b/wrlib/load_png.c
similarity index 100%
rename from wrlib/png.c
rename to wrlib/load_png.c
diff --git a/wrlib/ppm.c b/wrlib/load_ppm.c
similarity index 100%
rename from wrlib/ppm.c
rename to wrlib/load_ppm.c
diff --git a/wrlib/tiff.c b/wrlib/load_tiff.c
similarity index 100%
rename from wrlib/tiff.c
rename to wrlib/load_tiff.c
diff --git a/wrlib/xpm.c b/wrlib/load_xpm.c
similarity index 100%
rename from wrlib/xpm.c
rename to wrlib/load_xpm.c
diff --git a/wrlib/nxpm.c b/wrlib/load_xpm_normalized.c
similarity index 100%
rename from wrlib/nxpm.c
rename to wrlib/load_xpm_normalized.c