diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
index f68bd41cc2..e59c4c1985 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -240,7 +240,7 @@ void ArchHooks::MountInitialFilesystems( const RString &sDirOfExecutable )
 	 * scores.  It would need to handle permissions properly. */
 /*	RageFileManager::Mount( "dir", "/var/lib/games/stepmania", "/Save/Profiles" ); */
 	
-	// RString Home = getenv( "HOME" ) + "/" + PRODUCT_NAME;
+	// RString Home = getenv( "HOME" ) + "/" + PRODUCT_ID;
 
 	/*
 	 * Next: path to write general mutable user data.  If the above path fails (eg.
@@ -250,10 +250,10 @@ void ArchHooks::MountInitialFilesystems( const RString &sDirOfExecutable )
 	 * seems wrong to put lots of data (eg. music) in one.  Hmm. 
 	 */
 	/* XXX: create */
-/*	RageFileManager::Mount( "dir", Home + "." PRODUCT_NAME, "/Data" ); */
+/*	RageFileManager::Mount( "dir", Home + "." PRODUCT_ID, "/Data" ); */
 
 	/* Next, search ~/StepMania.  This is where users can put music, themes, etc. */
-	/* RageFileManager::Mount( "dir", Home + PRODUCT_NAME, "/" ); */
+	/* RageFileManager::Mount( "dir", Home + PRODUCT_ID, "/" ); */
 
 	/* Search for a directory with "Songs" in it.  Be careful: the CWD is likely to
 	 * be ~, and it's possible that some users will have a ~/Songs/ directory that
diff --git a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp
index 69ec8229a8..e569a72d5a 100644
--- a/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp
+++ b/stepmania/src/arch/Dialog/DialogDriver_Cocoa.cpp
@@ -11,7 +11,7 @@ static CFOptionFlags ShowAlert( CFOptionFlags flags, const RString& sMessage, CF
 	CFOptionFlags result;
 	CFStringRef text = CFStringCreateWithCString( NULL, sMessage, kCFStringEncodingUTF8 );
 	
-	CFUserNotificationDisplayAlert( 0.0, flags, NULL, NULL, NULL, CFSTR(PRODUCT_NAME),
+	CFUserNotificationDisplayAlert( 0.0, flags, NULL, NULL, NULL, CFSTR(PRODUCT_ID),
 					text, OK, alt, other, &result );
 	CFRelease( text );
 	return result;
diff --git a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
index e4dd2525c5..4b303b9db6 100644
--- a/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
+++ b/stepmania/src/archutils/Unix/CrashHandlerChild.cpp
@@ -275,7 +275,7 @@ static void child_process()
 		exit(1);
 	}
 	
-	fprintf( CrashDump, "%s crash report", PRODUCT_NAME_VER );
+	fprintf( CrashDump, "%s crash report", PRODUCT_ID_VER );
 #if defined(HAVE_VERSION_INFO)
 	fprintf( CrashDump, " (build %u)", version_num);
 #endif
@@ -359,7 +359,7 @@ static void child_process()
 	
 	fprintf( tty,
 		 "\n"
-		 PRODUCT_NAME " has crashed.  Debug information has been output to\n"
+		 PRODUCT_ID " has crashed.  Debug information has been output to\n"
 		 "\n"
 		 "    " + sCrashInfoPath + "\n"
 		 "\n"
diff --git a/stepmania/src/archutils/Xbox/GraphicsWindow.cpp b/stepmania/src/archutils/Xbox/GraphicsWindow.cpp
index 1f58ace69d..6e87bceff6 100644
--- a/stepmania/src/archutils/Xbox/GraphicsWindow.cpp
+++ b/stepmania/src/archutils/Xbox/GraphicsWindow.cpp
@@ -5,7 +5,7 @@
 #include "RageUtil.h"
 #include "RageDisplay.h"
 
-static const RString g_sClassName = RString(PRODUCT_NAME) + " LowLevelWindow_Win32";
+static const RString g_sClassName = RString(PRODUCT_ID) + " LowLevelWindow_Win32";
 
 static VideoModeParams g_CurrentParams;
 static bool g_bResolutionChanged = false;