diff --git a/Source/Core/General/General.cs b/Source/Core/General/General.cs
index fb3a2321..27c474f9 100755
--- a/Source/Core/General/General.cs
+++ b/Source/Core/General/General.cs
@@ -161,11 +161,11 @@ namespace CodeImp.DoomBuilder
 		//internal const int SIF_ALL = SIF_RANGE + SIF_PAGE + SIF_POS + SIF_TRACKPOS;
 		
 		// Files and Folders
-		private const string LEGACY_SETTINGS_FILE = "GZBuilder.cfg"; // To make transision from GZDB* easier
-		private const string SETTINGS_FILE = "UDBuilder.cfg";
-		private const string DEFAULT_SETTINGS_FILE = "UDBuilder.default.cfg"; //mxd
+		private const string LEGACY_SETTINGS_FILE = "UDBuilder.cfg"; // To make transision from UDB easier
+		private const string SETTINGS_FILE = "UZBuilder.cfg";
+		private const string DEFAULT_SETTINGS_FILE = "UZBuilder.default.cfg"; //mxd
 		private const string SETTINGS_DIR = "Ultimate Zone Builder";
-		private const string LOG_FILE = "UDBuilder.log";
+		private const string LOG_FILE = "UZBuilder.log";
 		private const string GAME_CONFIGS_DIR = "Configurations";
 		private const string COMPILERS_DIR = "Compilers";
 		private const string PLUGINS_DIR = "Plugins";
diff --git a/Source/Core/Windows/ExceptionDialog.cs b/Source/Core/Windows/ExceptionDialog.cs
index 9af949ee..95f015a7 100755
--- a/Source/Core/Windows/ExceptionDialog.cs
+++ b/Source/Core/Windows/ExceptionDialog.cs
@@ -12,7 +12,7 @@ namespace CodeImp.DoomBuilder.Windows
 {
 	public partial class ExceptionDialog : Form
 	{
-		private const string CRASH_DUMP_FILE = "UDBCrash.txt";
+		private const string CRASH_DUMP_FILE = "UZBCrash.txt";
 
 		private readonly bool isterminating;
 		private readonly string logpath;
@@ -113,8 +113,8 @@ namespace CodeImp.DoomBuilder.Windows
 				}
 			}
 
-            // Get GZDB version
-            result += "UDB: R" + General.ThisAssembly.GetName().Version.Revision + Environment.NewLine;
+            // Get UZB version
+            result += "UZB: " + General.ThisAssembly.GetName().Version + Environment.NewLine;
             result += "Platform: " + (Environment.Is64BitProcess ? "x64" : "x86") + Environment.NewLine + Environment.NewLine;
 
 			return result;