diff --git a/CMakeLists.txt b/CMakeLists.txt
index e28a4de91..e74e43a2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required( VERSION 2.8.7 )
-project(QZDoom)
+project(GZDoom)
 
 if( COMMAND cmake_policy )
 	if( POLICY CMP0011 )
@@ -122,7 +122,7 @@ IF( NOT CMAKE_BUILD_TYPE )
 ENDIF()
 
 set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created." )
-set( ZDOOM_EXE_NAME "qzdoom" CACHE FILEPATH "Name of the executable to create" )
+set( ZDOOM_EXE_NAME "gzdoom" CACHE FILEPATH "Name of the executable to create" )
 if( MSVC )
 	# Allow the user to use ZDOOM_OUTPUT_DIR as a single release point.
 	# Use zdoom, zdoomd, zdoom64, and zdoomd64 for the binary names
diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm
index d7791c43c..c36a8b2a5 100644
--- a/src/posix/cocoa/i_video.mm
+++ b/src/posix/cocoa/i_video.mm
@@ -148,7 +148,7 @@ CUSTOM_CVAR(Bool, vid_autoswitch, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_
 
 static int s_currentRenderer;
 
-CUSTOM_CVAR(Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
+CUSTOM_CVAR(Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	// 0: Software renderer
 	// 1: OpenGL renderer
diff --git a/src/posix/sdl/hardware.cpp b/src/posix/sdl/hardware.cpp
index 4dfc33847..3b492f0a0 100644
--- a/src/posix/sdl/hardware.cpp
+++ b/src/posix/sdl/hardware.cpp
@@ -65,7 +65,7 @@ void I_RestartRenderer();
 int currentrenderer;
 
 // [ZDoomGL]
-CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
+CUSTOM_CVAR (Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	// 0: Software renderer
 	// 1: OpenGL renderer
diff --git a/src/version.h b/src/version.h
index ad6a47390..4f8f76fab 100644
--- a/src/version.h
+++ b/src/version.h
@@ -46,12 +46,12 @@ const char *GetVersionString();
 #ifdef GIT_DESCRIPTION
 #define VERSIONSTR GIT_DESCRIPTION
 #else
-#define VERSIONSTR "1.3pre"
+#define VERSIONSTR "2.3pre"
 #endif
 
 // The version as seen in the Windows resource
-#define RC_FILEVERSION 1,3,9999,0
-#define RC_PRODUCTVERSION 1,3,9999,0
+#define RC_FILEVERSION 2,3,9999,0
+#define RC_PRODUCTVERSION 2,3,9999,0
 #define RC_PRODUCTVERSION2 VERSIONSTR
 // These are for content versioning. The current state is '2.4'.
 #define VER_MAJOR 2
@@ -92,14 +92,14 @@ const char *GetVersionString();
 #define SAVEVER 4550
 
 // This is so that derivates can use the same savegame versions without worrying about engine compatibility
-#define GAMESIG "QZDOOM"
-#define BASEWAD "qzdoom.pk3"
+#define GAMESIG "GZDOOM"
+#define BASEWAD "gzdoom.pk3"
 
 // More stuff that needs to be different for derivatives.
-#define GAMENAME "QZDoom"
-#define GAMENAMELOWERCASE "qzdoom"
-#define FORUM_URL "http://forum.drdteam.org/viewforum.php?f=196"
-#define BUGS_FORUM_URL	"http://forum.drdteam.org/viewforum.php?f=197"
+#define GAMENAME "GZDoom"
+#define GAMENAMELOWERCASE "gzdoom"
+#define FORUM_URL "http://forum.drdteam.org"
+#define BUGS_FORUM_URL	"http://forum.drdteam.org/viewforum.php?f=24"
 
 #if defined(__APPLE__) || defined(_WIN32)
 #define GAME_DIR GAMENAME
diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp
index 5a17e90ec..437ec81aa 100644
--- a/src/win32/hardware.cpp
+++ b/src/win32/hardware.cpp
@@ -107,7 +107,7 @@ CUSTOM_CVAR(Bool, vid_used3d, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOIN
 }
 
 // [ZDoomGL]
-CUSTOM_CVAR (Int, vid_renderer, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
+CUSTOM_CVAR (Int, vid_renderer, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
 {
 	// 0: Software renderer
 	// 1: OpenGL renderer