diff --git a/Forms/MainFrm.dfm b/Forms/MainFrm.dfm
index db4cb74..82afc81 100644
--- a/Forms/MainFrm.dfm
+++ b/Forms/MainFrm.dfm
@@ -33,6 +33,7 @@ object MainForm: TMainForm
     Width = 331
     Height = 21
     AddQuotes = False
+    Filter = 'W3C XML Schema files (*.xsd)|*.xsd|All files (*.*)|*.*'
     Anchors = [akLeft, akTop, akRight]
     TabOrder = 0
   end
@@ -72,7 +73,7 @@ object MainForm: TMainForm
       Top = 72
       Width = 416
       Height = 87
-      ActivePage = spFolder
+      ActivePage = spFile
       PropagateEnable = False
       ShowDesignCaption = sdcBottomRight
       Anchors = [akLeft, akTop, akRight, akBottom]
@@ -95,6 +96,7 @@ object MainForm: TMainForm
           Height = 21
           AddQuotes = False
           DialogKind = dkSave
+          Filter = 'Delphi source files (*.pas)|*.pas|All files (*.*)|*.*'
           DialogOptions = [ofOverwritePrompt, ofHideReadOnly]
           TabOrder = 0
         end
@@ -151,7 +153,6 @@ object MainForm: TMainForm
           Width = 121
           Height = 21
           TabOrder = 2
-          Text = '.pas'
         end
       end
     end
diff --git a/Forms/MainFrm.pas b/Forms/MainFrm.pas
index 4c2c4cd..ee284c2 100644
--- a/Forms/MainFrm.pas
+++ b/Forms/MainFrm.pas
@@ -129,7 +129,8 @@ end;
 
 procedure TMainForm.GetFileName(Sender: TObject; const SchemaName: String; var Path, FileName: String);
 begin
-  FileName  := edtFolderPrefix.Text + FileName + edtFolderPostfix.Text;
+  FileName  := ChangeFileExt(edtFolderPrefix.Text + FileName,
+                             edtFolderPostfix.Text + ExtractFileExt(FileName));
   CheckValidFileName(FileName);
 end;
 
diff --git a/X2XMLDataBinding.res b/X2XMLDataBinding.res
index ba1ed6e..fa031c6 100644
Binary files a/X2XMLDataBinding.res and b/X2XMLDataBinding.res differ