diff --git a/code/qcommon/common.cpp b/code/qcommon/common.cpp
index c257790a1c..299fc478ef 100644
--- a/code/qcommon/common.cpp
+++ b/code/qcommon/common.cpp
@@ -404,7 +404,7 @@ void Com_ParseCommandLine( char *commandLine ) {
 Com_SafeMode
 
 Check for "safe" on the command line, which will
-skip loading of jaconfig.cfg
+skip loading of openjk_sp.cfg
 ===================
 */
 qboolean Com_SafeMode( void ) {
@@ -1013,9 +1013,9 @@ void Com_Init( char *commandLine ) {
 		
 		Cbuf_AddText ("exec default.cfg\n");
 
-		// skip the jaconfig.cfg if "safe" is on the command line
+		// skip the openjk_sp.cfg if "safe" is on the command line
 		if ( !Com_SafeMode() ) {
-			Cbuf_AddText ("exec jaconfig.cfg\n");
+			Cbuf_AddText ("exec openjk_sp.cfg\n");
 		}
 
 		Cbuf_AddText ("exec autoexec.cfg\n");
@@ -1144,7 +1144,6 @@ void Com_Init( char *commandLine ) {
 //==================================================================
 
 void Com_WriteConfigToFile( const char *filename ) {
-#ifndef _XBOX
 	fileHandle_t	f;
 
 	f = FS_FOpenFileWrite( filename );
@@ -1153,11 +1152,10 @@ void Com_WriteConfigToFile( const char *filename ) {
 		return;
 	}
 
-	FS_Printf (f, "// generated by Star Wars Jedi Academy, do not modify\n");
+	FS_Printf (f, "// generated by OpenJK, do not modify\n");
 	Key_WriteBindings (f);
 	Cvar_WriteVariables (f);
 	FS_FCloseFile( f );
-#endif
 }
 
 
@@ -1180,7 +1178,7 @@ void Com_WriteConfiguration( void ) {
 	}
 	cvar_modifiedFlags &= ~CVAR_ARCHIVE;
 
-	Com_WriteConfigToFile( "jaconfig.cfg" );
+	Com_WriteConfigToFile( "openjk_sp.cfg" );
 }