diff --git a/stepmania/PBProject/Info-StepMania.plist b/stepmania/PBProject/Info-StepMania.plist
index 908df58b2c..675bb7dfb4 100644
--- a/stepmania/PBProject/Info-StepMania.plist
+++ b/stepmania/PBProject/Info-StepMania.plist
@@ -7,15 +7,15 @@
 	<key>CFBundleExecutable</key>
 	<string>EXECUTABLE_NAME</string>
 	<key>CFBundleGetInfoString</key>
-	<string>PRODUCT_NAME_BARE PRODUCT_VER_BARE</string>
+	<string>PRODUCT_ID_BARE PRODUCT_VER_BARE</string>
 	<key>CFBundleIconFile</key>
 	<string>smicon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.PRODUCT_NAME_BARE</string>
+	<string>com.PRODUCT_ID_BARE</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>PRODUCT_NAME_BARE</string>
+	<string>PRODUCT_FAMILY_BARE</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.m b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.m
index da6c357575..07d1d850e5 100644
--- a/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.m
+++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_Cocoa.m
@@ -59,7 +59,7 @@ void MakeNewCocoaWindow( const void *data, unsigned length )
 	ADD_ACTIONb( mt, g_window, setOneShot:, YES );
 	ADD_ACTIONb( mt, g_window, setExcludedFromWindowsMenu:, YES );
 	ADD_ACTIONb( mt, g_window, useOptimizedDrawing:, YES );
-	ADD_ACTION1( mt, g_window, setTitle:, @PRODUCT_NAME );
+	ADD_ACTION1( mt, g_window, setTitle:, @PRODUCT_FAMILY );
 	ADD_ACTION0( mt, g_window, center );
 	// Set subviews.
 	ADD_ACTION1( mt, view, addSubview:, g_text );
diff --git a/stepmania/src/archutils/Darwin/Crash.m b/stepmania/src/archutils/Darwin/Crash.m
index 6195036063..15af691a82 100644
--- a/stepmania/src/archutils/Darwin/Crash.m
+++ b/stepmania/src/archutils/Darwin/Crash.m
@@ -3,10 +3,10 @@
 void InformUserOfCrash( const char *sPath )
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	NSString *s = @PRODUCT_NAME " has crashed. Debugging information has been output to\n\n%s\n\n"
+	NSString *s = @PRODUCT_FAMILY " has crashed. Debugging information has been output to\n\n%s\n\n"
 	@"Please file a bug report at\n\n" REPORT_BUG_URL;
 	
-	int ret = NSRunCriticalAlertPanel( @PRODUCT_NAME " has crashed", s, @"File Bug Report",
+	int ret = NSRunCriticalAlertPanel( @PRODUCT_FAMILY " has crashed", s, @"File Bug Report",
 					   @"Quit", @"Open crashinfo.txt", sPath );
 	
 	NSWorkspace *ws = [NSWorkspace sharedWorkspace];
diff --git a/stepmania/src/archutils/Darwin/SMMain.mm b/stepmania/src/archutils/Darwin/SMMain.mm
index 2a5028fc25..6092956c51 100755
--- a/stepmania/src/archutils/Darwin/SMMain.mm
+++ b/stepmania/src/archutils/Darwin/SMMain.mm
@@ -84,17 +84,17 @@ static NSMenuItem *MenuItem( NSString *title, SEL action, NSString *code )
 static void setupMenus( void )
 {
 	// Get the localized strings from the file.
-	NSString *sWindow =          NSLocalizedString( @"Window",              @"Menu title" );
-	NSString *sHideOthers =      NSLocalizedString( @"Hide Others",         @"Menu item" );
-	NSString *sAbout =           NSLocalizedString( @"About " PRODUCT_NAME, @"Menu item" );
-	NSString *sHide =            NSLocalizedString( @"Hide " PRODUCT_NAME,  @"Menu item" );
-	NSString *sShowAll =         NSLocalizedString( @"Show All",            @"Menu item" );
-	NSString *sQuit =            NSLocalizedString( @"Quit " PRODUCT_NAME,  @"Menu item" );
-	NSString *sMinimize =        NSLocalizedString( @"Minimize",            @"Menu item" );
-	NSString *sEnterFullScreen = NSLocalizedString( @"Enter Full Screen",   @"Menu item" );
+	NSString *sWindow =          NSLocalizedString( @"Window",                @"Menu title" );
+	NSString *sHideOthers =      NSLocalizedString( @"Hide Others",           @"Menu item" );
+	NSString *sAbout =           NSLocalizedString( @"About " PRODUCT_FAMILY, @"Menu item" );
+	NSString *sHide =            NSLocalizedString( @"Hide " PRODUCT_FAMILY,  @"Menu item" );
+	NSString *sShowAll =         NSLocalizedString( @"Show All",              @"Menu item" );
+	NSString *sQuit =            NSLocalizedString( @"Quit " PRODUCT_FAMILY,  @"Menu item" );
+	NSString *sMinimize =        NSLocalizedString( @"Minimize",              @"Menu item" );
+	NSString *sEnterFullScreen = NSLocalizedString( @"Enter Full Screen",     @"Menu item" );
 	
 	NSMenu *mainMenu = [[[NSMenu alloc] initWithTitle:@""] autorelease];
-	NSMenu *appMenu = [[[NSMenu alloc] initWithTitle:@PRODUCT_NAME] autorelease];
+	NSMenu *appMenu = [[[NSMenu alloc] initWithTitle:@PRODUCT_FAMILY] autorelease];
 	NSMenu *windowMenu = [[[NSMenu alloc] initWithTitle:sWindow] autorelease];
 	NSMenuItem *hideOthers = MenuItem( sHideOthers, @selector(hideOtherApplications:), @"h" );