diff --git a/stepmania/src/RageSurface_Save_BMP.cpp b/stepmania/src/RageSurface_Save_BMP.cpp
index fe05d1cfe1..2f70c0860b 100644
--- a/stepmania/src/RageSurface_Save_BMP.cpp
+++ b/stepmania/src/RageSurface_Save_BMP.cpp
@@ -27,7 +27,7 @@ static void write_le32( RageFile &f, CString &sError, uint32_t val )
 	WriteBytes( f, sError, &val, sizeof(uint32_t) );
 }
 
-bool RageSurface_Save_BMP( RageSurface *surface, RageFile &f )
+bool RageSurfaceUtils::SaveBMP( RageSurface *surface, RageFile &f )
 {
 	/* Convert the surface to 24bpp. */
 	RageSurface *converted_surface;
diff --git a/stepmania/src/RageSurface_Save_BMP.h b/stepmania/src/RageSurface_Save_BMP.h
index d0e11411bd..bdc16cdc99 100644
--- a/stepmania/src/RageSurface_Save_BMP.h
+++ b/stepmania/src/RageSurface_Save_BMP.h
@@ -3,7 +3,10 @@
 
 struct RageSurface;
 class RageFile;
-bool RageSurface_Save_BMP( RageSurface *surface, RageFile &f );
+namespace RageSurfaceUtils
+{
+	bool SaveBMP( RageSurface *surface, RageFile &f );
+};
 
 #endif
 
diff --git a/stepmania/src/RageSurface_Save_JPEG.cpp b/stepmania/src/RageSurface_Save_JPEG.cpp
index 574045924c..212da10875 100644
--- a/stepmania/src/RageSurface_Save_JPEG.cpp
+++ b/stepmania/src/RageSurface_Save_JPEG.cpp
@@ -96,7 +96,7 @@ static void jpeg_RageFile_dest( jpeg::j_compress_ptr cinfo, RageFile &f )
 }
 
 /* Save a JPEG to a file.  cjpeg.c and example.c from jpeglib were helpful in writing this. */
-bool IMG_SaveJPG_RW( RageSurface *surface, RageFile &f, bool bHighQual )
+bool RageSurfaceUtils::SaveJPEG( RageSurface *surface, RageFile &f, bool bHighQual )
 {
 	RageSurface *dst_surface;
 	if( RageSurfaceUtils::ConvertSurface( surface, dst_surface,
diff --git a/stepmania/src/RageSurface_Save_JPEG.h b/stepmania/src/RageSurface_Save_JPEG.h
index c3572ac372..458f95f540 100644
--- a/stepmania/src/RageSurface_Save_JPEG.h
+++ b/stepmania/src/RageSurface_Save_JPEG.h
@@ -3,7 +3,10 @@
 
 struct RageSurface;
 class RageFile;
-bool IMG_SaveJPG_RW( RageSurface *surface, RageFile &f, bool bHighQual=true );
+namespace RageSurfaceUtils
+{
+	bool SaveJPEG( RageSurface *surface, RageFile &f, bool bHighQual=true );
+};
 
 #endif