Compil32. unit scope -> IDE. + ISCmplr. -> Compiler.

Projects/Compil32.dpr

@@ -15,31 +15,31 @@ uses
   SysUtils,
   Forms,
   PathFunc in '..\Components\PathFunc.pas',
-  Compil32.CompileForm in 'Src\Compil32\Compil32.CompileForm.pas' {CompileForm},
+  IDE.CompileForm in 'Src\Compil32\IDE.CompileForm.pas' {CompileForm},
   Shared.CmnFunc in 'Src\Shared.CmnFunc.pas',
   Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
-  Compil32.HelpFunc in 'Src\Compil32\Compil32.HelpFunc.pas',
-  Compil32.Messages in 'Src\Compil32\Compil32.Messages.pas',
+  IDE.HelpFunc in 'Src\Compil32\IDE.HelpFunc.pas',
+  IDE.Messages in 'Src\Compil32\IDE.Messages.pas',
   Shared.CompInt in 'Src\Shared.CompInt.pas',
-  Compil32.OptionsForm in 'Src\Compil32\Compil32.OptionsForm.pas' {OptionsForm},
-  Compil32.StartupForm in 'Src\Compil32\Compil32.StartupForm.pas' {StartupForm},
-  Compil32.Wizard.WizardForm in 'Src\Compil32\Compil32.Wizard.WizardForm.pas' {WizardForm},
-  Compil32.Wizard.WizardFileForm in 'Src\Compil32\Compil32.Wizard.WizardFileForm.pas' {WizardFileForm},
-  Compil32.FileAssocFunc in 'Src\Compil32\Compil32.FileAssocFunc.pas',
+  IDE.OptionsForm in 'Src\Compil32\IDE.OptionsForm.pas' {OptionsForm},
+  IDE.StartupForm in 'Src\Compil32\IDE.StartupForm.pas' {StartupForm},
+  IDE.Wizard.WizardForm in 'Src\Compil32\IDE.Wizard.WizardForm.pas' {WizardForm},
+  IDE.Wizard.WizardFileForm in 'Src\Compil32\IDE.Wizard.WizardFileForm.pas' {WizardFileForm},
+  IDE.FileAssocFunc in 'Src\Compil32\IDE.FileAssocFunc.pas',
   TmSchema in '..\Components\TmSchema.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas',
   Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
   Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
-  Compil32.SignToolsForm in 'Src\Compil32\Compil32.SignToolsForm.pas' {SignToolsForm},
-  Compil32.InputQueryComboForm in 'Src\Compil32\Compil32.InputQueryComboForm.pas',
+  IDE.SignToolsForm in 'Src\Compil32\IDE.SignToolsForm.pas' {SignToolsForm},
+  IDE.InputQueryComboForm in 'Src\Compil32\IDE.InputQueryComboForm.pas',
   ScintInt in '..\Components\ScintInt.pas',
   ScintEdit in '..\Components\ScintEdit.pas',
-  Compil32.ScintStylerInnoSetup in 'Src\Compil32\Compil32.ScintStylerInnoSetup.pas',
+  IDE.ScintStylerInnoSetup in 'Src\Compil32\IDE.ScintStylerInnoSetup.pas',
   ModernColors in '..\Components\ModernColors.pas',
-  Compil32.MsgBoxDesignerForm in 'Src\Compil32\Compil32.MsgBoxDesignerForm.pas' {MsgBoxDesignerForm},
-  Compil32.CompScintEdit in 'Src\Compil32\Compil32.CompScintEdit.pas',
-  Compil32.FilesDesignerForm in 'Src\Compil32\Compil32.FilesDesignerForm.pas' {FilesDesignerForm},
-  Compil32.Wizard.WizardFormFilesHelper in 'Src\Compil32\Compil32.Wizard.WizardFormFilesHelper.pas',
+  IDE.MsgBoxDesignerForm in 'Src\Compil32\IDE.MsgBoxDesignerForm.pas' {MsgBoxDesignerForm},
+  IDE.CompScintEdit in 'Src\Compil32\IDE.CompScintEdit.pas',
+  IDE.FilesDesignerForm in 'Src\Compil32\IDE.FilesDesignerForm.pas' {FilesDesignerForm},
+  IDE.Wizard.WizardFormFilesHelper in 'Src\Compil32\IDE.Wizard.WizardFormFilesHelper.pas',
   NewTabSet in '..\Components\NewTabSet.pas',
   NewStaticText in '..\Components\NewStaticText.pas',
   BidiUtils in '..\Components\BidiUtils.pas',
@@ -47,7 +47,7 @@ uses
   NewCheckListBox in '..\Components\NewCheckListBox.pas',
   NewNotebook in '..\Components\NewNotebook.pas',
   Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
-  Compil32.HtmlHelpFunc in 'Src\Compil32\Compil32.HtmlHelpFunc.pas',
+  IDE.HtmlHelpFunc in 'Src\Compil32\IDE.HtmlHelpFunc.pas',
   Shared.UIStateForm in 'Src\Shared.UIStateForm.pas',
   Shared.LangOptionsSectionDirectives in 'Src\Shared.LangOptionsSectionDirectives.pas',
   Shared.MsgIDs in 'Src\Shared.MsgIDs.pas',
@@ -57,8 +57,8 @@ uses
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   Shared.Compress in 'Src\Shared.Compress.pas',
   Shared.TaskDialog in 'Src\Shared.TaskDialog.pas',
-  Compil32.RegistryDesignerForm in 'Src\Compil32\Compil32.RegistryDesignerForm.pas' {RegistryDesignerForm},
-  Compil32.Wizard.WizardFormRegistryHelper in 'Src\Compil32\Compil32.Wizard.WizardFormRegistryHelper.pas',
+  IDE.RegistryDesignerForm in 'Src\Compil32\IDE.RegistryDesignerForm.pas' {RegistryDesignerForm},
+  IDE.Wizard.WizardFormRegistryHelper in 'Src\Compil32\IDE.Wizard.WizardFormRegistryHelper.pas',
   MD5 in '..\Components\MD5.pas',
   IsscintInt in '..\Components\IsscintInt.pas',
   Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',

Projects/Compil32.dproj

@@ -77,47 +77,47 @@
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.CompileForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.CompileForm.pas">
             <Form>CompileForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Shared.CmnFunc.pas"/>
         <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.HelpFunc.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.Messages.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.HelpFunc.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.Messages.pas"/>
         <DCCReference Include="Src\Shared.CompInt.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.OptionsForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.OptionsForm.pas">
             <Form>OptionsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.StartupForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.StartupForm.pas">
             <Form>StartupForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.Wizard.WizardForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardForm.pas">
             <Form>WizardForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.Wizard.WizardFileForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardFileForm.pas">
             <Form>WizardFileForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.FileAssocFunc.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.FileAssocFunc.pas"/>
         <DCCReference Include="..\Components\TmSchema.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <DCCReference Include="Src\Shared.DebugStruct.pas"/>
         <DCCReference Include="Src\Shared.BrowseFunc.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.SignToolsForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.SignToolsForm.pas">
             <Form>SignToolsForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.InputQueryComboForm.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.InputQueryComboForm.pas"/>
         <DCCReference Include="..\Components\ScintInt.pas"/>
         <DCCReference Include="..\Components\ScintEdit.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.ScintStylerInnoSetup.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.ScintStylerInnoSetup.pas"/>
         <DCCReference Include="..\Components\ModernColors.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.MsgBoxDesignerForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.MsgBoxDesignerForm.pas">
             <Form>MsgBoxDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.CompScintEdit.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.FilesDesignerForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.CompScintEdit.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.FilesDesignerForm.pas">
             <Form>FilesDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.Wizard.WizardFormFilesHelper.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardFormFilesHelper.pas"/>
         <DCCReference Include="..\Components\NewTabSet.pas"/>
         <DCCReference Include="..\Components\NewStaticText.pas"/>
         <DCCReference Include="..\Components\BidiUtils.pas"/>
@@ -125,7 +125,7 @@
         <DCCReference Include="..\Components\NewCheckListBox.pas"/>
         <DCCReference Include="..\Components\NewNotebook.pas"/>
         <DCCReference Include="Src\Shared.TaskbarProgressFunc.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.HtmlHelpFunc.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.HtmlHelpFunc.pas"/>
         <DCCReference Include="Src\Shared.UIStateForm.pas"/>
         <DCCReference Include="Src\Shared.LangOptionsSectionDirectives.pas"/>
         <DCCReference Include="Src\Shared.MsgIDs.pas"/>
@@ -135,10 +135,10 @@
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\Shared.TaskDialog.pas"/>
-        <DCCReference Include="Src\Compil32\Compil32.RegistryDesignerForm.pas">
+        <DCCReference Include="Src\Compil32\IDE.RegistryDesignerForm.pas">
             <Form>RegistryDesignerForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Compil32\Compil32.Wizard.WizardFormRegistryHelper.pas"/>
+        <DCCReference Include="Src\Compil32\IDE.Wizard.WizardFormRegistryHelper.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
         <DCCReference Include="..\Components\IsscintInt.pas"/>
         <DCCReference Include="Src\Shared.ScriptFunc.pas"/>

Projects/ISCmplr.dpr

@@ -14,19 +14,19 @@ uses
   SysUtils,
   Shared.CompInt in 'Src\Shared.CompInt.pas',
   Shared.CompPreprocInt in 'Src\Shared.CompPreprocInt.pas',
-  ISCmplr.Compile in 'Src\ISCmplr\ISCmplr.Compile.pas',
-  ISCmplr.Messages in 'Src\ISCmplr\ISCmplr.Messages.pas',
+  Compiler.Compile in 'Src\ISCmplr\Compiler.Compile.pas',
+  Compiler.Messages in 'Src\ISCmplr\Compiler.Messages.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
   Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',
-  ISCmplr.ScriptFunc in 'Src\ISCmplr\ISCmplr.ScriptFunc.pas',
-  ISCmplr.ScriptCompiler in 'Src\ISCmplr\ISCmplr.ScriptCompiler.pas',
-  ISCmplr.ScriptClasses in 'Src\ISCmplr\ISCmplr.ScriptClasses.pas',
+  Compiler.ScriptFunc in 'Src\ISCmplr\Compiler.ScriptFunc.pas',
+  Compiler.ScriptCompiler in 'Src\ISCmplr\Compiler.ScriptCompiler.pas',
+  Compiler.ScriptClasses in 'Src\ISCmplr\Compiler.ScriptClasses.pas',
   Shared.ResUpdate in 'Src\Shared.ResUpdate.pas',
-  ISCmplr.ExeUpdate in 'Src\ISCmplr\ISCmplr.ExeUpdate.pas',
+  Compiler.ExeUpdate in 'Src\ISCmplr\Compiler.ExeUpdate.pas',
   Shared.Compress in 'Src\Shared.Compress.pas',
   Shared.CompressZlib in 'Src\Shared.CompressZlib.pas',
   Shared.bzlib in 'Src\Shared.bzlib.pas',
-  ISCmplr.LZMACompressor in 'Src\ISCmplr\ISCmplr.LZMACompressor.pas',
+  Compiler.LZMACompressor in 'Src\ISCmplr\Compiler.LZMACompressor.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.ArcFour in 'Src\Shared.ArcFour.pas',
   Shared.VerInfo in 'Src\Shared.VerInfo.pas',

Projects/ISCmplr.dproj

@@ -80,19 +80,19 @@
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
         <DCCReference Include="Src\Shared.CompInt.pas"/>
         <DCCReference Include="Src\Shared.CompPreprocInt.pas"/>
-        <DCCReference Include="Src\ISCmplr\ISCmplr.Compile.pas"/>
-        <DCCReference Include="Src\ISCmplr\ISCmplr.Messages.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.Compile.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.Messages.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
         <DCCReference Include="Src\Shared.ScriptFunc.pas"/>
-        <DCCReference Include="Src\ISCmplr\ISCmplr.ScriptFunc.pas"/>
-        <DCCReference Include="Src\ISCmplr\ISCmplr.ScriptCompiler.pas"/>
-        <DCCReference Include="Src\ISCmplr\ISCmplr.ScriptClasses.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.ScriptFunc.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.ScriptCompiler.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.ScriptClasses.pas"/>
         <DCCReference Include="Src\Shared.ResUpdate.pas"/>
-        <DCCReference Include="Src\ISCmplr\ISCmplr.ExeUpdate.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.ExeUpdate.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\Shared.CompressZlib.pas"/>
         <DCCReference Include="Src\Shared.bzlib.pas"/>
-        <DCCReference Include="Src\ISCmplr\ISCmplr.LZMACompressor.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.LZMACompressor.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.ArcFour.pas"/>
         <DCCReference Include="Src\Shared.VerInfo.pas"/>

Projects/Src/Compil32/Compil32.CompScintEdit.pas → Projects/Src/Compil32/IDE.CompScintEdit.pas

@@ -1,4 +1,4 @@
-unit Compil32.CompScintEdit;
+unit IDE.CompScintEdit;
 
 {
   Inno Setup

Projects/Src/Compil32/Compil32.CompileForm.pas → Projects/Src/Compil32/IDE.CompileForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.CompileForm;
+unit IDE.CompileForm;
 
 {
   Inno Setup
@@ -11,12 +11,12 @@
 
 {x$DEFINE STATICCOMPILER}
 { For debugging purposes, remove the 'x' to have it link the compiler code into
-  this program and not depend on ISCmplr.dll. You will also need to add the
+  this program and not depend on Compiler.dll. You will also need to add the
   ..\Components and Src and Src\ISCmplr folders to the Delphi Compiler Search path
   in the project options. Also see Compile's STATICPREPROC. }
 
 {$IFDEF STATICCOMPILER}
-{$R ..\Res\ISCmplr.images.res}
+{$R ..\Res\Compiler.images.res}
 {$ENDIF}
 
 interface
@@ -24,8 +24,8 @@ interface
 uses
   Windows, Messages, SysUtils, Classes, Contnrs, Graphics, Controls, Forms, Dialogs, CommDlg,
   Generics.Collections, Shared.UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
-  ScintInt, ScintEdit, Compil32.ScintStylerInnoSetup, NewTabSet, ModernColors, Compil32.CompScintEdit,
-  Shared.DebugStruct, Shared.CompInt, NewUxTheme, ImageList, ImgList, ToolWin, Compil32.HelpFunc,
+  ScintInt, ScintEdit, IDE.ScintStylerInnoSetup, NewTabSet, ModernColors, IDE.CompScintEdit,
+  Shared.DebugStruct, Shared.CompInt, NewUxTheme, ImageList, ImgList, ToolWin, IDE.HelpFunc,
   VirtualImageList, BaseImageCollection, ImageCollection;
 
 const
@@ -651,11 +651,11 @@ implementation
 uses
   ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes,
   Math, StrUtils, WideStrUtils,
-  PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Shared.FileClass, Compil32.Messages, TmSchema, Shared.BrowseFunc,
-  Compil32.HtmlHelpFunc, Shared.TaskbarProgressFunc,
+  PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Shared.FileClass, IDE.Messages, TmSchema, Shared.BrowseFunc,
+  IDE.HtmlHelpFunc, Shared.TaskbarProgressFunc,
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
-  Compil32.OptionsForm, Compil32.StartupForm, Compil32.Wizard.WizardForm, Compil32.SignToolsForm, Shared.CompTypes, Compil32.InputQueryComboForm, Compil32.MsgBoxDesignerForm,
-  Compil32.FilesDesignerForm, Compil32.RegistryDesignerForm, Compil32.Wizard.WizardFormRegistryHelper;
+  IDE.OptionsForm, IDE.StartupForm, IDE.Wizard.WizardForm, IDE.SignToolsForm, Shared.CompTypes, IDE.InputQueryComboForm, IDE.MsgBoxDesignerForm,
+  IDE.FilesDesignerForm, IDE.RegistryDesignerForm, IDE.Wizard.WizardFormRegistryHelper;
 
 {$R *.DFM}
 

Projects/Src/Compil32/Compil32.FileAssocFunc.pas → Projects/Src/Compil32/IDE.FileAssocFunc.pas

@@ -1,4 +1,4 @@
-unit Compil32.FileAssocFunc;
+unit IDE.FileAssocFunc;
 
 {
   Inno Setup

Projects/Src/Compil32/Compil32.FilesDesignerForm.pas → Projects/Src/Compil32/IDE.FilesDesignerForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.FilesDesignerForm;
+unit IDE.FilesDesignerForm;
 
 {
   Inno Setup
@@ -13,7 +13,7 @@ interface
 
 uses
   Classes, Controls, Forms, Dialogs, ExtCtrls, StdCtrls,
-  Shared.UIStateForm, NewStaticText, DropListBox, Compil32.Wizard.WizardFormFilesHelper;
+  Shared.UIStateForm, NewStaticText, DropListBox, IDE.Wizard.WizardFormFilesHelper;
 
 type
   TFilesDesignerForm = class(TUIStateForm)
@@ -45,7 +45,7 @@ implementation
 {$R *.dfm}
 
 uses
-  Compil32.HelpFunc;
+  IDE.HelpFunc;
 
 procedure TFilesDesignerForm.FormCreate(Sender: TObject);
 begin

Projects/Src/Compil32/Compil32.HelpFunc.pas → Projects/Src/Compil32/IDE.HelpFunc.pas

@@ -1,4 +1,4 @@
-unit Compil32.HelpFunc;
+unit IDE.HelpFunc;
 
 {
   Inno Setup
@@ -14,7 +14,7 @@ interface
 uses
   Windows,
   Classes, Forms, Dialogs, Menus, Controls, StdCtrls,
-  ScintEdit, Compil32.CompScintEdit, ModernColors;
+  ScintEdit, IDE.CompScintEdit, ModernColors;
 
 const
   MRUListMaxCount = 10;
@@ -87,7 +87,7 @@ uses
   ActiveX, ShlObj, ShellApi, CommDlg, SysUtils, IOUtils, StrUtils,
   Messages, DwmApi, Consts,
   Shared.CmnFunc2, PathFunc, Shared.FileClass, NewUxTheme,
-  Compil32.CompileForm, Compil32.Messages, Shared.CompTypes;
+  IDE.CompileForm, IDE.Messages, Shared.CompTypes;
 
 procedure InitFormFont(Form: TForm);
 var

Projects/Src/Compil32/Compil32.HtmlHelpFunc.pas → Projects/Src/Compil32/IDE.HtmlHelpFunc.pas

@@ -1,4 +1,4 @@
-unit Compil32.HtmlHelpFunc;
+unit IDE.HtmlHelpFunc;
 
 {
   Inno Setup

Projects/Src/Compil32/Compil32.InputQueryComboForm.pas → Projects/Src/Compil32/IDE.InputQueryComboForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.InputQueryComboForm;
+unit IDE.InputQueryComboForm;
 
 {
   Inno Setup
@@ -37,7 +37,7 @@ function InputQueryCombo(const ACaption, APrompt: String; var AValue: String; co
 implementation
 
 uses
-  Windows, Messages, Compil32.HelpFunc, Forms;
+  Windows, Messages, IDE.HelpFunc, Forms;
 
 {$R *.DFM}
 

Projects/Src/Compil32/Compil32.Messages.pas → Projects/Src/Compil32/IDE.Messages.pas

@@ -1,4 +1,4 @@
-unit Compil32.Messages;
+unit IDE.Messages;
 
 {
   Inno Setup

Projects/Src/Compil32/Compil32.MsgBoxDesignerForm.pas → Projects/Src/Compil32/IDE.MsgBoxDesignerForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.MsgBoxDesignerForm;
+unit IDE.MsgBoxDesignerForm;
 
 {
   Inno Setup
@@ -108,7 +108,7 @@ type
 implementation
 
 uses
-  Shared.CmnFunc, Shared.CmnFunc2, Compil32.HelpFunc, Shared.TaskDialog, Compil32.Messages;
+  Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, Shared.TaskDialog, IDE.Messages;
 
 {$R *.DFM}
 

Projects/Src/Compil32/Compil32.OptionsForm.pas → Projects/Src/Compil32/IDE.OptionsForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.OptionsForm;
+unit IDE.OptionsForm;
 
 {
   Inno Setup
@@ -70,7 +70,7 @@ type
 implementation
 
 uses
-  Shared.CmnFunc, Shared.CmnFunc2, Compil32.HelpFunc, Compil32.FileAssocFunc;
+  Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, IDE.FileAssocFunc;
 
 {$R *.DFM}
 

Projects/Src/Compil32/Compil32.RegistryDesignerForm.pas → Projects/Src/Compil32/IDE.RegistryDesignerForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.RegistryDesignerForm;
+unit IDE.RegistryDesignerForm;
 
 {
   Inno Setup
@@ -16,7 +16,7 @@ interface
 uses
   SysUtils, Classes,
   Forms, Controls, StdCtrls, ExtCtrls,
-  Compil32.Wizard.WizardFormRegistryHelper, NewStaticText;
+  IDE.Wizard.WizardFormRegistryHelper, NewStaticText;
 
 type
   TRegistryDesignerForm = class(TForm)
@@ -52,7 +52,7 @@ implementation
 {$R *.dfm}
 
 uses
-  Compil32.HelpFunc;
+  IDE.HelpFunc;
 
 procedure TRegistryDesignerForm.SetPrivilegesRequired(
   const Value: TPrivilegesRequired);

Projects/Src/Compil32/Compil32.ScintStylerInnoSetup.pas → Projects/Src/Compil32/IDE.ScintStylerInnoSetup.pas

@@ -1,4 +1,4 @@
-unit Compil32.ScintStylerInnoSetup;
+unit IDE.ScintStylerInnoSetup;
 
 {
   Inno Setup

Projects/Src/Compil32/Compil32.SignToolsForm.pas → Projects/Src/Compil32/IDE.SignToolsForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.SignToolsForm;
+unit IDE.SignToolsForm;
 
 {
   Inno Setup
@@ -46,7 +46,7 @@ type
 implementation
 
 uses
-  Windows, Messages, Compil32.HelpFunc, Shared.CmnFunc, Dialogs, SysUtils;
+  Windows, Messages, IDE.HelpFunc, Shared.CmnFunc, Dialogs, SysUtils;
 
 {$R *.DFM}
 

Projects/Src/Compil32/Compil32.StartupForm.pas → Projects/Src/Compil32/IDE.StartupForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.StartupForm;
+unit IDE.StartupForm;
 
 {
   Inno Setup
@@ -59,7 +59,7 @@ type
 implementation
 
 uses
-  Compil32.Messages, Shared.CmnFunc, Shared.CmnFunc2, Compil32.HelpFunc, Compil32.CompileForm, ComCtrls;
+  IDE.Messages, Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, IDE.CompileForm, ComCtrls;
 
 {$R *.DFM}
 

Projects/Src/Compil32/Compil32.Wizard.WizardFileForm.pas → Projects/Src/Compil32/IDE.Wizard.WizardFileForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.Wizard.WizardFileForm;
+unit IDE.Wizard.WizardFileForm;
 
 {
   Inno Setup
@@ -60,7 +60,7 @@ type
 implementation
 
 uses
-  Compil32.Messages, Shared.CmnFunc, Shared.CmnFunc2, Compil32.HelpFunc;
+  IDE.Messages, Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc;
 
 {$R *.DFM}
 

Projects/Src/Compil32/Compil32.Wizard.WizardForm.pas → Projects/Src/Compil32/IDE.Wizard.WizardForm.pas

@@ -1,4 +1,4 @@
-unit Compil32.Wizard.WizardForm;
+unit IDE.Wizard.WizardForm;
 
 {
   Inno Setup
@@ -14,7 +14,7 @@ interface
 uses
   Windows, Forms, Classes, Graphics, StdCtrls, ExtCtrls, Controls, Dialogs, pngimage,
   Shared.UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
-  Compil32.Wizard.WizardFormFilesHelper, Compil32.Wizard.WizardFormRegistryHelper;
+  IDE.Wizard.WizardFormFilesHelper, IDE.Wizard.WizardFormRegistryHelper;
 
 type
   TWizardPage = (wpWelcome, wpAppInfo, wpAppDir, wpAppFiles, wpAppAssoc, wpAppIcons,
@@ -187,8 +187,8 @@ implementation
 
 uses
   SysUtils, ShlObj, ActiveX, UITypes, Shared.FileClass,
-  PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Compil32.HelpFunc, Shared.BrowseFunc,
-  Compil32.Messages, Compil32.Wizard.WizardFileForm;
+  PathFunc, Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, Shared.BrowseFunc,
+  IDE.Messages, IDE.Wizard.WizardFileForm;
 
 type
   TConstant = record

Projects/Src/Compil32/Compil32.Wizard.WizardFormFilesHelper.pas → Projects/Src/Compil32/IDE.Wizard.WizardFormFilesHelper.pas

@@ -1,4 +1,4 @@
-unit Compil32.Wizard.WizardFormFilesHelper;
+unit IDE.Wizard.WizardFormFilesHelper;
 
 {
   Inno Setup
@@ -49,7 +49,7 @@ implementation
 uses
   SysUtils, UITypes,
   Shared.CmnFunc, Shared.CmnFunc2, Shared.BrowseFunc, PathFunc,
-  Compil32.Messages, Compil32.Wizard.WizardFileForm;
+  IDE.Messages, IDE.Wizard.WizardFileForm;
 
 constructor TWizardFormFilesHelper.Create(const Form: TForm;
   const NotCreateAppDirCheck: TCheckBox; const FilesListBox: TDropListBox;

Projects/Src/Compil32/Compil32.Wizard.WizardFormRegistryHelper.pas → Projects/Src/Compil32/IDE.Wizard.WizardFormRegistryHelper.pas

@@ -1,4 +1,4 @@
-unit Compil32.Wizard.WizardFormRegistryHelper;
+unit IDE.Wizard.WizardFormRegistryHelper;
 
 {
   Inno Setup
@@ -47,7 +47,7 @@ implementation
 uses
   Windows, Classes, SysUtils, StrUtils, TypInfo, Graphics, UITypes,
   ComCtrls,
-  Compil32.CompileForm, Compil32.HelpFunc, Compil32.Messages, Shared.BrowseFunc, Shared.CmnFunc2, Compil32.HtmlHelpFunc;
+  IDE.CompileForm, IDE.HelpFunc, IDE.Messages, Shared.BrowseFunc, Shared.CmnFunc2, IDE.HtmlHelpFunc;
 
 { TWizardFormRegistryHelper }
 

Projects/Src/ISCmplr/ISCmplr.Compile.pas → Projects/Src/ISCmplr/Compiler.Compile.pas

@@ -1,4 +1,4 @@
-unit ISCmplr.Compile;
+unit Compiler.Compile;
 
 {
   Inno Setup
@@ -32,13 +32,13 @@ implementation
 uses
   Shared.CompPreprocInt, Commctrl, Consts, Classes, IniFiles, TypInfo, AnsiStrings, Math,
   Generics.Collections, StrUtils, WideStrUtils,
-  PathFunc, Shared.CmnFunc2, Shared.Struct, Shared.Int64Em, ISCmplr.Messages, Shared.SetupEnt,
-  Shared.FileClass, Shared.Compress, Shared.CompressZlib, Shared.bzlib, ISCmplr.LZMACompressor, Shared.ArcFour, SHA1,
-  Shared.MsgIDs, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives, Shared.DebugStruct, Shared.VerInfo, Shared.ResUpdate, ISCmplr.ExeUpdate,
+  PathFunc, Shared.CmnFunc2, Shared.Struct, Shared.Int64Em, Compiler.Messages, Shared.SetupEnt,
+  Shared.FileClass, Shared.Compress, Shared.CompressZlib, Shared.bzlib, Compiler.LZMACompressor, Shared.ArcFour, SHA1,
+  Shared.MsgIDs, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives, Shared.DebugStruct, Shared.VerInfo, Shared.ResUpdate, Compiler.ExeUpdate,
 {$IFDEF STATICPREPROC}
   IsppPreprocess,
 {$ENDIF}
-  ISCmplr.ScriptCompiler, Shared.SimpleExpression, Shared.SetupTypes;
+  Compiler.ScriptCompiler, Shared.SimpleExpression, Shared.SetupTypes;
 
 type
   TParamInfo = record

Projects/Src/ISCmplr/ISCmplr.ExeUpdate.pas → Projects/Src/ISCmplr/Compiler.ExeUpdate.pas

@@ -1,4 +1,4 @@
-unit ISCmplr.ExeUpdate;
+unit Compiler.ExeUpdate;
 
 {
   Inno Setup

Projects/Src/ISCmplr/ISCmplr.LZMACompressor.pas → Projects/Src/ISCmplr/Compiler.LZMACompressor.pas

@@ -1,4 +1,4 @@
-unit ISCmplr.LZMACompressor;
+unit Compiler.LZMACompressor;
 
 {
   Inno Setup
@@ -6,7 +6,7 @@ unit ISCmplr.LZMACompressor;
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
-  Interface to the islzma LZMA/LZMA2 compression DLL and EXEs, used by ISCmplr.
+  Interface to the islzma LZMA/LZMA2 compression DLL and EXEs, used by Compiler.
 }
 
 interface

Projects/Src/ISCmplr/ISCmplr.Messages.pas → Projects/Src/ISCmplr/Compiler.Messages.pas

@@ -1,4 +1,4 @@
-unit ISCmplr.Messages;
+unit Compiler.Messages;
 
 {
   Inno Setup

Projects/Src/ISCmplr/ISCmplr.ScriptClasses.pas → Projects/Src/ISCmplr/Compiler.ScriptClasses.pas

@@ -1,4 +1,4 @@
-unit ISCmplr.ScriptClasses;
+unit Compiler.ScriptClasses;
 
 {
   Inno Setup

Projects/Src/ISCmplr/ISCmplr.ScriptCompiler.pas → Projects/Src/ISCmplr/Compiler.ScriptCompiler.pas

@@ -1,4 +1,4 @@
-unit ISCmplr.ScriptCompiler;
+unit Compiler.ScriptCompiler;
 
 {
   Inno Setup
@@ -60,7 +60,7 @@ implementation
 uses
   SysUtils, Generics.Defaults,
   uPSCompiler, uPSC_dll,
-  ISCmplr.ScriptClasses, ISCmplr.ScriptFunc;
+  Compiler.ScriptClasses, Compiler.ScriptFunc;
 
 type
   TScriptExport = class

Projects/Src/ISCmplr/ISCmplr.ScriptFunc.pas → Projects/Src/ISCmplr/Compiler.ScriptFunc.pas

@@ -1,4 +1,4 @@
-unit ISCmplr.ScriptFunc;
+unit Compiler.ScriptFunc;
 
 {
   Inno Setup
@@ -22,7 +22,7 @@ implementation
 uses
   Windows, SysUtils, TypInfo,
   Shared.CmnFunc2, Shared.MsgIDs, Shared.Struct,
-  Shared.SetupTypes, Shared.ScriptFunc, ISCmplr.Messages, Shared.DotNetVersion;
+  Shared.SetupTypes, Shared.ScriptFunc, Compiler.Messages, Shared.DotNetVersion;
 
 { This type copied from CmnFunc.pas. We don't actually 'use' CmnFunc since
   it would cause VCL units to be linked in. }

Projects/Src/Setup/Setup.ScriptFunc.pas

@@ -809,7 +809,7 @@ begin
 end;
 
 type
-  { These must keep this in synch with ISCmplr.ScriptFunc.pas }
+  { These must keep this in synch with Compiler.ScriptFunc.pas }
   TOnLog = procedure(const S: String; const Error, FirstLine: Boolean) of object;
 
   TExecOutput = record

Projects/Src/SetupLdrAndSetup/SetupLdrAndSetup.InstFunc.pas

@@ -41,7 +41,7 @@ type
 
   TEnumFROFilenamesProc = procedure(const Filename: String; Param: Pointer);
 
-  { Must keep this in synch with ISCmplr.ScriptFunc.pas: }
+  { Must keep this in synch with Compiler.ScriptFunc.pas: }
   TExecWait = (ewNoWait, ewWaitUntilTerminated, ewWaitUntilIdle);
 
   TDetermineDefaultLanguageResult = (ddNoMatch, ddMatch, ddMatchLangParameter);

Projects/Src/Shared.CmnFunc.pas

@@ -27,7 +27,7 @@ type
     destructor Destroy; override;
   end;
 
-  { Note: This type is also present in ISCmplr.ScriptFunc.pas }
+  { Note: This type is also present in Compiler.ScriptFunc.pas }
   TMsgBoxType = (mbInformation, mbConfirmation, mbError, mbCriticalError);
 
   TMsgBoxCallbackFunc = procedure(const Flags: LongInt; const After: Boolean;