A few more renames.

Projects/Compil32.dpr

@@ -16,11 +16,11 @@ uses
   Forms,
   PathFunc in '..\Components\PathFunc.pas',
   IDE.CompileForm in 'Src\Compil32\IDE.CompileForm.pas' {CompileForm},
-  Shared.CmnFunc in 'Src\Shared.CmnFunc.pas',
-  Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
+  Shared.CommonFunc.Vcl in 'Src\Shared.CommonFunc.Vcl.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   IDE.HelpFunc in 'Src\Compil32\IDE.HelpFunc.pas',
   IDE.Messages in 'Src\Compil32\IDE.Messages.pas',
-  Shared.CompInt in 'Src\Shared.CompInt.pas',
+  Shared.CompilerInt in 'Src\Shared.CompilerInt.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},
@@ -50,13 +50,13 @@ uses
   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',
+  Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
   Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',
   Shared.CompTypes in 'Src\Shared.CompTypes.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   Shared.Compress in 'Src\Shared.Compress.pas',
-  Shared.TaskDialog in 'Src\Shared.TaskDialog.pas',
+  Shared.TaskDialogFunc in 'Src\Shared.TaskDialogFunc.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',

Projects/Compil32.dproj

@@ -80,11 +80,11 @@
         <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\Shared.CommonFunc.Vcl.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
         <DCCReference Include="Src\Compil32\IDE.HelpFunc.pas"/>
         <DCCReference Include="Src\Compil32\IDE.Messages.pas"/>
-        <DCCReference Include="Src\Shared.CompInt.pas"/>
+        <DCCReference Include="Src\Shared.CompilerInt.pas"/>
         <DCCReference Include="Src\Compil32\IDE.OptionsForm.pas">
             <Form>OptionsForm</Form>
         </DCCReference>
@@ -128,13 +128,13 @@
         <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"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
         <DCCReference Include="Src\Shared.SetupSectionDirectives.pas"/>
         <DCCReference Include="Src\Shared.CompTypes.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
-        <DCCReference Include="Src\Shared.TaskDialog.pas"/>
+        <DCCReference Include="Src\Shared.TaskDialogFunc.pas"/>
         <DCCReference Include="Src\Compil32\IDE.RegistryDesignerForm.pas">
             <Form>RegistryDesignerForm</Form>
         </DCCReference>

Projects/ISCC.dpr

@@ -21,8 +21,8 @@ uses
   Classes,
   {$IFDEF STATICCOMPILER} ISCmplr.Compile in 'Src\ISCmplr\ISCmplr.Compile.pas', {$ENDIF}
   PathFunc in '..\Components\PathFunc.pas',
-  Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
-  Shared.CompInt in 'Src\Shared.CompInt.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
+  Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.CompTypes in 'Src\Shared.CompTypes.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas';

Projects/ISCC.dproj

@@ -77,8 +77,8 @@
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
         <DCCReference Include="Src\ISCmplr\ISCmplr.Compile.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
-        <DCCReference Include="Src\Shared.CompInt.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
+        <DCCReference Include="Src\Shared.CompilerInt.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.CompTypes.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>

Projects/ISCmplr.dpr

@@ -12,8 +12,8 @@ library ISCmplr;
 uses
   Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
   SysUtils,
-  Shared.CompInt in 'Src\Shared.CompInt.pas',
-  Shared.CompPreprocInt in 'Src\Shared.CompPreprocInt.pas',
+  Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
+  Shared.PreprocInt in 'Src\Shared.PreprocInt.pas',
   Compiler.Compile in 'Src\ISCmplr\Compiler.Compile.pas',
   Compiler.Messages in 'Src\ISCmplr\Compiler.Messages.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
@@ -21,23 +21,23 @@ uses
   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',
-  Compiler.ExeUpdate in 'Src\ISCmplr\Compiler.ExeUpdate.pas',
+  Shared.ResUpdateFunc in 'Src\Shared.ResUpdateFunc.pas',
+  Compiler.ExeUpdateFunc in 'Src\ISCmplr\Compiler.ExeUpdateFunc.pas',
   Shared.Compress in 'Src\Shared.Compress.pas',
-  Shared.CompressZlib in 'Src\Shared.CompressZlib.pas',
-  Shared.bzlib in 'Src\Shared.bzlib.pas',
+  Shared.Compress.Zlib in 'Src\Shared.Compress.Zlib.pas',
+  Shared.Compress.bzlib in 'Src\Shared.Compress.bzlib.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',
+  Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas',
   PathFunc in '..\Components\PathFunc.pas',
-  Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   SHA1 in '..\Components\SHA1.pas',
   Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
   Shared.LangOptionsSectionDirectives in 'Src\Shared.LangOptionsSectionDirectives.pas',
-  Shared.MsgIDs in 'Src\Shared.MsgIDs.pas',
-  Shared.SetupEnt in 'Src\Shared.SetupEnt.pas',
+  Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
+  Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
   Shared.SimpleExpression in 'Src\Shared.SimpleExpression.pas',

Projects/ISCmplr.dproj

@@ -78,8 +78,8 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
-        <DCCReference Include="Src\Shared.CompInt.pas"/>
-        <DCCReference Include="Src\Shared.CompPreprocInt.pas"/>
+        <DCCReference Include="Src\Shared.CompilerInt.pas"/>
+        <DCCReference Include="Src\Shared.PreprocInt.pas"/>
         <DCCReference Include="Src\ISCmplr\Compiler.Compile.pas"/>
         <DCCReference Include="Src\ISCmplr\Compiler.Messages.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
@@ -87,23 +87,23 @@
         <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\Compiler.ExeUpdate.pas"/>
+        <DCCReference Include="Src\Shared.ResUpdateFunc.pas"/>
+        <DCCReference Include="Src\ISCmplr\Compiler.ExeUpdateFunc.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
-        <DCCReference Include="Src\Shared.CompressZlib.pas"/>
-        <DCCReference Include="Src\Shared.bzlib.pas"/>
+        <DCCReference Include="Src\Shared.Compress.Zlib.pas"/>
+        <DCCReference Include="Src\Shared.Compress.bzlib.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"/>
+        <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
         <DCCReference Include="Src\Shared.DebugStruct.pas"/>
         <DCCReference Include="Src\Shared.LangOptionsSectionDirectives.pas"/>
-        <DCCReference Include="Src\Shared.MsgIDs.pas"/>
-        <DCCReference Include="Src\Shared.SetupEnt.pas"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
+        <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupSectionDirectives.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
         <DCCReference Include="Src\Shared.SimpleExpression.pas"/>

Projects/ISPP.dpr

@@ -14,7 +14,7 @@ uses
   SysUtils,
   Windows,
   Classes,
-  Shared.CompPreprocInt in 'Src\Shared.CompPreprocInt.pas',
+  Shared.PreprocInt in 'Src\Shared.PreprocInt.pas',
   ISPP.Preprocess in 'Src\ISPP\ISPP.Preprocess.pas',
   ISPP.Preprocessor in 'Src\ISPP\ISPP.Preprocessor.pas',
   ISPP.Funcs in 'Src\ISPP\ISPP.Funcs.pas',
@@ -28,7 +28,7 @@ uses
   ISPP.CTokenizer in 'Src\ISPP\ISPP.CTokenizer.pas',
   ISPP.Base in 'Src\ISPP\ISPP.Base.pas',
   PathFunc in '..\Components\PathFunc.pas',
-  Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   MD5 in '..\Components\MD5.pas',

Projects/ISPP.dproj

@@ -75,7 +75,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\Shared.CompPreprocInt.pas"/>
+        <DCCReference Include="Src\Shared.PreprocInt.pas"/>
         <DCCReference Include="Src\ISPP\ISPP.Preprocess.pas"/>
         <DCCReference Include="Src\ISPP\ISPP.Preprocessor.pas"/>
         <DCCReference Include="Src\ISPP\ISPP.Funcs.pas"/>
@@ -89,7 +89,7 @@
         <DCCReference Include="Src\ISPP\ISPP.CTokenizer.pas"/>
         <DCCReference Include="Src\ISPP\ISPP.Base.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>

Projects/Setup.dpr

@@ -17,17 +17,17 @@ uses
   SysUtils,
   Messages,
   RichEditViewer in '..\Components\RichEditViewer.pas',
-  Shared.CmnFunc in 'Src\Shared.CmnFunc.pas',
-  Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
+  Shared.CommonFunc.Vcl in 'Src\Shared.CommonFunc.Vcl.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   Setup.MainForm in 'Src\Setup\Setup.MainForm.pas' {MainForm},
   Setup.Install in 'Src\Setup\Setup.Install.pas',
   Shared.Messages in 'Src\SetupLdrAndSetup\Shared.Messages.pas',
-  Shared.MsgIDs in 'Src\Shared.MsgIDs.pas',
+  Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
   Setup.UninstallLog in 'Src\Setup\Setup.UninstallLog.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
   Setup.NewDiskForm in 'Src\Setup\Setup.NewDiskForm.pas' {NewDiskForm},
   Shared.InstFunc in 'Src\SetupLdrAndSetup\Shared.InstFunc.pas',
-  Setup.InstFnc2 in 'Src\Setup\Setup.InstFnc2.pas',
+  Setup.InstFunc.Ole in 'Src\Setup\Setup.InstFunc.Ole.pas',
   Setup.WizardForm in 'Src\Setup\Setup.WizardForm.pas' {WizardForm},
   Setup.ScriptFunc in 'Src\Setup\Setup.ScriptFunc.pas',
   Shared.ScriptFunc in 'Src\Shared.ScriptFunc.pas',
@@ -40,8 +40,8 @@ uses
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   Setup.SelectFolderForm in 'Src\Setup\Setup.SelectFolderForm.pas' {SelectFolderForm},
   Shared.Compress in 'Src\Shared.Compress.pas',
-  Shared.CompressZlib in 'Src\Shared.CompressZlib.pas',
-  Shared.bzlib in 'Src\Shared.bzlib.pas',
+  Shared.Compress.Zlib in 'Src\Shared.Compress.Zlib.pas',
+  Shared.Compress.bzlib in 'Src\Shared.Compress.bzlib.pas',
   Setup.LZMADecompressor in 'Src\Setup\Setup.LZMADecompressor.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   MD5 in '..\Components\MD5.pas',
@@ -61,13 +61,13 @@ uses
   Shared.RedirFunc in 'Src\SetupLdrAndSetup\Shared.RedirFunc.pas',
   Setup.SecurityFunc in 'Src\Setup\Setup.SecurityFunc.pas',
   Setup.Helper in 'Src\Setup\Setup.Helper.pas',
-  Shared.VerInfo in 'Src\Shared.VerInfo.pas',
+  Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas',
   Setup.RegDLL in 'Src\Setup\Setup.RegDLL.pas',
-  Shared.ResUpdate in 'Src\Shared.ResUpdate.pas',
+  Shared.ResUpdateFunc in 'Src\Shared.ResUpdateFunc.pas',
   Setup.SpawnCommon in 'Src\Setup\Setup.SpawnCommon.pas',
   Setup.SpawnServer in 'Src\Setup\Setup.SpawnServer.pas',
   Setup.SpawnClient in 'Src\Setup\Setup.SpawnClient.pas',
-  Shared.TaskDialog in 'Src\Shared.TaskDialog.pas',
+  Shared.TaskDialogFunc in 'Src\Shared.TaskDialogFunc.pas',
   BidiUtils in '..\Components\BidiUtils.pas',
   PathFunc in '..\Components\PathFunc.pas',
   BidiCtrls in '..\Components\BidiCtrls.pas',
@@ -84,7 +84,7 @@ uses
   ASMInline in '..\Components\ASMInline.pas',
   Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
   Setup.DotNetFunc in 'Src\Setup\Setup.DotNetFunc.pas',
-  Shared.SetupEnt in 'Src\Shared.SetupEnt.pas',
+  Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   Setup.MsiFunc in 'Src\Setup\Setup.MsiFunc.pas',
   Shared.DotNetVersion in 'Src\Shared.DotNetVersion.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas';

Projects/Setup.dproj

@@ -76,21 +76,21 @@
         <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
-        <DCCReference Include="Src\Shared.CmnFunc.pas"/>
-        <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.Vcl.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.MainForm.pas">
             <Form>MainForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Setup\Setup.Install.pas"/>
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.Messages.pas"/>
-        <DCCReference Include="Src\Shared.MsgIDs.pas"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
         <DCCReference Include="Src\Setup\Setup.UninstallLog.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
         <DCCReference Include="Src\Setup\Setup.NewDiskForm.pas">
             <Form>NewDiskForm</Form>
         </DCCReference>
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.InstFunc.pas"/>
-        <DCCReference Include="Src\Setup\Setup.InstFnc2.pas"/>
+        <DCCReference Include="Src\Setup\Setup.InstFunc.Ole.pas"/>
         <DCCReference Include="Src\Setup\Setup.WizardForm.pas">
             <Form>WizardForm</Form>
         </DCCReference>
@@ -109,8 +109,8 @@
             <Form>SelectFolderForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Shared.Compress.pas"/>
-        <DCCReference Include="Src\Shared.CompressZlib.pas"/>
-        <DCCReference Include="Src\Shared.bzlib.pas"/>
+        <DCCReference Include="Src\Shared.Compress.Zlib.pas"/>
+        <DCCReference Include="Src\Shared.Compress.bzlib.pas"/>
         <DCCReference Include="Src\Setup\Setup.LZMADecompressor.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
@@ -134,13 +134,13 @@
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.RedirFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.SecurityFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.Helper.pas"/>
-        <DCCReference Include="Src\Shared.VerInfo.pas"/>
+        <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.RegDLL.pas"/>
-        <DCCReference Include="Src\Shared.ResUpdate.pas"/>
+        <DCCReference Include="Src\Shared.ResUpdateFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.SpawnCommon.pas"/>
         <DCCReference Include="Src\Setup\Setup.SpawnServer.pas"/>
         <DCCReference Include="Src\Setup\Setup.SpawnClient.pas"/>
-        <DCCReference Include="Src\Shared.TaskDialog.pas"/>
+        <DCCReference Include="Src\Shared.TaskDialogFunc.pas"/>
         <DCCReference Include="..\Components\BidiUtils.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="..\Components\BidiCtrls.pas"/>
@@ -157,7 +157,7 @@
         <DCCReference Include="..\Components\ASMInline.pas"/>
         <DCCReference Include="Src\Shared.TaskbarProgressFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.DotNetFunc.pas"/>
-        <DCCReference Include="Src\Shared.SetupEnt.pas"/>
+        <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="Src\Setup\Setup.MsiFunc.pas"/>
         <DCCReference Include="Src\Shared.DotNetVersion.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>

Projects/SetupLdr.dpr

@@ -17,11 +17,11 @@ uses
   SysUtils,
   Shared.Compress in 'Src\Shared.Compress.pas',
   SetupLdr.LZMA1SmallDecompressor in 'Src\SetupLdr\SetupLdr.LZMA1SmallDecompressor.pas',
-  Shared.SetupEnt in 'Src\Shared.SetupEnt.pas',
+  Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   PathFunc in '..\Components\PathFunc.pas',
-  Shared.CmnFunc2 in 'Src\Shared.CmnFunc2.pas',
+  Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   Shared.Messages in 'Src\SetupLdrAndSetup\Shared.Messages.pas',
-  Shared.MsgIDs in 'Src\Shared.MsgIDs.pas',
+  Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
   Shared.InstFunc in 'Src\SetupLdrAndSetup\Shared.InstFunc.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
@@ -30,7 +30,7 @@ uses
   MD5 in '..\Components\MD5.pas',
   Shared.RedirFunc in 'Src\SetupLdrAndSetup\Shared.RedirFunc.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
-  Shared.VerInfo in 'Src\Shared.VerInfo.pas';
+  Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas';
 
 {$SETPEOSVERSION 6.1}
 {$SETPESUBSYSVERSION 6.1}

Projects/SetupLdr.dproj

@@ -74,11 +74,11 @@
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.XPTheme.pas"/>
         <DCCReference Include="Src\Shared.Compress.pas"/>
         <DCCReference Include="Src\SetupLdr\SetupLdr.LZMA1SmallDecompressor.pas"/>
-        <DCCReference Include="Src\Shared.SetupEnt.pas"/>
+        <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
-        <DCCReference Include="Src\Shared.CmnFunc2.pas"/>
+        <DCCReference Include="Src\Shared.CommonFunc.pas"/>
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.Messages.pas"/>
-        <DCCReference Include="Src\Shared.MsgIDs.pas"/>
+        <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.InstFunc.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
@@ -87,7 +87,7 @@
         <DCCReference Include="..\Components\MD5.pas"/>
         <DCCReference Include="Src\SetupLdrAndSetup\Shared.RedirFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
-        <DCCReference Include="Src\Shared.VerInfo.pas"/>
+        <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>

Projects/Src/Compil32/IDE.CompileForm.pas

@@ -25,7 +25,7 @@ uses
   Windows, Messages, SysUtils, Classes, Contnrs, Graphics, Controls, Forms, Dialogs, CommDlg,
   Generics.Collections, Shared.UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
   ScintInt, ScintEdit, IDE.ScintStylerInnoSetup, NewTabSet, ModernColors, IDE.CompScintEdit,
-  Shared.DebugStruct, Shared.CompInt, NewUxTheme, ImageList, ImgList, ToolWin, IDE.HelpFunc,
+  Shared.DebugStruct, Shared.CompilerInt, NewUxTheme, ImageList, ImgList, ToolWin, IDE.HelpFunc,
   VirtualImageList, BaseImageCollection, ImageCollection;
 
 const
@@ -651,7 +651,7 @@ implementation
 uses
   ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes,
   Math, StrUtils, WideStrUtils,
-  PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Shared.FileClass, IDE.Messages, TmSchema, Shared.BrowseFunc,
+  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, TmSchema, Shared.BrowseFunc,
   IDE.HtmlHelpFunc, Shared.TaskbarProgressFunc,
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
   IDE.OptionsForm, IDE.StartupForm, IDE.Wizard.WizardForm, IDE.SignToolsForm, Shared.CompTypes, IDE.InputQueryComboForm, IDE.MsgBoxDesignerForm,

Projects/Src/Compil32/IDE.FileAssocFunc.pas

@@ -17,7 +17,7 @@ procedure UnregisterISSFileAssociation;
 implementation
 
 uses
-  Windows, SysUtils, PathFunc, ShlObj, Shared.CmnFunc, Shared.CmnFunc2;
+  Windows, SysUtils, PathFunc, ShlObj, Shared.CommonFunc.Vcl, Shared.CommonFunc;
   
 function GetRootkey: HKEY;
 begin

Projects/Src/Compil32/IDE.HelpFunc.pas

@@ -86,7 +86,7 @@ implementation
 uses
   ActiveX, ShlObj, ShellApi, CommDlg, SysUtils, IOUtils, StrUtils,
   Messages, DwmApi, Consts,
-  Shared.CmnFunc2, PathFunc, Shared.FileClass, NewUxTheme,
+  Shared.CommonFunc, PathFunc, Shared.FileClass, NewUxTheme,
   IDE.CompileForm, IDE.Messages, Shared.CompTypes;
 
 procedure InitFormFont(Form: TForm);

Projects/Src/Compil32/IDE.HtmlHelpFunc.pas

@@ -42,7 +42,7 @@ procedure FreeHtmlHelpLibrary;
 implementation
 
 uses
-  Messages, SysUtils, Shared.CmnFunc2, PathFunc;
+  Messages, SysUtils, Shared.CommonFunc, PathFunc;
 
 var
   HHCtrl: THandle;

Projects/Src/Compil32/IDE.MsgBoxDesignerForm.pas

@@ -108,7 +108,7 @@ type
 implementation
 
 uses
-  Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, Shared.TaskDialog, IDE.Messages;
+  Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelpFunc, Shared.TaskDialogFunc, IDE.Messages;
 
 {$R *.DFM}
 

Projects/Src/Compil32/IDE.OptionsForm.pas

@@ -70,7 +70,7 @@ type
 implementation
 
 uses
-  Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, IDE.FileAssocFunc;
+  Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelpFunc, IDE.FileAssocFunc;
 
 {$R *.DFM}
 

Projects/Src/Compil32/IDE.ScintStylerInnoSetup.pas

@@ -155,8 +155,8 @@ implementation
 
 uses
   Generics.Defaults,
-  Shared.MsgIDs, ScintInt, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives,
-  Shared.CmnFunc, Shared.SetupTypes, Shared.Struct, Shared.DotNetVersion, isxclasses_wordlists_generated;
+  Shared.SetupMessageIDs, ScintInt, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives,
+  Shared.CommonFunc.Vcl, Shared.SetupTypes, Shared.Struct, Shared.DotNetVersion, isxclasses_wordlists_generated;
 
 type
   { Size must be <= SizeOf(TScintLineState) }

Projects/Src/Compil32/IDE.SignToolsForm.pas

@@ -46,7 +46,7 @@ type
 implementation
 
 uses
-  Windows, Messages, IDE.HelpFunc, Shared.CmnFunc, Dialogs, SysUtils;
+  Windows, Messages, IDE.HelpFunc, Shared.CommonFunc.Vcl, Dialogs, SysUtils;
 
 {$R *.DFM}
 

Projects/Src/Compil32/IDE.StartupForm.pas

@@ -59,7 +59,7 @@ type
 implementation
 
 uses
-  IDE.Messages, Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, IDE.CompileForm, ComCtrls;
+  IDE.Messages, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelpFunc, IDE.CompileForm, ComCtrls;
 
 {$R *.DFM}
 

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

@@ -60,7 +60,7 @@ type
 implementation
 
 uses
-  IDE.Messages, Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc;
+  IDE.Messages, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelpFunc;
 
 {$R *.DFM}
 

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

@@ -187,7 +187,7 @@ implementation
 
 uses
   SysUtils, ShlObj, ActiveX, UITypes, Shared.FileClass,
-  PathFunc, Shared.CmnFunc, Shared.CmnFunc2, IDE.HelpFunc, Shared.BrowseFunc,
+  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelpFunc, Shared.BrowseFunc,
   IDE.Messages, IDE.Wizard.WizardFileForm;
 
 type

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

@@ -48,7 +48,7 @@ implementation
 
 uses
   SysUtils, UITypes,
-  Shared.CmnFunc, Shared.CmnFunc2, Shared.BrowseFunc, PathFunc,
+  Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.BrowseFunc, PathFunc,
   IDE.Messages, IDE.Wizard.WizardFileForm;
 
 constructor TWizardFormFilesHelper.Create(const Form: TForm;

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

@@ -47,7 +47,7 @@ implementation
 uses
   Windows, Classes, SysUtils, StrUtils, TypInfo, Graphics, UITypes,
   ComCtrls,
-  IDE.CompileForm, IDE.HelpFunc, IDE.Messages, Shared.BrowseFunc, Shared.CmnFunc2, IDE.HtmlHelpFunc;
+  IDE.CompileForm, IDE.HelpFunc, IDE.Messages, Shared.BrowseFunc, Shared.CommonFunc, IDE.HtmlHelpFunc;
 
 { TWizardFormRegistryHelper }
 

Projects/Src/ISCmplr/Compiler.Compile.pas

@@ -18,7 +18,7 @@ unit Compiler.Compile;
 interface
 
 uses
-  Windows, SysUtils, Shared.CompInt;
+  Windows, SysUtils, Shared.CompilerInt;
 
 function ISCompileScript(const Params: TCompileScriptParamsEx;
   const PropagateExceptions: Boolean): Integer;
@@ -30,11 +30,11 @@ type
 implementation
 
 uses
-  Shared.CompPreprocInt, Commctrl, Consts, Classes, IniFiles, TypInfo, AnsiStrings, Math,
+  Shared.PreprocInt, Commctrl, Consts, Classes, IniFiles, TypInfo, AnsiStrings, Math,
   Generics.Collections, StrUtils, WideStrUtils,
-  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,
+  PathFunc, Shared.CommonFunc, Shared.Struct, Shared.Int64Em, Compiler.Messages, Shared.SetupEntFunc,
+  Shared.FileClass, Shared.Compress, Shared.Compress.Zlib, Shared.Compress.bzlib, Compiler.LZMACompressor, Shared.ArcFour, SHA1,
+  Shared.SetupMessageIDs, Shared.SetupSectionDirectives, Shared.LangOptionsSectionDirectives, Shared.DebugStruct, Shared.VerInfoFunc, Shared.ResUpdateFunc, Compiler.ExeUpdateFunc,
 {$IFDEF STATICPREPROC}
   IsppPreprocess,
 {$ENDIF}

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

@@ -1,4 +1,4 @@
-unit Compiler.ExeUpdate;
+unit Compiler.ExeUpdateFunc;
 
 {
   Inno Setup
@@ -12,7 +12,7 @@ unit Compiler.ExeUpdate;
 interface
 
 uses
-  Windows, SysUtils, Shared.FileClass, Shared.VerInfo;
+  Windows, SysUtils, Shared.FileClass, Shared.VerInfoFunc;
 
 procedure UpdateSetupPEHeaderFields(const F: TCustomFile;
   const IsTSAware, IsDEPCompatible, IsASLRCompatible: Boolean);
@@ -27,7 +27,7 @@ procedure PreventCOMCTL32Sideloading(const F: TCustomFile);
 implementation
 
 uses
-  Shared.ResUpdate, Math, Shared.Int64Em;
+  Shared.ResUpdateFunc, Math, Shared.Int64Em;
 
 procedure UpdateSetupPEHeaderFields(const F: TCustomFile;
   const IsTSAware, IsDEPCompatible, IsASLRCompatible: Boolean);

Projects/Src/ISCmplr/Compiler.ScriptFunc.pas

@@ -21,7 +21,7 @@ implementation
 
 uses
   Windows, SysUtils, TypInfo,
-  Shared.CmnFunc2, Shared.MsgIDs, Shared.Struct,
+  Shared.CommonFunc, Shared.SetupMessageIDs, Shared.Struct,
   Shared.SetupTypes, Shared.ScriptFunc, Compiler.Messages, Shared.DotNetVersion;
 
 { This type copied from CmnFunc.pas. We don't actually 'use' CmnFunc since

Projects/Src/ISPP/ISPP.CTokenizer.pas

@@ -117,7 +117,7 @@ const
 implementation
 
 uses
-  ISPP.Consts, Shared.CmnFunc2;
+  ISPP.Consts, Shared.CommonFunc;
 
 { TCTokenizer }
 

Projects/Src/ISPP/ISPP.Funcs.pas

@@ -21,7 +21,7 @@ implementation
 
 uses
   SysUtils, IniFiles, Registry, Math, ISPP.Consts, ISPP.Base, ISPP.IdentMan,
-  ISPP.Sessions, DateUtils, Shared.FileClass, MD5, SHA1, PathFunc, Shared.CmnFunc2,
+  ISPP.Sessions, DateUtils, Shared.FileClass, MD5, SHA1, PathFunc, Shared.CommonFunc,
   Shared.Int64Em;
   
 var
@@ -136,7 +136,7 @@ begin
   if CheckParams(Params, [evStr], 1, Result) then
   try
     with IInternalFuncParams(Params) do
-      MakeBool(ResPtr^, Shared.CmnFunc2.DirExists(PrependPath(Ext, Get(0).AsStr)));
+      MakeBool(ResPtr^, Shared.CommonFunc.DirExists(PrependPath(Ext, Get(0).AsStr)));
   except
     on E: Exception do
     begin

Projects/Src/ISPP/ISPP.Preprocess.pas

@@ -13,14 +13,14 @@ unit ISPP.Preprocess;
 interface
 
 uses
-  Shared.CompPreprocInt;
+  Shared.PreprocInt;
 
 function ISPreprocessScript(var Params: TPreprocessScriptParams): Integer; stdcall;
 
 implementation
 
 uses
-  SysUtils, Shared.CmnFunc2, PathFunc,
+  SysUtils, Shared.CommonFunc, PathFunc,
   ISPP.Base, ISPP.Preprocessor, ISPP.Sessions, ISPP.Intf,
   ISPP.IdentMan, ISPP.VarUtils, ISPP.Consts;
 

Projects/Src/ISPP/ISPP.Preprocessor.pas

@@ -13,7 +13,7 @@ unit ISPP.Preprocessor;
 interface
 
 uses
-  Windows, SysUtils, Classes, Shared.CompPreprocInt, IniFiles, Registry, ISPP.Intf,
+  Windows, SysUtils, Classes, Shared.PreprocInt, IniFiles, Registry, ISPP.Intf,
   ISPP.Base, ISPP.Stack, ISPP.IdentMan, ISPP.Parser;
 
 type
@@ -154,7 +154,7 @@ implementation
 
 uses
   ISPP.Consts, ISPP.Funcs, ISPP.VarUtils, ISPP.Sessions, ISPP.CTokenizer, PathFunc,
-  Shared.CmnFunc2, Shared.FileClass, Shared.Struct;
+  Shared.CommonFunc, Shared.FileClass, Shared.Struct;
 
 const
   PreprocCommands: array[TPreprocessorCommand] of String =

Projects/Src/Setup/Setup.DebugClient.pas

@@ -36,7 +36,7 @@ procedure SetDebugServerWnd(Wnd: HWND; WantCodeText: Boolean);
 implementation
 
 uses
-  Forms, Classes, Shared.CmnFunc2, Shared.Struct, Shared.InstFunc, Setup.MainForm;
+  Forms, Classes, Shared.CommonFunc, Shared.Struct, Shared.InstFunc, Setup.MainForm;
 
 type
   TDummyClass = class

Projects/Src/Setup/Setup.DotNetFunc.pas

@@ -29,7 +29,7 @@
 interface
 
 uses
-  Ole2, SysUtils, Windows, Shared.CmnFunc2, Shared.DotNetVersion;
+  Ole2, SysUtils, Windows, Shared.CommonFunc, Shared.DotNetVersion;
 
 type
   IAssemblyCache = class(Ole2.IUnknown)

Projects/Src/Setup/Setup.FileExtractor.pas

@@ -50,8 +50,8 @@ procedure FreeFileExtractor;
 implementation
 
 uses
-  PathFunc, Shared.CmnFunc2, Setup.MainForm, Shared.Messages, Shared.MsgIDs,
-  Shared.InstFunc, Shared.CompressZlib, Shared.bzlib,
+  PathFunc, Shared.CommonFunc, Setup.MainForm, Shared.Messages, Shared.SetupMessageIDs,
+  Shared.InstFunc, Shared.Compress.Zlib, Shared.Compress.bzlib,
   Setup.LZMADecompressor, SHA1, Setup.LoggingFunc, Setup.NewDiskForm;
 
 var

Projects/Src/Setup/Setup.Helper.pas

@@ -31,8 +31,8 @@ implementation
 {x$DEFINE HELPERDEBUG}
 
 uses
-  Forms, Shared.Int64Em, Shared.CmnFunc, Shared.CmnFunc2, PathFunc, Setup.MainForm, Shared.InstFunc,
-  Setup.LoggingFunc, Shared.Messages, Shared.MsgIDs;
+  Forms, Shared.Int64Em, Shared.CommonFunc.Vcl, Shared.CommonFunc, PathFunc, Setup.MainForm, Shared.InstFunc,
+  Setup.LoggingFunc, Shared.Messages, Shared.SetupMessageIDs;
 
 const
   HELPER_VERSION = 105;

Projects/Src/Setup/Setup.InstFnc2.pas → Projects/Src/Setup/Setup.InstFunc.Ole.pas

@@ -1,4 +1,4 @@
-unit Setup.InstFnc2;
+unit Setup.InstFunc.Ole;
 
 {
   Inno Setup
@@ -23,8 +23,8 @@ function UnpinShellLink(const Filename: String): Boolean;
 implementation
 
 uses
-  Windows, SysUtils, PathFunc, Shared.CmnFunc2, Shared.InstFunc, Setup.MainForm,
-  Shared.Messages, Shared.MsgIDs,
+  Windows, SysUtils, PathFunc, Shared.CommonFunc, Shared.InstFunc, Setup.MainForm,
+  Shared.Messages, Shared.SetupMessageIDs,
   ActiveX, ComObj, PropSys, ShellAPI, ShlObj;
 
 procedure AssignWorkingDir(const SL: IShellLink; const WorkingDir: String);

Projects/Src/Setup/Setup.Install.pas

@@ -29,11 +29,11 @@ implementation
 
 uses
   Windows, SysUtils, Messages, Classes, Forms, ShlObj, Shared.Struct, Setup.UninstallLog, Shared.SetupTypes,
-  Shared.InstFunc, Setup.InstFnc2, Setup.SecurityFunc, Shared.Messages,
+  Shared.InstFunc, Setup.InstFunc.Ole, Setup.SecurityFunc, Shared.Messages,
   Setup.MainForm, Setup.LoggingFunc, Setup.FileExtractor, Shared.FileClass,
-  Shared.Compress, SHA1, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Shared.RedirFunc, Shared.Int64Em, Shared.MsgIDs,
-  Setup.WizardForm, Shared.DebugStruct, Setup.DebugClient, Shared.VerInfo, Setup.ScriptRunner, Setup.RegDLL, Setup.Helper,
-  Shared.ResUpdate, Setup.DotNetFunc, Shared.TaskbarProgressFunc, NewProgressBar, RestartManager,
+  Shared.Compress, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
+  Setup.WizardForm, Shared.DebugStruct, Setup.DebugClient, Shared.VerInfoFunc, Setup.ScriptRunner, Setup.RegDLL, Setup.Helper,
+  Shared.ResUpdateFunc, Setup.DotNetFunc, Shared.TaskbarProgressFunc, NewProgressBar, RestartManager,
   Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;
 
 type

Projects/Src/Setup/Setup.LoggingFunc.pas

@@ -24,7 +24,7 @@ const
 implementation
 
 uses
-  Windows, SysUtils, Shared.Int64Em, Shared.CmnFunc2, Shared.FileClass, Setup.DebugClient;
+  Windows, SysUtils, Shared.Int64Em, Shared.CommonFunc, Shared.FileClass, Setup.DebugClient;
 
 var
   LogFile: TTextFileWriter;

Projects/Src/Setup/Setup.MainForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, SysUtils, Messages, Classes, Graphics, Controls, Forms, Dialogs,
-  Setup.SetupForm, StdCtrls, Shared.Struct, Shared.DebugStruct, Shared.Int64Em, Shared.CmnFunc, Shared.CmnFunc2,
+  Setup.SetupForm, StdCtrls, Shared.Struct, Shared.DebugStruct, Shared.Int64Em, Shared.CommonFunc.Vcl, Shared.CommonFunc,
   Shared.SetupTypes, Setup.ScriptRunner, BidiUtils, RestartManager;
 
 type
@@ -267,11 +267,11 @@ implementation
 
 uses
   ShellAPI, ShlObj, StrUtils,
-  Shared.Messages, Shared.MsgIDs, Setup.Install, Shared.InstFunc, Setup.InstFnc2, Shared.RedirFunc, PathFunc,
-  Shared.Compress, Shared.CompressZlib, Shared.bzlib, Setup.LZMADecompressor, Shared.ArcFour, Shared.SetupEnt, Setup.SelectLanguageForm,
-  Setup.WizardForm, Setup.DebugClient, Shared.VerInfo, Setup.FileExtractor, Shared.FileClass, Setup.LoggingFunc, MD5, SHA1, ActiveX,
+  Shared.Messages, Shared.SetupMessageIDs, Setup.Install, Shared.InstFunc, Setup.InstFunc.Ole, Shared.RedirFunc, PathFunc,
+  Shared.Compress, Shared.Compress.Zlib, Shared.Compress.bzlib, Setup.LZMADecompressor, Shared.ArcFour, Shared.SetupEntFunc, Setup.SelectLanguageForm,
+  Setup.WizardForm, Setup.DebugClient, Shared.VerInfoFunc, Setup.FileExtractor, Shared.FileClass, Setup.LoggingFunc, MD5, SHA1, ActiveX,
   Shared.SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,
-  Shared.TaskDialog, RegStr;
+  Shared.TaskDialogFunc, RegStr;
 
 {$R *.DFM}
 

Projects/Src/Setup/Setup.MsiFunc.pas

@@ -16,7 +16,7 @@ function IsMsiProductInstalled(const UpgradeCode: String; const PackedMinVersion
 implementation
 
 uses
-  Windows, SysUtils, Shared.CmnFunc2, PathFunc, Shared.VerInfo;
+  Windows, SysUtils, Shared.CommonFunc, PathFunc, Shared.VerInfoFunc;
 
 var
   MsiLoaded: Boolean;

Projects/Src/Setup/Setup.NewDiskForm.pas

@@ -40,7 +40,7 @@ function SelectDisk(const DiskNumber: Integer; const AFilename: String; var Path
 implementation
 
 uses
-  Shared.Messages, Shared.MsgIDs, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Shared.BrowseFunc,
+  Shared.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.BrowseFunc,
   Setup.MainForm, Setup.WizardForm;
 
 {$R *.DFM}

Projects/Src/Setup/Setup.RegDLL.pas

@@ -20,7 +20,7 @@ procedure RegisterServer(const AUnregister: Boolean; const AIs64Bit: Boolean;
 implementation
 
 uses
-  SysUtils, Forms, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Shared.InstFunc, Shared.Messages, Shared.MsgIDs,
+  SysUtils, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.InstFunc, Shared.Messages, Shared.SetupMessageIDs,
   Setup.LoggingFunc, Shared.RedirFunc, Setup.MainForm;
 
 function WaitForAndCloseProcessHandle(var AProcessHandle: THandle): DWORD;

Projects/Src/Setup/Setup.RegSvr.pas

@@ -16,8 +16,8 @@ procedure RunRegSvr;
 implementation
 
 uses
-  Windows, SysUtils, Classes, Forms, PathFunc, Shared.CmnFunc2, Shared.InstFunc, Setup.InstFnc2,
-  Shared.FileClass, Shared.CmnFunc, Shared.Struct, Setup.MainForm, Shared.Messages, Shared.MsgIDs, Setup.RegDLL, Setup.Helper;
+  Windows, SysUtils, Classes, Forms, PathFunc, Shared.CommonFunc, Shared.InstFunc, Setup.InstFunc.Ole,
+  Shared.FileClass, Shared.CommonFunc.Vcl, Shared.Struct, Setup.MainForm, Shared.Messages, Shared.SetupMessageIDs, Setup.RegDLL, Setup.Helper;
 
 procedure DeleteOldTempFiles(const Path: String);
 { Removes any old isRS-???.tmp files from Path. Not strictly necessary, but

Projects/Src/Setup/Setup.ScriptDlg.pas

@@ -202,7 +202,7 @@ implementation
 uses
   StrUtils,
   Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, Shared.Messages,
-  Shared.MsgIDs, PathFunc, Shared.CmnFunc, Shared.CmnFunc2,
+  Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
   Shared.BrowseFunc, Setup.LoggingFunc, Shared.InstFunc;
 
 const

Projects/Src/Setup/Setup.ScriptFunc.pas

@@ -21,10 +21,10 @@ implementation
 uses
   Windows, Shared.ScriptFunc,
   Forms, uPSUtils, SysUtils, Classes, Graphics, Controls, TypInfo, ActiveX,
-  Shared.Struct, Setup.ScriptDlg, Setup.MainForm, PathFunc, Shared.CmnFunc,
-  Shared.CmnFunc2, Shared.FileClass, Shared.RedirFunc,
-  Setup.Install, Shared.InstFunc, Setup.InstFnc2, Shared.Messages,
-  Shared.MsgIDs, Setup.NewDiskForm, Shared.BrowseFunc, Setup.WizardForm, Shared.VerInfo,
+  Shared.Struct, Setup.ScriptDlg, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl,
+  Shared.CommonFunc, Shared.FileClass, Shared.RedirFunc,
+  Setup.Install, Shared.InstFunc, Setup.InstFunc.Ole, Shared.Messages,
+  Shared.SetupMessageIDs, Setup.NewDiskForm, Shared.BrowseFunc, Setup.WizardForm, Shared.VerInfoFunc,
   Shared.SetupTypes, Shared.Int64Em, MD5, SHA1, Setup.LoggingFunc, Setup.SetupForm, Setup.RegDLL, Setup.Helper,
   Setup.SpawnClient, Setup.UninstallProgressForm, ASMInline, Setup.DotNetFunc,
   Shared.DotNetVersion, Setup.MsiFunc, BitmapImage;

Projects/Src/Setup/Setup.SecurityFunc.pas

@@ -12,7 +12,7 @@ unit Setup.SecurityFunc;
 interface
 
 uses
-  Windows, SysUtils, Shared.CmnFunc2, Shared.Struct;
+  Windows, SysUtils, Shared.CommonFunc, Shared.Struct;
 
 function GrantPermissionOnFile(const DisableFsRedir: Boolean; Filename: String;
   const Entries: TGrantPermissionEntry; const EntryCount: Integer): Boolean;

Projects/Src/Setup/Setup.SelectFolderForm.pas

@@ -42,8 +42,8 @@ function ShowSelectFolderDialog(const StartMenu, AppendDir: Boolean;
 implementation
 
 uses
-  PathFunc, Shared.Messages, Shared.MsgIDs, Setup.MainForm,
-  Shared.SetupTypes, Setup.WizardForm, Shared.CmnFunc2;
+  PathFunc, Shared.Messages, Shared.SetupMessageIDs, Setup.MainForm,
+  Shared.SetupTypes, Setup.WizardForm, Shared.CommonFunc;
 
 {$R *.DFM}
 

Projects/Src/Setup/Setup.SelectLanguageForm.pas

@@ -36,7 +36,7 @@ function AskForLanguage: Boolean;
 implementation
 
 uses
-  Shared.Struct, Shared.Messages, Shared.MsgIDs, Setup.MainForm;
+  Shared.Struct, Shared.Messages, Shared.SetupMessageIDs, Setup.MainForm;
 
 {$R *.DFM}
 

Projects/Src/Setup/Setup.SetupForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, SysUtils, Messages, Classes, Graphics, Controls, Forms, Dialogs,
-  Shared.UIStateForm, Shared.MsgIDs;
+  Shared.UIStateForm, Shared.SetupMessageIDs;
 
 type
   TSetupForm = class(TUIStateForm)
@@ -74,7 +74,7 @@ implementation
 
 uses
   Generics.Collections, UITypes,
-  Shared.CmnFunc2, Setup.MainForm, Shared.Messages, BidiUtils;
+  Shared.CommonFunc, Setup.MainForm, Shared.Messages, BidiUtils;
 
 var
   WM_QueryCancelAutoPlay: UINT;

Projects/Src/Setup/Setup.SpawnClient.pas

@@ -15,7 +15,7 @@ unit Setup.SpawnClient;
 interface
 
 uses
-  Windows, SysUtils, Messages, Shared.InstFunc, Shared.CmnFunc2;
+  Windows, SysUtils, Messages, Shared.InstFunc, Shared.CommonFunc;
 
 procedure InitializeSpawnClient(const AServerWnd: HWND);
 function InstExecEx(const RunAsOriginalUser: Boolean;

Projects/Src/Setup/Setup.SpawnServer.pas

@@ -46,7 +46,7 @@ implementation
 {x$DEFINE SPAWNSERVER_RESPAWN_ALWAYS}
 
 uses
-  Classes, Forms, ShellApi, Shared.Int64Em, PathFunc, Shared.CmnFunc2, Shared.InstFunc, Setup.SpawnCommon;
+  Classes, Forms, ShellApi, Shared.Int64Em, PathFunc, Shared.CommonFunc, Shared.InstFunc, Setup.SpawnCommon;
 
 type
   TPtrAndSize = record

Projects/Src/Setup/Setup.Uninstall.pas

@@ -17,8 +17,8 @@ procedure HandleUninstallerEndSession;
 implementation
 
 uses
-  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CmnFunc, Shared.CmnFunc2, Setup.UninstallLog, Shared.Messages,
-  Shared.MsgIDs, Shared.InstFunc, Shared.Struct, Shared.SetupEnt, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
+  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.UninstallLog, Shared.Messages,
+  Shared.SetupMessageIDs, Shared.InstFunc, Shared.Struct, Shared.SetupEntFunc, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
   Shared.FileClass, Setup.ScriptRunner, Setup.DebugClient, Shared.SetupTypes, Setup.LoggingFunc, Setup.MainForm,
   Setup.SpawnServer;
 

Projects/Src/Setup/Setup.UninstallLog.pas

@@ -12,7 +12,7 @@ unit Setup.UninstallLog;
 interface
 
 uses
-  Windows, SysUtils, Shared.Int64Em, Shared.FileClass, Shared.CmnFunc2;
+  Windows, SysUtils, Shared.Int64Em, Shared.FileClass, Shared.CommonFunc;
 
 const
   HighestSupportedVersion = 1048;
@@ -155,8 +155,8 @@ implementation
 
 uses
   Messages, ShlObj, AnsiStrings,
-  PathFunc, Shared.Struct, Shared.Messages, Shared.MsgIDs, Shared.InstFunc,
-  Setup.InstFnc2, Shared.RedirFunc, Shared.Compress,
+  PathFunc, Shared.Struct, Shared.Messages, Shared.SetupMessageIDs, Shared.InstFunc,
+  Setup.InstFunc.Ole, Shared.RedirFunc, Shared.Compress,
   Setup.LoggingFunc, Setup.RegDLL, Setup.Helper, Setup.DotNetFunc;
 
 type

Projects/Src/Setup/Setup.UninstallProgressForm.pas

@@ -66,7 +66,7 @@ implementation
 
 uses
   Shared.TaskbarProgressFunc, Setup.MainForm, Shared.Messages,
-  Shared.MsgIDs, Shared.CmnFunc;
+  Shared.SetupMessageIDs, Shared.CommonFunc.Vcl;
 
 {$R *.DFM}
 

Projects/Src/Setup/Setup.UninstallSharedFileForm.pas

@@ -41,7 +41,7 @@ function ExecuteRemoveSharedFileDlg(const Filename: String;
 implementation
 
 uses
-  PathFunc, Shared.Struct, Shared.Messages, Shared.MsgIDs, Setup.MainForm;
+  PathFunc, Shared.Struct, Shared.Messages, Shared.SetupMessageIDs, Setup.MainForm;
 
 {$R *.DFM}
 

Projects/Src/Setup/Setup.WizardForm.pas

@@ -15,7 +15,7 @@ uses
   Windows, SysUtils, Messages, Classes, Graphics, Controls,
   Forms, Dialogs, StdCtrls, ExtCtrls,
   Setup.SetupForm, Shared.Struct, Shared.Int64Em, NewCheckListBox, RichEditViewer, NewStaticText,
-  Shared.SetupTypes, NewProgressBar, Shared.MsgIDs, PasswordEdit, FolderTreeView, BitmapImage,
+  Shared.SetupTypes, NewProgressBar, Shared.SetupMessageIDs, PasswordEdit, FolderTreeView, BitmapImage,
   NewNotebook, BidiCtrls;
 
 type
@@ -342,7 +342,7 @@ function ValidateCustomDirEdit(const AEdit: TEdit;
 implementation
 
 uses
-  ShellApi, ShlObj, Types, Shared.Messages, Setup.MainForm, PathFunc, Shared.CmnFunc, Shared.CmnFunc2,
+  ShellApi, ShlObj, Types, Shared.Messages, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
   MD5, Shared.InstFunc, Setup.SelectFolderForm, Setup.FileExtractor, Setup.LoggingFunc, RestartManager, Setup.ScriptRunner;
 
 {$R *.DFM}

Projects/Src/SetupLdrAndSetup/Shared.InstFunc.pas

@@ -12,7 +12,7 @@ unit Shared.InstFunc;
 interface
 
 uses
-  Windows, SysUtils, Shared.Struct, Shared.Int64Em, MD5, SHA1, Shared.CmnFunc2;
+  Windows, SysUtils, Shared.Struct, Shared.Int64Em, MD5, SHA1, Shared.CommonFunc;
 
 type
   PSimpleStringListArray = ^TSimpleStringListArray;
@@ -118,7 +118,7 @@ function ForceDirectories(const DisableFsRedir: Boolean; Dir: String): Boolean;
 implementation
 
 uses
-  Messages, ShellApi, PathFunc, Shared.Messages, Shared.MsgIDs, Shared.FileClass, Shared.RedirFunc, Shared.SetupTypes,
+  Messages, ShellApi, PathFunc, Shared.Messages, Shared.SetupMessageIDs, Shared.FileClass, Shared.RedirFunc, Shared.SetupTypes,
   Hash, Classes, RegStr, Math;
 
 procedure InternalError(const Id: String);

Projects/Src/SetupLdrAndSetup/Shared.Messages.pas

@@ -16,7 +16,7 @@ unit Shared.Messages;
 interface
 
 uses
-  Shared.MsgIDs, Shared.Struct;
+  Shared.SetupMessageIDs, Shared.Struct;
 
 const
   SNewLine = #13#10;  { line break }
@@ -51,7 +51,7 @@ const
 implementation
 
 uses
-  Windows, SysUtils, Shared.Compress, Shared.CmnFunc2, Shared.FileClass;
+  Windows, SysUtils, Shared.Compress, Shared.CommonFunc, Shared.FileClass;
 
 const
   SMsgsFileTooLarge = 'Internal error: Messages file is too large';

Projects/Src/SetupLdrAndSetup/Shared.RedirFunc.pas

@@ -15,7 +15,7 @@ unit Shared.RedirFunc;
 interface
 
 uses
-  Windows, SysUtils, Shared.FileClass, Shared.VerInfo;
+  Windows, SysUtils, Shared.FileClass, Shared.VerInfoFunc;
 
 type
   TPreviousFsRedirectionState = record
@@ -102,7 +102,7 @@ type
 implementation
 
 uses
-  Shared.CmnFunc2, PathFunc;
+  Shared.CommonFunc, PathFunc;
 
 var
   Wow64DisableWow64FsRedirectionFunc: function(var OldValue: Pointer): BOOL; stdcall;

Projects/Src/Shared.CmnFunc.pas → Projects/Src/Shared.CommonFunc.Vcl.pas

@@ -1,4 +1,4 @@
-unit Shared.CmnFunc;
+unit Shared.CommonFunc.Vcl;
 
 {
   Inno Setup
@@ -58,7 +58,7 @@ procedure TriggerMessageBoxCallbackFunc(const Flags: LongInt; const After: Boole
 implementation
 
 uses
-  Consts, PathFunc, Shared.CmnFunc2;
+  Consts, PathFunc, Shared.CommonFunc;
 
 var
   MessageBoxCaptions: array[TMsgBoxType] of PChar;

Projects/Src/Shared.CmnFunc2.pas → Projects/Src/Shared.CommonFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.CmnFunc2;
+unit Shared.CommonFunc;
 
 {
   Inno Setup

Projects/Src/Shared.CompInt.pas → Projects/Src/Shared.CompilerInt.pas

@@ -1,4 +1,4 @@
-unit Shared.CompInt;
+unit Shared.CompilerInt;
 
 {
   Inno Setup

Projects/Src/Shared.CompressZlib.pas → Projects/Src/Shared.Compress.Zlib.pas

@@ -1,4 +1,4 @@
-unit Shared.CompressZlib;
+unit Shared.Compress.Zlib;
 
 {
   Inno Setup

Projects/Src/Shared.bzlib.pas → Projects/Src/Shared.Compress.bzlib.pas

@@ -1,4 +1,4 @@
-unit Shared.bzlib;
+unit Shared.Compress.bzlib;
 
 {
   Inno Setup

Projects/Src/Shared.FileClass.pas

@@ -148,7 +148,7 @@ implementation
 
 uses
   WideStrUtils,
-  Shared.CmnFunc2;
+  Shared.CommonFunc;
 
 const
   SGenericIOError = 'File I/O error %d';

Projects/Src/Shared.CompPreprocInt.pas → Projects/Src/Shared.PreprocInt.pas

@@ -1,4 +1,4 @@
-unit Shared.CompPreprocInt;
+unit Shared.PreprocInt;
 
 {
   Inno Setup

Projects/Src/Shared.ResUpdate.pas → Projects/Src/Shared.ResUpdateFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.ResUpdate;
+unit Shared.ResUpdateFunc;
 
 {
   Inno Setup

Projects/Src/Shared.SetupEnt.pas → Projects/Src/Shared.SetupEntFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.SetupEnt;
+unit Shared.SetupEntFunc;
 
 {
   Inno Setup

Projects/Src/Shared.MsgIDs.pas → Projects/Src/Shared.SetupMessageIDs.pas

@@ -1,4 +1,4 @@
-unit Shared.MsgIDs;
+unit Shared.SetupMessageIDs;
 
 {
   Inno Setup

Projects/Src/Shared.SetupTypes.pas

@@ -62,7 +62,7 @@ procedure HandleRenamedConstants(var Cnst: String; const RenamedConstantCallback
 implementation
 
 uses
-  Shared.CmnFunc2;
+  Shared.CommonFunc;
 
 function QuoteStringIfNeeded(const S: String): String;
 { Used internally by StringsToCommaString. Adds quotes around the string if

Projects/Src/Shared.TaskDialog.pas → Projects/Src/Shared.TaskDialogFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.TaskDialog;
+unit Shared.TaskDialogFunc;
 
 {
   Inno Setup
@@ -12,7 +12,7 @@ unit Shared.TaskDialog;
 interface
 
 uses
-  Windows, Shared.CmnFunc;
+  Windows, Shared.CommonFunc.Vcl;
 
 function TaskDialogMsgBox(const Icon, Instruction, Text, Caption: String; const Typ: TMsgBoxType; const Buttons: Cardinal; const ButtonLabels: array of String; const ShieldButton: Integer; const VerificationText: String = ''; const pfVerificationFlagChecked: PBOOL = nil): Integer;
 
@@ -20,7 +20,7 @@ implementation
 
 uses
   Classes, StrUtils, Math, Forms, Dialogs, SysUtils,
-  Commctrl, Shared.CmnFunc2, {$IFDEF SETUPPROJ} Shared.InstFunc, {$ENDIF} PathFunc;
+  Commctrl, Shared.CommonFunc, {$IFDEF SETUPPROJ} Shared.InstFunc, {$ENDIF} PathFunc;
 
 var
   TaskDialogIndirectFunc: function(const pTaskConfig: TTaskDialogConfig;

Projects/Src/Shared.VerInfo.pas → Projects/Src/Shared.VerInfoFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.VerInfo;
+unit Shared.VerInfoFunc;
 
 {
   Inno Setup
@@ -29,7 +29,7 @@ function StrToVersionNumbers(const S: String;
 implementation
 
 uses
-  Shared.CmnFunc2, Shared.FileClass;
+  Shared.CommonFunc, Shared.FileClass;
 
 function GetVersionInfo(const Filename: String;
   var VersionInfo: TVSFixedFileInfo): Boolean;