diff --git a/src/aboutwindow.pas b/src/aboutwindow.pas
index 0aa001d..4954d35 100644
--- a/src/aboutwindow.pas
+++ b/src/aboutwindow.pas
@@ -1,4 +1,4 @@
-unit aboutwindow;
+unit AboutWindow;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/backgroundprocessprogressbar.pas b/src/backgroundprocessprogressbar.pas
index fb0b60c..4baba77 100644
--- a/src/backgroundprocessprogressbar.pas
+++ b/src/backgroundprocessprogressbar.pas
@@ -9,7 +9,7 @@
 @author(Emeric MARTINEAU)
 @created(2021)
 }
-unit backgroundprocessprogressbar;
+unit BackgroundProcessProgressBar;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/distributionpropertieswindow.pas b/src/distributionpropertieswindow.pas
index 30e077a..86684f9 100644
--- a/src/distributionpropertieswindow.pas
+++ b/src/distributionpropertieswindow.pas
@@ -1,4 +1,4 @@
-unit distributionpropertieswindow;
+unit DistributionPropertiesWindow;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/importdistribution.lfm b/src/importdistributionwindow.lfm
similarity index 100%
rename from src/importdistribution.lfm
rename to src/importdistributionwindow.lfm
diff --git a/src/importdistribution.pas b/src/importdistributionwindow.pas
similarity index 98%
rename from src/importdistribution.pas
rename to src/importdistributionwindow.pas
index 5fc1128..d8db7ec 100644
--- a/src/importdistribution.pas
+++ b/src/importdistributionwindow.pas
@@ -1,4 +1,4 @@
-unit importdistribution;
+unit ImportDistributionWindow;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/mainwindow.pas b/src/mainwindow.pas
index 7f7dfff..44e8752 100644
--- a/src/mainwindow.pas
+++ b/src/mainwindow.pas
@@ -1,4 +1,4 @@
-unit mainwindow;
+unit MainWindow;
 
 {$mode objfpc}{$H+}
 
@@ -8,8 +8,8 @@ interface
 
 uses
   Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, ComCtrls,
-  AboutWindow, ActnList, DistributionPropertiesWindow, ImportDistribution,
-  RunCommandWithUser, Prompt,
+  AboutWindow, ActnList, DistributionPropertiesWindow, importdistributionwindow,
+  RunCommandWithUserWindow, PromptWindow,
   // For MB_xxxx dialog flags
   LCLType, Menus,
   // Wsl interface
@@ -445,7 +445,7 @@ procedure TWslGuiToolMainWindow.ToolButtonDuplicateClick(Sender: TObject);
 begin
   DistributionName := Format('%s-Copy', [WslDistributionList.Selected.Caption]);
 
-  if Prompt.Prompt(
+  if Prompt(
     Self,
     Format('Clone distribution "%s"', [WslDistributionList.Selected.Caption]),
     'Please enter the name of distribution:',
diff --git a/src/processresultdisplay.pas b/src/processresultdisplay.pas
index 4b358c4..5c48a64 100644
--- a/src/processresultdisplay.pas
+++ b/src/processresultdisplay.pas
@@ -1,4 +1,4 @@
-unit processresultdisplay;
+unit ProcessResultDisplay;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/prompt.lfm b/src/promptwindow.lfm
similarity index 100%
rename from src/prompt.lfm
rename to src/promptwindow.lfm
diff --git a/src/prompt.pas b/src/promptwindow.pas
similarity index 99%
rename from src/prompt.pas
rename to src/promptwindow.pas
index c09ad0b..feb875a 100644
--- a/src/prompt.pas
+++ b/src/promptwindow.pas
@@ -1,4 +1,4 @@
-unit prompt;
+unit promptwindow;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/runcommandwithuser.lfm b/src/runcommandwithuserwindow.lfm
similarity index 100%
rename from src/runcommandwithuser.lfm
rename to src/runcommandwithuserwindow.lfm
diff --git a/src/runcommandwithuser.pas b/src/runcommandwithuserwindow.pas
similarity index 94%
rename from src/runcommandwithuser.pas
rename to src/runcommandwithuserwindow.pas
index 6d6bb83..9ad9c44 100644
--- a/src/runcommandwithuser.pas
+++ b/src/runcommandwithuserwindow.pas
@@ -1,4 +1,4 @@
-unit runcommandwithuser;
+unit runcommandwithuserwindow;
 
 {$mode objfpc}{$H+}
 
diff --git a/src/wslguitool.lpi b/src/wslguitool.lpi
index 394d140..31b89a6 100644
--- a/src/wslguitool.lpi
+++ b/src/wslguitool.lpi
@@ -150,25 +150,28 @@
         <ResourceBaseClass Value="Form"/>
       </Unit7>
       <Unit8>
-        <Filename Value="importdistribution.pas"/>
+        <Filename Value="importdistributionwindow.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormImportDistribution"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="ImportDistributionWindow"/>
       </Unit8>
       <Unit9>
-        <Filename Value="runcommandwithuser.pas"/>
+        <Filename Value="runcommandwithuserwindow.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormRunCommandWithUser"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="RunCommandWithUserWindow"/>
       </Unit9>
       <Unit10>
-        <Filename Value="prompt.pas"/>
+        <Filename Value="promptwindow.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormPrompt"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
+        <UnitName Value="PromptWindow"/>
       </Unit10>
       <Unit11>
         <Filename Value="backgroundprocessprogressbar.pas"/>
diff --git a/src/wslguitool.lpr b/src/wslguitool.lpr
index 5b39e30..2543592 100644
--- a/src/wslguitool.lpr
+++ b/src/wslguitool.lpr
@@ -7,9 +7,9 @@
   cthreads,
   {$ENDIF}{$ENDIF}
   Interfaces, // this includes the LCL widgetset
-  Forms, mainwindow, WslApi, WslCommandLine, WslRegistry, ApplicationInfo,
-  aboutwindow, distributionpropertieswindow, importdistribution,
-  runcommandwithuser, prompt, backgroundprocessprogressbar, processresultdisplay;
+  Forms, MainWindow, WslApi, WslCommandLine, WslRegistry, ApplicationInfo,
+  AboutWindow, DistributionPropertiesWindow, ImportDistributionWindow,
+  RunCommandWithUserWindow, PromptWindow, BackgroundProcessProgressBar, ProcessResultDisplay;
 
 {$R *.res}
 
diff --git a/src/wslguitool.res b/src/wslguitool.res
index 7521d03..823fc34 100644
Binary files a/src/wslguitool.res and b/src/wslguitool.res differ