diff -urN a/neo/CMakeLists.txt b/neo/CMakeLists.txt
--- a/neo/CMakeLists.txt	2012-07-20 19:32:22.383415497 +0200
+++ b/neo/CMakeLists.txt	2012-07-20 19:34:46.066447683 +0200
@@ -1,4 +1,4 @@
-project(dhewm3)
+project(iodoom3)
 cmake_minimum_required(VERSION 2.6)

 # TODO
@@ -28,10 +28,10 @@

 option(CORE			"Build the core" ON)
 option(GAME			"Build the base game code" ON)
-option(D3XP			"Build the d3xp game code" OFF)
-option(DEDICATED	"Build the dedicated server" OFF)
+option(D3XP			"Build the d3xp game code" ON)
+option(DEDICATED		"Build the dedicated server" ON)
 option(X86			"Cross compile for x86 (only applicable on x86_64)" OFF)
-option(ONATIVE		"Optimize for the host CPU" OFF)
+option(ONATIVE			"Optimize for the host CPU" OFF)
 option(SDL2			"Use SDL2 instead of SDL1.2" OFF)

 if(NOT CMAKE_SYSTEM_PROCESSOR)
@@ -70,21 +70,21 @@

 # build type
 if(NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+	set(CMAKE_BUILD_TYPE "Release")
 endif()

-# precompiled libraries from the dhewm3-libs repo
-if(DHEWM3LIBS)
+# precompiled libraries from the iodoom3-libs repo
+if(IOD3LIBS)
 	if(CMAKE_CROSSCOMPILING)
-		set(CMAKE_FIND_ROOT_PATH ${DHEWM3LIBS})
+		set(CMAKE_FIND_ROOT_PATH ${IOD3LIBS})
 	else()
-		set(ENV{CMAKE_PREFIX_PATH} ${DHEWM3LIBS})
+		set(ENV{CMAKE_PREFIX_PATH} ${IOD3LIBS})
 	endif()

 	# these are too stupid, give them a hint
-	set(ENV{OPENALDIR} ${DHEWM3LIBS})
-	set(ENV{SDLDIR} ${DHEWM3LIBS})
-	set(ENV{SDL2DIR} ${DHEWM3LIBS})
+	set(ENV{OPENALDIR} ${IOD3LIBS})
+	set(ENV{SDLDIR} ${IOD3LIBS})
+	set(ENV{SDL2DIR} ${IOD3LIBS})
 endif()

 # libs
@@ -152,7 +152,7 @@
 	set(CMAKE_C_FLAGS_DEBUG "-g -D_DEBUG -O1")
 	set(CMAKE_C_FLAGS_DEBUGALL "-g -ggdb -D_DEBUG")
 	set(CMAKE_C_FLAGS_PROFILE "-g -ggdb -D_DEBUG -O1 -fno-omit-frame-pointer")
-	set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer")
+	set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O3 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer")
 	set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -O3 -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer")
 	set(CMAKE_C_FLAGS_MINSIZEREL "-Os -ffast-math -fno-unsafe-math-optimizations -fomit-frame-pointer")

@@ -711,24 +711,24 @@
 include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CMAKE_SOURCE_DIR})

-add_library(idlib STATIC ${src_idlib})
+add_library(idlib${gamesuffix} STATIC ${src_idlib})
 if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang" AND NOT MINGW)
-	set_target_properties(idlib PROPERTIES COMPILE_FLAGS "-fPIC")
+	set_target_properties(idlib${gamesuffix} PROPERTIES COMPILE_FLAGS "-fPIC")
 endif()

 if(CORE)
-	add_executable(dhewm3 WIN32 MACOSX_BUNDLE
+	add_executable(iodoom3.${gamesuffix} WIN32 MACOSX_BUNDLE
 		${src_core}
 		${src_sys_base}
 		${src_sys_core}
 	)

-	set_target_properties(dhewm3 PROPERTIES COMPILE_DEFINITIONS "__DOOM_DLL__")
-	set_target_properties(dhewm3 PROPERTIES LINK_FLAGS "${ldflags}")
-	set_target_properties(dhewm3 PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/sys/osx/Info.plist)
+	set_target_properties(iodoom3.${gamesuffix} PROPERTIES COMPILE_DEFINITIONS "__DOOM_DLL__")
+	set_target_properties(iodoom3.${gamesuffix} PROPERTIES LINK_FLAGS "${ldflags}")
+	set_target_properties(iodoom3.${gamesuffix} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/sys/osx/Info.plist)

-	target_link_libraries(dhewm3
-		idlib
+	target_link_libraries(iodoom3.${gamesuffix}
+		idlib${gamesuffix}
 		${OPENAL_LIBRARY}
 		${OGG_LIBRARIES}
 		${VORBISFILE_LIBRARIES}
@@ -742,17 +742,17 @@
 endif()

 if(DEDICATED)
-	add_executable(dhewm3ded WIN32 MACOSX_BUNDLE
+	add_executable(iod3ded.${gamesuffix} WIN32 MACOSX_BUNDLE
 		${src_core}
 		${src_stub_openal}
 		${src_stub_gl}
 		${src_sys_base}
 	)

-	set_target_properties(dhewm3ded PROPERTIES COMPILE_DEFINITIONS "ID_DEDICATED;__DOOM_DLL__")
-	set_target_properties(dhewm3ded PROPERTIES LINK_FLAGS "${ldflags}")
-	target_link_libraries(dhewm3ded
-		idlib
+	set_target_properties(iod3ded.${gamesuffix} PROPERTIES COMPILE_DEFINITIONS "ID_DEDICATED;__DOOM_DLL__")
+	set_target_properties(iod3ded.${gamesuffix} PROPERTIES LINK_FLAGS "${ldflags}")
+	target_link_libraries(iod3ded.${gamesuffix}
+		idlib${gamesuffix}
 		${VORBISFILE_LIBRARIES}
 		${VORBIS_LIBRARIES}
 		${CURL_LIBRARY}
@@ -770,7 +770,7 @@
 	set_target_properties(game${gamesuffix} PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/game")
 	set_target_properties(game${gamesuffix} PROPERTIES LINK_FLAGS "${ldflags}")
 	set_target_properties(game${gamesuffix} PROPERTIES INSTALL_NAME_DIR "@executable_path")
-	target_link_libraries(game${gamesuffix} idlib)
+	target_link_libraries(game${gamesuffix} idlib${gamesuffix})
 endif()

 if(D3XP)
@@ -780,5 +780,5 @@
 	set_target_properties(d3xp${gamesuffix} PROPERTIES COMPILE_FLAGS "-I${CMAKE_SOURCE_DIR}/d3xp")
 	set_target_properties(d3xp${gamesuffix} PROPERTIES LINK_FLAGS "${ldflags}")
 	set_target_properties(d3xp${gamesuffix} PROPERTIES INSTALL_NAME_DIR "@executable_path")
-	target_link_libraries(d3xp${gamesuffix} idlib)
+	target_link_libraries(d3xp${gamesuffix} idlib${gamesuffix})
 endif()
diff -urN a/neo/d3xp/gamesys/SysCvar.cpp b/neo/d3xp/gamesys/SysCvar.cpp
--- a/neo/d3xp/gamesys/SysCvar.cpp	2012-07-20 08:41:40.000000000 +0200
+++ b/neo/d3xp/gamesys/SysCvar.cpp	2012-07-20 19:23:53.869835909 +0200
@@ -76,7 +76,7 @@
 idCVar gamedate(					"gamedate",					__DATE__,		CVAR_GAME | CVAR_ROM, "" );

 // server info
-idCVar si_name(						"si_name",					"dhewm server",	CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" );
+idCVar si_name(						"si_name",					"DOOM Server",	CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" );

 #ifdef CTF
 idCVar si_gameType(					"si_gameType",		si_gameTypeArgs[ 0 ],	CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "game type - singleplayer, deathmatch, Tourney, Team DM, Last Man or CTF", si_gameTypeArgs, idCmdSystem::ArgCompletion_String<si_gameTypeArgs> );
diff -urN a/neo/framework/FileSystem.cpp b/neo/framework/FileSystem.cpp
--- a/neo/framework/FileSystem.cpp	2012-07-20 19:32:22.390415448 +0200
+++ b/neo/framework/FileSystem.cpp	2012-07-20 19:23:53.870835901 +0200
@@ -1780,7 +1780,7 @@
 	}

 	list->mods.Insert( "" );
-	list->descriptions.Insert( "dhewm 3" );
+	list->descriptions.Insert( "Doom 3" );

 	assert( list->mods.Num() == list->descriptions.Num() );

diff -urN a/neo/framework/Licensee.h b/neo/framework/Licensee.h
--- a/neo/framework/Licensee.h	2012-07-20 19:32:22.391415441 +0200
+++ b/neo/framework/Licensee.h	2012-07-20 19:23:53.870835901 +0200
@@ -34,9 +34,9 @@
 ===============================================================================
 */

-#define GAME_NAME						"dhewm 3"		// appears on window titles and errors
+#define GAME_NAME						"iodoom3"		// appears on window titles and errors

-#define ENGINE_VERSION					"dhewm 1.3.1"	// printed in console
+#define ENGINE_VERSION					"iodoom 1.3.1"	// printed in console

 // paths
 #ifdef ID_DEMO_BUILD
@@ -46,7 +46,7 @@
 #endif

 // filenames
-#define CONFIG_FILE						"dhewm.cfg"
+#define CONFIG_FILE						"DoomConfig.cfg"

 // base folder where the source code lives
 #define SOURCE_CODE_BASE_FOLDER			"neo"
@@ -91,13 +91,13 @@
 #define EDITOR_WINDOWTEXT				"DOOMEdit"

 // win32 info
-#define WIN32_CONSOLE_CLASS				"dhewm 3 WinConsole"
+#define WIN32_CONSOLE_CLASS				"iodoom3 WinConsole"

 // Linux info
 #ifdef ID_DEMO_BUILD
-	#define LINUX_DEFAULT_PATH			"/usr/local/games/dhewm3-demo"
+	#define LINUX_DEFAULT_PATH			"/usr/local/games/iodoom3-demo"
 #else
-	#define LINUX_DEFAULT_PATH			"/usr/local/games/dhewm3"
+	#define LINUX_DEFAULT_PATH			"/usr/local/games/iodoom3"
 #endif

 // CD Key file info
diff -urN a/neo/framework/Session.cpp b/neo/framework/Session.cpp
--- a/neo/framework/Session.cpp	2012-07-20 19:32:22.391415441 +0200
+++ b/neo/framework/Session.cpp	2012-07-20 19:23:53.871835895 +0200
@@ -1965,7 +1965,7 @@
 	// Game Name / Version / Map Name / Persistant Player Info

 	// game
-	const char *gamename = GAME_NAME;
+	const char *gamename = "DOOM 3";
 	fileOut->WriteString( gamename );

 	// version
@@ -2089,7 +2089,7 @@
 	savegameFile->ReadString( gamename );

 	// if this isn't a savegame for the correct game, abort loadgame
-	if ( gamename != GAME_NAME ) {
+	if ( gamename != "DOOM 3" ) {
 		common->Warning( "Attempted to load an invalid savegame: %s", in.c_str() );

 		loadingSaveGame = false;
diff -urN a/neo/game/gamesys/SysCvar.cpp b/neo/game/gamesys/SysCvar.cpp
--- a/neo/game/gamesys/SysCvar.cpp	2012-07-20 08:41:40.000000000 +0200
+++ b/neo/game/gamesys/SysCvar.cpp	2012-07-20 19:23:53.871835895 +0200
@@ -66,7 +66,7 @@
 idCVar gamedate(					"gamedate",					__DATE__,		CVAR_GAME | CVAR_ROM, "" );

 // server info
-idCVar si_name(						"si_name",					"dhewm server",	CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" );
+idCVar si_name(						"si_name",					"DOOM Server",	CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "name of the server" );
 idCVar si_gameType(					"si_gameType",		si_gameTypeArgs[ 0 ],	CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "game type - singleplayer, deathmatch, Tourney, Team DM or Last Man", si_gameTypeArgs, idCmdSystem::ArgCompletion_String<si_gameTypeArgs> );
 idCVar si_map(						"si_map",					"game/mp/d3dm1",CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE, "map to be played next on server", idCmdSystem::ArgCompletion_MapName );
 idCVar si_maxPlayers(				"si_maxPlayers",			"4",			CVAR_GAME | CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_INTEGER, "max number of players allowed on the server", 1, 4 );
diff -urN a/neo/sys/osx/Info.plist b/neo/sys/osx/Info.plist
--- a/neo/sys/osx/Info.plist	2012-07-20 08:41:40.000000000 +0200
+++ b/neo/sys/osx/Info.plist	2012-07-20 19:23:53.872835890 +0200
@@ -5,17 +5,17 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>dhewm3</string>
+	<string>iodoom3</string>
 	<key>CFBundleIconFile</key>
 	<string>Doom3.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.dhewg.dhewm3</string>
+	<string>org.icculus.doom3</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
-	<string>DHM3</string>
+	<string>IOD3</string>
 	<key>CFBundleVersion</key>
 	<string>3000</string>
 	<key>NSMainNibFile</key>