diff --git a/installer/win/WixSharpInstaller/CloseDlg.cs b/installer/win/WixSharpInstaller/CloseDialog.cs
similarity index 93%
rename from installer/win/WixSharpInstaller/CloseDlg.cs
rename to installer/win/WixSharpInstaller/CloseDialog.cs
index 463cde77..ded8a90c 100644
--- a/installer/win/WixSharpInstaller/CloseDlg.cs
+++ b/installer/win/WixSharpInstaller/CloseDialog.cs
@@ -3,12 +3,12 @@ using System.Drawing;
 
 namespace Symphony
 {
-    public partial class CloseDlg : WixSharp.UI.Forms.ManagedForm, IManagedDialog
+    public partial class CloseDialog : WixSharp.UI.Forms.ManagedForm, IManagedDialog
     {
         const int WelcomeDlgIndex = 0;
         const int InstallDirIndex = 1;
 
-        public CloseDlg()
+        public CloseDialog()
         {
             InitializeComponent();
         }
diff --git a/installer/win/WixSharpInstaller/CloseDlg.designer.cs b/installer/win/WixSharpInstaller/CloseDialog.designer.cs
similarity index 99%
rename from installer/win/WixSharpInstaller/CloseDlg.designer.cs
rename to installer/win/WixSharpInstaller/CloseDialog.designer.cs
index cf982af4..2feac489 100644
--- a/installer/win/WixSharpInstaller/CloseDlg.designer.cs
+++ b/installer/win/WixSharpInstaller/CloseDialog.designer.cs
@@ -1,7 +1,7 @@
 // This file is created and modified from the visual form designer in Visual Studio, so shouldn't need to be modified by hand
 namespace Symphony
 {
-    partial class CloseDlg
+    partial class CloseDialog
     {
         /// <summary>
         /// Required designer variable.
@@ -157,12 +157,12 @@ namespace Symphony
             this.closeButton.UseVisualStyleBackColor = true;
             this.closeButton.Click += new System.EventHandler(this.closeButton_Click);
             //
-            // CloseDlg
+            // CloseDialog
             //
             this.ClientSize = new System.Drawing.Size(494, 361);
             this.Controls.Add(this.backgroundPanel);
             this.Controls.Add(this.bottomPanel);
-            this.Name = "CloseDlg";
+            this.Name = "CloseDialog";
             this.Text = "Symphony Setup";
             this.Load += new System.EventHandler(this.dialog_Load);
             this.bottomPanel.ResumeLayout(false);
diff --git a/installer/win/WixSharpInstaller/ExitDlg.cs b/installer/win/WixSharpInstaller/ExitDialog.cs
similarity index 64%
rename from installer/win/WixSharpInstaller/ExitDlg.cs
rename to installer/win/WixSharpInstaller/ExitDialog.cs
index 9317df31..4e5ebdce 100644
--- a/installer/win/WixSharpInstaller/ExitDlg.cs
+++ b/installer/win/WixSharpInstaller/ExitDialog.cs
@@ -2,14 +2,14 @@ using WixSharp;
 
 namespace Symphony
 {
-    public partial class ExitDlg : WixSharp.UI.Forms.ManagedForm, IManagedDialog
+    public partial class ExitDialog : WixSharp.UI.Forms.ManagedForm, IManagedDialog
     {
-        public ExitDlg()
+        public ExitDialog()
         {
             InitializeComponent();
         }
 
-        private void ExitDlg_Load(object sender, System.EventArgs e)
+        private void ExitDialog_Load(object sender, System.EventArgs e)
         {
             // Exit installation on completion (don't wait for user to confirm)
             // After installation exits, the app will be auto launched, but that is specified in Symphony.cs
diff --git a/installer/win/WixSharpInstaller/ExitDlg.designer.cs b/installer/win/WixSharpInstaller/ExitDialog.designer.cs
similarity index 86%
rename from installer/win/WixSharpInstaller/ExitDlg.designer.cs
rename to installer/win/WixSharpInstaller/ExitDialog.designer.cs
index bc64d063..286a7a4a 100644
--- a/installer/win/WixSharpInstaller/ExitDlg.designer.cs
+++ b/installer/win/WixSharpInstaller/ExitDialog.designer.cs
@@ -1,7 +1,7 @@
 // This file is created and modified from the visual form designer in Visual Studio, so shouldn't need to be modified by hand
 namespace Symphony
 {
-    partial class ExitDlg
+    partial class ExitDialog
     {
         /// <summary>
         /// Required designer variable.
@@ -30,10 +30,10 @@ namespace Symphony
         private void InitializeComponent()
         {
             // 
-            // ExitDlg
+            // ExitDialog
             // 
-            this.Name = "ExitDlg";
-            this.Load += new System.EventHandler(this.ExitDlg_Load);
+            this.Name = "ExitDialog";
+            this.Load += new System.EventHandler(this.ExitDialog_Load);
 
         }
 
diff --git a/installer/win/WixSharpInstaller/MaintenanceDlg.cs b/installer/win/WixSharpInstaller/MaintenanceDialog.cs
similarity index 87%
rename from installer/win/WixSharpInstaller/MaintenanceDlg.cs
rename to installer/win/WixSharpInstaller/MaintenanceDialog.cs
index 74ebba42..8946e471 100644
--- a/installer/win/WixSharpInstaller/MaintenanceDlg.cs
+++ b/installer/win/WixSharpInstaller/MaintenanceDialog.cs
@@ -3,9 +3,9 @@ using System.Drawing;
 
 namespace Symphony
 {
-    public partial class MaintenanceDlg : WixSharp.UI.Forms.ManagedForm, IManagedDialog
+    public partial class MaintenanceDialog : WixSharp.UI.Forms.ManagedForm, IManagedDialog
     {
-        public MaintenanceDlg()
+        public MaintenanceDialog()
         {
             InitializeComponent();
         }
diff --git a/installer/win/WixSharpInstaller/MaintenanceDlg.designer.cs b/installer/win/WixSharpInstaller/MaintenanceDialog.designer.cs
similarity index 98%
rename from installer/win/WixSharpInstaller/MaintenanceDlg.designer.cs
rename to installer/win/WixSharpInstaller/MaintenanceDialog.designer.cs
index e1157de7..97c8e2a8 100644
--- a/installer/win/WixSharpInstaller/MaintenanceDlg.designer.cs
+++ b/installer/win/WixSharpInstaller/MaintenanceDialog.designer.cs
@@ -1,7 +1,7 @@
 // This file is created and modified from the visual form designer in Visual Studio, so shouldn't need to be modified by hand
 namespace Symphony
 {
-    partial class MaintenanceDlg
+    partial class MaintenanceDialog
     {
         /// <summary>
         /// Required designer variable.
@@ -128,12 +128,12 @@ namespace Symphony
             this.labelHeader.TabIndex = 0;
             this.labelHeader.Text = "Welcome to the Symphony\r\nSetup Wizard";
             // 
-            // MaintenanceDlg
+            // MaintenanceDialog
             // 
             this.ClientSize = new System.Drawing.Size(494, 361);
             this.Controls.Add(this.backgroundPanel);
             this.Controls.Add(this.bottomPanel);
-            this.Name = "MaintenanceDlg";
+            this.Name = "MaintenanceDialog";
             this.Text = "Symphony Setup";
             this.Load += new System.EventHandler(this.dialog_Load);
             this.bottomPanel.ResumeLayout(false);
diff --git a/installer/win/WixSharpInstaller/Symphony.cs b/installer/win/WixSharpInstaller/Symphony.cs
index d48a4528..ff66737d 100644
--- a/installer/win/WixSharpInstaller/Symphony.cs
+++ b/installer/win/WixSharpInstaller/Symphony.cs
@@ -3,16 +3,16 @@
 //css_ref System.Windows.Forms.dll;
 //css_ref Wix_bin\SDK\Microsoft.Deployment.WindowsInstaller.dll;
 //css_ref WixSharp.UI.dll;
-//css_imp WelcomeDlg.cs;
-//css_imp WelcomeDlg.designer.cs;
-//css_imp CloseDlg.cs;
-//css_imp CloseDlg.designer.cs;
+//css_imp WelcomeDialog.cs;
+//css_imp WelcomeDialog.designer.cs;
+//css_imp CloseDialog.cs;
+//css_imp CloseDialog.designer.cs;
 //css_imp InstallDirDialog.cs
 //css_imp InstallDirDialog.Designer.cs
-//css_imp ExitDlg.cs;
-//css_imp ExitDlg.designer.cs;
-//css_imp MaintenanceDlg.cs;
-//css_imp MaintenanceDlg.designer.cs;
+//css_imp ExitDialog.cs;
+//css_imp ExitDialog.designer.cs;
+//css_imp MaintenanceDialog.cs;
+//css_imp MaintenanceDialog.designer.cs;
 //css_imp ProgressDialog.cs
 //css_imp ProgressDialog.Designer.cs
 //css_imp MaintenanceTypeDialog.cs;
@@ -210,15 +210,15 @@ class Script
 
         // Define our own installation flow, using a mix of custom dialogs (defined in their own files) and built-in dialogs
         project.ManagedUI = new ManagedUI();
-        project.ManagedUI.InstallDialogs.Add<Symphony.WelcomeDlg>()
+        project.ManagedUI.InstallDialogs.Add<Symphony.WelcomeDialog>()
                                         .Add<Symphony.InstallDirDialog>()
                                         .Add<Symphony.ProgressDialog>()
-                                        .Add<Symphony.ExitDlg>()
-                                        .Add<Symphony.CloseDlg>();
-        project.ManagedUI.ModifyDialogs.Add<Symphony.MaintenanceDlg>()
+                                        .Add<Symphony.ExitDialog>()
+                                        .Add<Symphony.CloseDialog>();
+        project.ManagedUI.ModifyDialogs.Add<Symphony.MaintenanceDialog>()
                                        .Add<Symphony.MaintenanceTypeDialog>()
-                                        .Add<Symphony.ProgressDialog>()
-                                       .Add<Symphony.ExitDlg>();
+                                       .Add<Symphony.ProgressDialog>()
+                                       .Add<Symphony.ExitDialog>();
 
         project.Load += project_Load;
         project.BeforeInstall += project_BeforeInstall;
diff --git a/installer/win/WixSharpInstaller/WelcomeDlg.cs b/installer/win/WixSharpInstaller/WelcomeDialog.cs
similarity index 94%
rename from installer/win/WixSharpInstaller/WelcomeDlg.cs
rename to installer/win/WixSharpInstaller/WelcomeDialog.cs
index 003b2457..25c499c0 100644
--- a/installer/win/WixSharpInstaller/WelcomeDlg.cs
+++ b/installer/win/WixSharpInstaller/WelcomeDialog.cs
@@ -3,7 +3,7 @@ using System.Drawing;
 
 namespace Symphony
 {
-    public partial class WelcomeDlg : WixSharp.UI.Forms.ManagedForm, IManagedDialog
+    public partial class WelcomeDialog : WixSharp.UI.Forms.ManagedForm, IManagedDialog
     {
         // Helper function to retrive the user name of the current user. The user name returned from
         // windows can be on the form DOMAIN\USER or USER@DOMAIN. This function strips away the domain
@@ -15,7 +15,7 @@ namespace Symphony
             return slashIndex > -1 ? name.Substring(slashIndex + 1) : name.Substring(0, name.IndexOf("@"));
         }
 
-        public WelcomeDlg()
+        public WelcomeDialog()
         {
             InitializeComponent();
         }
@@ -59,7 +59,7 @@ namespace Symphony
             if (isRunning)
             {
                 // If it is running, continue to the "Close Symphony" screen
-                Shell.GoTo<Symphony.CloseDlg>();
+                Shell.GoTo<Symphony.CloseDialog>();
             }
             else
             {
diff --git a/installer/win/WixSharpInstaller/WelcomeDlg.designer.cs b/installer/win/WixSharpInstaller/WelcomeDialog.designer.cs
similarity index 99%
rename from installer/win/WixSharpInstaller/WelcomeDlg.designer.cs
rename to installer/win/WixSharpInstaller/WelcomeDialog.designer.cs
index 98b4722d..dac27a5d 100644
--- a/installer/win/WixSharpInstaller/WelcomeDlg.designer.cs
+++ b/installer/win/WixSharpInstaller/WelcomeDialog.designer.cs
@@ -1,7 +1,7 @@
 // This file is created and modified from the visual form designer in Visual Studio, so shouldn't need to be modified by hand
 namespace Symphony
 {
-    partial class WelcomeDlg
+    partial class WelcomeDialog
     {
         /// <summary>
         /// Required designer variable.
@@ -177,12 +177,12 @@ namespace Symphony
             this.labelHeader.TabIndex = 0;
             this.labelHeader.Text = "Thanks for downloading \r\nSymphony";
             // 
-            // WelcomeDlg
+            // WelcomeDialog
             // 
             this.ClientSize = new System.Drawing.Size(494, 361);
             this.Controls.Add(this.backgroundPanel);
             this.Controls.Add(this.bottomPanel);
-            this.Name = "WelcomeDlg";
+            this.Name = "WelcomeDialog";
             this.Text = "Symphony Setup";
             this.Load += new System.EventHandler(this.dialog_Load);
             this.bottomPanel.ResumeLayout(false);