diff --git a/mRemoteNG/App/Export.cs b/mRemoteNG/App/Export.cs
index 25408132..4878ebc8 100644
--- a/mRemoteNG/App/Export.cs
+++ b/mRemoteNG/App/Export.cs
@@ -25,7 +25,7 @@ namespace mRemoteNG.App
             {
                 var saveFilter = new SaveFilter();
 
-                using (var exportForm = new ExportForm())
+                using (var exportForm = new FrmExport())
                 {
                     if (selectedNode?.GetTreeNodeType() == TreeNodeType.Container)
                         exportForm.SelectedFolder = selectedNode as ContainerInfo;
@@ -42,10 +42,10 @@ namespace mRemoteNG.App
                     ConnectionInfo exportTarget;
                     switch (exportForm.Scope)
                     {
-                        case ExportForm.ExportScope.SelectedFolder:
+                        case FrmExport.ExportScope.SelectedFolder:
                             exportTarget = exportForm.SelectedFolder;
                             break;
-                        case ExportForm.ExportScope.SelectedConnection:
+                        case FrmExport.ExportScope.SelectedConnection:
                             exportTarget = exportForm.SelectedConnection;
                             break;
                         default:
diff --git a/mRemoteNG/App/ProgramRoot.cs b/mRemoteNG/App/ProgramRoot.cs
index 7a57d5bf..d30edebe 100644
--- a/mRemoteNG/App/ProgramRoot.cs
+++ b/mRemoteNG/App/ProgramRoot.cs
@@ -90,7 +90,7 @@ namespace mRemoteNG.App
 
             if (FrmMain.Default.IsDisposed) return;
             
-            var window = new UnhandledExceptionWindow(e.Exception, false);
+            var window = new FrmUnhandledException(e.Exception, false);
             window.ShowDialog(FrmMain.Default);
             
         }
@@ -100,7 +100,7 @@ namespace mRemoteNG.App
             if (!FrmSplashScreen.getInstance().IsDisposed)
                 FrmSplashScreen.getInstance().Close();
 
-            var window = new UnhandledExceptionWindow(e.ExceptionObject as Exception, e.IsTerminating);
+            var window = new FrmUnhandledException(e.ExceptionObject as Exception, e.IsTerminating);
             window.ShowDialog(FrmMain.Default);
         }
     }
diff --git a/mRemoteNG/Tools/MiscTools.cs b/mRemoteNG/Tools/MiscTools.cs
index b682be21..f031208b 100644
--- a/mRemoteNG/Tools/MiscTools.cs
+++ b/mRemoteNG/Tools/MiscTools.cs
@@ -47,7 +47,7 @@ namespace mRemoteNG.Tools
             if (!splash.IsDisposed && splash.Visible)
                 splash.Close();
 
-            var passwordForm = new PasswordForm(passwordName, verify);
+            var passwordForm = new FrmPassword(passwordName, verify);
             return passwordForm.GetKey();
         }
 
diff --git a/mRemoteNG/UI/Forms/ExportForm.Designer.cs b/mRemoteNG/UI/Forms/FrmExport.Designer.cs
similarity index 99%
rename from mRemoteNG/UI/Forms/ExportForm.Designer.cs
rename to mRemoteNG/UI/Forms/FrmExport.Designer.cs
index fda85ae9..0ab47b36 100644
--- a/mRemoteNG/UI/Forms/ExportForm.Designer.cs
+++ b/mRemoteNG/UI/Forms/FrmExport.Designer.cs
@@ -3,7 +3,7 @@ using System.Windows.Forms;
 
 namespace mRemoteNG.UI.Forms
 {
-	public partial class ExportForm : Form
+	public partial class FrmExport : Form
 	{
         #region  Windows Form Designer generated code
 			
diff --git a/mRemoteNG/UI/Forms/ExportForm.cs b/mRemoteNG/UI/Forms/FrmExport.cs
similarity index 99%
rename from mRemoteNG/UI/Forms/ExportForm.cs
rename to mRemoteNG/UI/Forms/FrmExport.cs
index 3ffc896d..7a7d003b 100644
--- a/mRemoteNG/UI/Forms/ExportForm.cs
+++ b/mRemoteNG/UI/Forms/FrmExport.cs
@@ -10,7 +10,7 @@ using mRemoteNG.Themes;
 
 namespace mRemoteNG.UI.Forms
 {
-    public partial class ExportForm
+    public partial class FrmExport
     {
         private ThemeManager _themeManager;
 
@@ -128,7 +128,7 @@ namespace mRemoteNG.UI.Forms
 
         #region Constructors
 
-        public ExportForm()
+        public FrmExport()
         {
             InitializeComponent();
             FontOverrider.FontOverride(this);
diff --git a/mRemoteNG/UI/Forms/ExportForm.resx b/mRemoteNG/UI/Forms/FrmExport.resx
similarity index 100%
rename from mRemoteNG/UI/Forms/ExportForm.resx
rename to mRemoteNG/UI/Forms/FrmExport.resx
diff --git a/mRemoteNG/UI/Forms/Input/FrmInputBox.Designer.cs b/mRemoteNG/UI/Forms/FrmInputBox.Designer.cs
similarity index 99%
rename from mRemoteNG/UI/Forms/Input/FrmInputBox.Designer.cs
rename to mRemoteNG/UI/Forms/FrmInputBox.Designer.cs
index eb0a8d77..c76c5719 100644
--- a/mRemoteNG/UI/Forms/Input/FrmInputBox.Designer.cs
+++ b/mRemoteNG/UI/Forms/FrmInputBox.Designer.cs
@@ -1,4 +1,4 @@
-namespace mRemoteNG.UI.Forms.Input
+namespace mRemoteNG.UI.Forms
 {
     sealed partial class FrmInputBox
     {
diff --git a/mRemoteNG/UI/Forms/Input/FrmInputBox.cs b/mRemoteNG/UI/Forms/FrmInputBox.cs
similarity index 97%
rename from mRemoteNG/UI/Forms/Input/FrmInputBox.cs
rename to mRemoteNG/UI/Forms/FrmInputBox.cs
index 743ed1fa..2026199e 100644
--- a/mRemoteNG/UI/Forms/Input/FrmInputBox.cs
+++ b/mRemoteNG/UI/Forms/FrmInputBox.cs
@@ -2,7 +2,7 @@
 using mRemoteNG.Resources.Language;
 using mRemoteNG.Themes;
 
-namespace mRemoteNG.UI.Forms.Input
+namespace mRemoteNG.UI.Forms
 {
     public sealed partial class FrmInputBox : Form
     {
diff --git a/mRemoteNG/UI/Forms/Input/FrmInputBox.resx b/mRemoteNG/UI/Forms/FrmInputBox.resx
similarity index 100%
rename from mRemoteNG/UI/Forms/Input/FrmInputBox.resx
rename to mRemoteNG/UI/Forms/FrmInputBox.resx
diff --git a/mRemoteNG/UI/Forms/PasswordForm.Designer.cs b/mRemoteNG/UI/Forms/FrmPassword.Designer.cs
similarity index 99%
rename from mRemoteNG/UI/Forms/PasswordForm.Designer.cs
rename to mRemoteNG/UI/Forms/FrmPassword.Designer.cs
index 74bfdb94..94b6055b 100644
--- a/mRemoteNG/UI/Forms/PasswordForm.Designer.cs
+++ b/mRemoteNG/UI/Forms/FrmPassword.Designer.cs
@@ -3,7 +3,7 @@
 namespace mRemoteNG.UI.Forms
 {
 	public 
-	partial class PasswordForm : System.Windows.Forms.Form
+	partial class FrmPassword : System.Windows.Forms.Form
 	{
 			
 		//Form overrides dispose to clean up the component list.
diff --git a/mRemoteNG/UI/Forms/PasswordForm.cs b/mRemoteNG/UI/Forms/FrmPassword.cs
similarity index 96%
rename from mRemoteNG/UI/Forms/PasswordForm.cs
rename to mRemoteNG/UI/Forms/FrmPassword.cs
index 4b11b434..3a81f375 100644
--- a/mRemoteNG/UI/Forms/PasswordForm.cs
+++ b/mRemoteNG/UI/Forms/FrmPassword.cs
@@ -8,7 +8,7 @@ using mRemoteNG.Tools;
 
 namespace mRemoteNG.UI.Forms
 {
-    public partial class PasswordForm : IKeyProvider
+    public partial class FrmPassword : IKeyProvider
     {
         private readonly string _passwordName;
         private SecureString _password = new SecureString();
@@ -29,7 +29,7 @@ namespace mRemoteNG.UI.Forms
         /// password box is shown which must match the first password
         /// to continue.
         /// </param>
-        public PasswordForm(string passwordName = null, bool newPasswordMode = true)
+        public FrmPassword(string passwordName = null, bool newPasswordMode = true)
         {
             InitializeComponent();
             _passwordName = passwordName;
diff --git a/mRemoteNG/UI/Forms/PasswordForm.resx b/mRemoteNG/UI/Forms/FrmPassword.resx
similarity index 100%
rename from mRemoteNG/UI/Forms/PasswordForm.resx
rename to mRemoteNG/UI/Forms/FrmPassword.resx
diff --git a/mRemoteNG/UI/Forms/UnhandledExceptionWindow.Designer.cs b/mRemoteNG/UI/Forms/FrmUnhandledException.Designer.cs
similarity index 99%
rename from mRemoteNG/UI/Forms/UnhandledExceptionWindow.Designer.cs
rename to mRemoteNG/UI/Forms/FrmUnhandledException.Designer.cs
index e2f4c986..b52d465e 100644
--- a/mRemoteNG/UI/Forms/UnhandledExceptionWindow.Designer.cs
+++ b/mRemoteNG/UI/Forms/FrmUnhandledException.Designer.cs
@@ -1,6 +1,6 @@
 namespace mRemoteNG.UI.Forms
 {
-    partial class UnhandledExceptionWindow
+    partial class FrmUnhandledException
     {
         /// <summary>
         /// Required designer variable.
diff --git a/mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs b/mRemoteNG/UI/Forms/FrmUnhandledException.cs
similarity index 94%
rename from mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs
rename to mRemoteNG/UI/Forms/FrmUnhandledException.cs
index e3bf663d..34ff87d9 100644
--- a/mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs
+++ b/mRemoteNG/UI/Forms/FrmUnhandledException.cs
@@ -9,16 +9,16 @@ using mRemoteNG.Resources.Language;
 
 namespace mRemoteNG.UI.Forms
 {
-    public partial class UnhandledExceptionWindow : Form
+    public partial class FrmUnhandledException : Form
     {
         private readonly bool _isFatal;
 
-        public UnhandledExceptionWindow()
+        public FrmUnhandledException()
             : this(null, false)
         {
         }
 
-        public UnhandledExceptionWindow(Exception exception, bool isFatal)
+        public FrmUnhandledException(Exception exception, bool isFatal)
         {
             _isFatal = isFatal;
             InitializeComponent();
diff --git a/mRemoteNG/UI/Forms/UnhandledExceptionWindow.resx b/mRemoteNG/UI/Forms/FrmUnhandledException.resx
similarity index 100%
rename from mRemoteNG/UI/Forms/UnhandledExceptionWindow.resx
rename to mRemoteNG/UI/Forms/FrmUnhandledException.resx
diff --git a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs
index f59f8579..8bb02aed 100644
--- a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs
+++ b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
 using BrightIdeasSoftware;
 using mRemoteNG.Properties;
 using mRemoteNG.Resources.Language;
-using mRemoteNG.UI.Forms.Input;
 using mRemoteNG.UI.TaskDialog;
 
 namespace mRemoteNG.UI.Forms.OptionsPages
diff --git a/mRemoteNG/UI/Forms/frmChoosePanel.cs b/mRemoteNG/UI/Forms/frmChoosePanel.cs
index 08c0938d..8b69c86a 100644
--- a/mRemoteNG/UI/Forms/frmChoosePanel.cs
+++ b/mRemoteNG/UI/Forms/frmChoosePanel.cs
@@ -2,7 +2,6 @@
 using mRemoteNG.App;
 using mRemoteNG.Resources.Language;
 using mRemoteNG.Themes;
-using mRemoteNG.UI.Forms.Input;
 using mRemoteNG.UI.Panels;
 
 namespace mRemoteNG.UI.Forms
diff --git a/mRemoteNG/UI/Panels/PanelAdder.cs b/mRemoteNG/UI/Panels/PanelAdder.cs
index 6117f723..249686f9 100644
--- a/mRemoteNG/UI/Panels/PanelAdder.cs
+++ b/mRemoteNG/UI/Panels/PanelAdder.cs
@@ -1,7 +1,6 @@
 using mRemoteNG.App;
 using mRemoteNG.Messages;
 using mRemoteNG.UI.Forms;
-using mRemoteNG.UI.Forms.Input;
 using mRemoteNG.UI.Window;
 using System;
 using System.Collections;
diff --git a/mRemoteNG/UI/Window/ConnectionWindow.cs b/mRemoteNG/UI/Window/ConnectionWindow.cs
index e44d3ffb..5ddd07e0 100644
--- a/mRemoteNG/UI/Window/ConnectionWindow.cs
+++ b/mRemoteNG/UI/Window/ConnectionWindow.cs
@@ -16,7 +16,6 @@ using mRemoteNG.Resources.Language;
 using mRemoteNG.Themes;
 using mRemoteNG.Tools;
 using mRemoteNG.UI.Forms;
-using mRemoteNG.UI.Forms.Input;
 using mRemoteNG.UI.Tabs;
 using mRemoteNG.UI.TaskDialog;
 using WeifenLuo.WinFormsUI.Docking;
diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj
index 26a955e9..d1c2109d 100644
--- a/mRemoteNG/mRemoteNG.csproj
+++ b/mRemoteNG/mRemoteNG.csproj
@@ -493,10 +493,10 @@
       <DependentUpon>FrmSplashScreen.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Forms\FullscreenHandler.cs" />
-    <Compile Include="UI\Forms\Input\FrmInputBox.cs">
+    <Compile Include="UI\Forms\FrmInputBox.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\Forms\Input\FrmInputBox.Designer.cs">
+    <Compile Include="UI\Forms\FrmInputBox.Designer.cs">
       <DependentUpon>FrmInputBox.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Forms\OptionsPages\AdvancedPage.Designer.cs">
@@ -618,10 +618,10 @@
     <Compile Include="UI\Forms\FrmMain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\Forms\PasswordForm.Designer.cs">
-      <DependentUpon>PasswordForm.cs</DependentUpon>
+    <Compile Include="UI\Forms\FrmPassword.Designer.cs">
+      <DependentUpon>FrmPassword.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\Forms\PasswordForm.cs">
+    <Compile Include="UI\Forms\FrmPassword.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="Messages\Message.cs" />
@@ -652,11 +652,11 @@
     <Compile Include="UI\Forms\TextBox.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="UI\Forms\UnhandledExceptionWindow.cs">
+    <Compile Include="UI\Forms\FrmUnhandledException.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\Forms\UnhandledExceptionWindow.Designer.cs">
-      <DependentUpon>UnhandledExceptionWindow.cs</DependentUpon>
+    <Compile Include="UI\Forms\FrmUnhandledException.Designer.cs">
+      <DependentUpon>FrmUnhandledException.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\GraphicsUtilities\GdiPlusGraphicsProvider.cs" />
     <Compile Include="UI\GraphicsUtilities\IGraphicsProvider.cs" />
@@ -734,8 +734,8 @@
     <Compile Include="UI\Window\ErrorAndInfoWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\Forms\ExportForm.Designer.cs">
-      <DependentUpon>ExportForm.cs</DependentUpon>
+    <Compile Include="UI\Forms\FrmExport.Designer.cs">
+      <DependentUpon>FrmExport.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Window\ErrorAndInfoWindow.Designer.cs">
       <DependentUpon>ErrorAndInfoWindow.cs</DependentUpon>
@@ -759,7 +759,7 @@
     <Compile Include="UI\Window\PortScanWindow.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="UI\Forms\ExportForm.cs">
+    <Compile Include="UI\Forms\FrmExport.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="UI\Window\ScreenshotManagerWindow.cs">
@@ -886,7 +886,7 @@
     <EmbeddedResource Include="UI\Forms\FrmSplashScreen.resx">
       <DependentUpon>FrmSplashScreen.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\Input\FrmInputBox.resx">
+    <EmbeddedResource Include="UI\Forms\FrmInputBox.resx">
       <DependentUpon>FrmInputBox.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\Forms\OptionsPages\AdvancedPage.resx">
@@ -926,8 +926,8 @@
     <EmbeddedResource Include="UI\Forms\OptionsPages\UpdatesPage.resx">
       <DependentUpon>UpdatesPage.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\PasswordForm.resx">
-      <DependentUpon>PasswordForm.cs</DependentUpon>
+    <EmbeddedResource Include="UI\Forms\FrmPassword.resx">
+      <DependentUpon>FrmPassword.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Resources\Language\Language.de.resx">
@@ -998,8 +998,8 @@
     <EmbeddedResource Include="UI\Forms\TextBox.resx">
       <DependentUpon>TextBox.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\UnhandledExceptionWindow.resx">
-      <DependentUpon>UnhandledExceptionWindow.cs</DependentUpon>
+    <EmbeddedResource Include="UI\Forms\FrmUnhandledException.resx">
+      <DependentUpon>FrmUnhandledException.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\Tabs\ConnectionTab.resx">
       <DependentUpon>ConnectionTab.cs</DependentUpon>
@@ -1049,8 +1049,8 @@
       <DependentUpon>PortScanWindow.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\Forms\ExportForm.resx">
-      <DependentUpon>ExportForm.cs</DependentUpon>
+    <EmbeddedResource Include="UI\Forms\FrmExport.resx">
+      <DependentUpon>FrmExport.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\Window\ScreenshotManagerWindow.resx">
diff --git a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
index 2bdb2fed..8f0cd734 100644
--- a/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
+++ b/mRemoteNGInstaller/Installer/Fragments/FilesFragment.wxs
@@ -107,6 +107,7 @@
             
             
             
+            
             <Component Id="cmpADE94032AA8563E1E37003C8AB2D8F7E" Directory="INSTALLDIR" Guid="*">
                 <File Id="fil6BA5B21301D77ADAE00F1DA02BFE8584" KeyPath="yes" Source="$(var.HarvestPath)\ConsoleControl.dll" />
             </Component>
diff --git a/mRemoteNGTests/UI/Forms/PasswordFormTests.cs b/mRemoteNGTests/UI/Forms/PasswordFormTests.cs
index 5cbfcda8..6900101b 100644
--- a/mRemoteNGTests/UI/Forms/PasswordFormTests.cs
+++ b/mRemoteNGTests/UI/Forms/PasswordFormTests.cs
@@ -7,12 +7,12 @@ namespace mRemoteNGTests.UI.Forms
 	[TestFixture]
     public class PasswordFormTests
     {
-        PasswordForm _passwordForm;
+        FrmPassword _passwordForm;
 
         [SetUp]
         public void Setup()
         {
-            _passwordForm = new PasswordForm();
+            _passwordForm = new FrmPassword();
             _passwordForm.Show();
         }