diff --git a/DbgHelp/DbgHelp.cs b/DbgHelp/DbgHelp.cs
index 3ff04c8..3a4141c 100644
--- a/DbgHelp/DbgHelp.cs
+++ b/DbgHelp/DbgHelp.cs
@@ -344,7 +344,7 @@ namespace DbgHelpAPI
         IntPtr hProcess;
         static Random mRandom = new Random();
         static FileMap mFileMap = new FileMap();
-        string mReactosOutputPath = "output-i386", mReactosSourcePath = ".";
+        string mReactosOutputPath = "output-MinGW-i386", mReactosSourcePath = ".";
 
         public string ReactosOutputPath
         {
diff --git a/DbgHelp/filemap.cs b/DbgHelp/filemap.cs
index 9f5d0bc..53b923c 100644
--- a/DbgHelp/filemap.cs
+++ b/DbgHelp/filemap.cs
@@ -6,7 +6,7 @@ namespace DbgHelpAPI
 {
     public class FileMap
     {
-        string []mDirectories = new string [] { "output-i386" };
+        string []mDirectories = new string [] { "output-MinGW-i386" };
         Dictionary<string, List<string>> mFileByShortName = new Dictionary<string, List<string>>();
 
         public string GetFilePathFromShortName(string shortname)
diff --git a/RosDBG/Settings.cs b/RosDBG/Settings.cs
index b05668a..66442b5 100644
--- a/RosDBG/Settings.cs
+++ b/RosDBG/Settings.cs
@@ -82,21 +82,21 @@ namespace RosDBG
                 get { return this["SourceDirectory"].ToString(); }
                 set 
                 {
-                    if (!File.Exists(value + "\\ReactOS-generic.rbuild"))
+                    if (!File.Exists(value + "\\toolchain-gcc.cmake"))
                         MessageBox.Show("Can not find ReactOS sources in this directory!", "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                     this["SourceDirectory"] = value;
                 }
             }
 
             [CategoryAttribute("Directories"), DescriptionAttribute("Directory settings")]
-            [UserScopedSetting,DefaultSettingValue(".\\output-i386"),Editor(typeof(DirectoryEditor), typeof(UITypeEditor))]
+            [UserScopedSetting,DefaultSettingValue(".\\output-MinGW-i386"),Editor(typeof(DirectoryEditor), typeof(UITypeEditor))]
             public string OutputDirectory
             {
                 get { return this["OutputDirectory"].ToString(); }
                 set
                 {
-                    if (!File.Exists(value + "\\ntoskrnl\\ntoskrnl.nostrip.exe"))
-                        MessageBox.Show("Can not find .nostrip files!\nThe Debugger will not work properly without them.\n\nPlease enable building of .nostrip files in RosBE options." , "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);  
+                    if (!File.Exists(value + "\\symbols\\ntoskrnl.exe"))
+                        MessageBox.Show("Can not find symbol files!\nThe Debugger will not work properly without them.\n\nPlease rebuild with -DSEPARATE_DBG=1." , "Warning", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);  
                     this["OutputDirectory"] = value; 
                 }
             }