diff --git a/PBProjects.tar.gz b/PBProjects.tar.gz
index 60cb8de78..c57d6a5af 100644
Binary files a/PBProjects.tar.gz and b/PBProjects.tar.gz differ
diff --git a/configure.in b/configure.in
index f6f7d82dd..550e46681 100644
--- a/configure.in
+++ b/configure.in
@@ -2073,8 +2073,8 @@ case "$target" in
         CheckMacGL
         CheckPTHREAD
         # Set up files for the main() stub
-        COPY_ARCH_SRC(src/main, macosx, SDL_main.m)
-        COPY_ARCH_SRC(src/main, macosx, SDL_main.h)
+        COPY_ARCH_SRC(src/main, macosx, SDLMain.m)
+        COPY_ARCH_SRC(src/main, macosx, SDLMain.h)
         # Set up files for the audio library
         if test x$enable_audio = xyes; then
             AUDIO_SUBDIRS="$AUDIO_SUBDIRS macrom"
diff --git a/sdl-config.in b/sdl-config.in
index 07af154e7..4b7b2e752 100644
--- a/sdl-config.in
+++ b/sdl-config.in
@@ -57,7 +57,7 @@ while test $# -gt 0; do
 @ENABLE_STATIC_TRUE@      echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
 @ENABLE_STATIC_TRUE@      ;;
 @TARGET_MACOSX_TRUE@    --nib)
-@TARGET_MACOSX_TRUE@      echo @datadir@/sdl/SDL_main.nib
+@TARGET_MACOSX_TRUE@      echo @datadir@/sdl/SDLMain.nib
 @TARGET_MACOSX_TRUE@      ;;
 @TARGET_MACOSX_TRUE@    --plist)
 @TARGET_MACOSX_TRUE@      echo @datadir@/sdl/Info.plist
diff --git a/src/main/Makefile.am b/src/main/Makefile.am
index 22c97c646..7296efc19 100644
--- a/src/main/Makefile.am
+++ b/src/main/Makefile.am
@@ -16,7 +16,7 @@ ARCH_SUBDIRS = $(srcdir)/beos \
 lib_LIBRARIES = libSDLmain.a
 
 if TARGET_MACOSX
-MAINLIB_ARCH_SRCS = SDL_main.m SDL_main.h
+MAINLIB_ARCH_SRCS = SDLMain.m SDLMain.h
 else
 MAINLIB_ARCH_SRCS = SDL_main.c
 endif
diff --git a/src/main/macosx/Info.plist.in b/src/main/macosx/Info.plist.in
index 8bbd3e818..b3d69abac 100644
--- a/src/main/macosx/Info.plist.in
+++ b/src/main/macosx/Info.plist.in
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>NSMainNibFile</key>
-	<string>SDL_main.nib</string>
+	<string>SDLMain.nib</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 </dict>
diff --git a/src/main/macosx/Makefile.am b/src/main/macosx/Makefile.am
index 0e6cf84f3..9d4b55c5c 100644
--- a/src/main/macosx/Makefile.am
+++ b/src/main/macosx/Makefile.am
@@ -1,27 +1,27 @@
-# On OS X, install the SDL_main.nib.
+# On OS X, install the SDLMain.nib.
 # We use an ugly hack to force the creation of the
 # destination dir, maybe somebody with more automake
 # experience knows how to do this properly?
 
 if TARGET_MACOSX
-masternibdatadir = $(datadir)/sdl/SDL_main.nib
+masternibdatadir = $(datadir)/sdl/SDLMain.nib
 masternibdata_DATA =		\
-	SDL_main.nib
+	SDLMain.nib
 
 nibdatadir = $(datadir)/sdl
 nibdata_DATA =			\
-	SDL_main.nib/classes.nib	\
-	SDL_main.nib/info.nib	\
-	SDL_main.nib/objects.nib	\
+	SDLMain.nib/classes.nib	\
+	SDLMain.nib/info.nib	\
+	SDLMain.nib/objects.nib	\
 	Info.plist
 endif
 
-EXTRA_DIST = SDL_main.h SDL_main.m
+EXTRA_DIST = SDLMain.h SDLMain.m
 
 # The nib and exports directories need to be copied into place
 # when building a distribution.
 dist-hook:
 	(cd $(distdir) && rm -f $(BUILT_SOURCES))
-	cp -rp SDL_main.nib $(distdir)
+	cp -rp SDLMain.nib $(distdir)
 	cp -rp exports $(distdir)
 	(cd $(distdir) && rm -rf `find . -name CVS`)
diff --git a/src/main/macosx/SDL_main.h b/src/main/macosx/SDLMain.h
similarity index 75%
rename from src/main/macosx/SDL_main.h
rename to src/main/macosx/SDLMain.h
index 0b734b726..b2a81abbf 100644
--- a/src/main/macosx/SDL_main.h
+++ b/src/main/macosx/SDLMain.h
@@ -1,4 +1,4 @@
-/*   SDL_main.h - main entry point for our Cocoa-ized SDL app
+/*   SDLMain.h - main entry point for our Cocoa-ized SDL app
        Darrell Walisser - dwaliss1@purdue.edu
 
     Feel free to customize this file to suit your needs
@@ -6,7 +6,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-@interface SDL_main : NSObject
+@interface SDLMain : NSObject
 {
 }
 - (IBAction)quit:(id)sender;
diff --git a/src/main/macosx/SDL_main.m b/src/main/macosx/SDLMain.m
similarity index 97%
rename from src/main/macosx/SDL_main.m
rename to src/main/macosx/SDLMain.m
index 9f2ba1536..42cc8a4ef 100644
--- a/src/main/macosx/SDL_main.m
+++ b/src/main/macosx/SDLMain.m
@@ -1,11 +1,11 @@
-/*   SDL_main.m - main entry point for our Cocoa-ized SDL app
+/*   SDLMain.m - main entry point for our Cocoa-ized SDL app
        Darrell Walisser - dwaliss1@purdue.edu
 
     Feel free to customize this file to suit your needs
 */
 
 #import "SDL.h"
-#import "SDL_main.h"
+#import "SDLMain.h"
 #import <sys/param.h> /* for MAXPATHLEN */
 #import <unistd.h>
 
@@ -20,7 +20,7 @@ static BOOL   gFinderLaunch;
 
 
 /* The main class of the application, the application's delegate */
-@implementation SDL_main
+@implementation SDLMain
 
 /* Invoked from the Quit menu item */
 - (void) quit:(id)sender
diff --git a/src/main/macosx/SDLMain.nib/classes.nib b/src/main/macosx/SDLMain.nib/classes.nib
index 3b416c576..f8f4e9a4b 100644
--- a/src/main/macosx/SDLMain.nib/classes.nib
+++ b/src/main/macosx/SDLMain.nib/classes.nib
@@ -3,7 +3,7 @@
         {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
         {
             ACTIONS = {makeFullscreen = id; quit = id; }; 
-            CLASS = SDL_main; 
+            CLASS = SDLMain; 
             LANGUAGE = ObjC; 
             SUPERCLASS = NSObject; 
         }