diff --git a/CutToLength/CutToLength.csproj b/CutToLength/CutToLength.csproj
index e9b32be..70f05d5 100644
--- a/CutToLength/CutToLength.csproj
+++ b/CutToLength/CutToLength.csproj
@@ -55,26 +55,26 @@
     <Compile Include="BinLayoutView.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Form1.cs">
+    <Compile Include="MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="MainForm.Designer.cs">
+      <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Form2.cs">
+    <Compile Include="ResultsForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form2.Designer.cs">
-      <DependentUpon>Form2.cs</DependentUpon>
+    <Compile Include="ResultsForm.Designer.cs">
+      <DependentUpon>ResultsForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UIItem.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="MainForm.resx">
+      <DependentUpon>MainForm.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form2.resx">
-      <DependentUpon>Form2.cs</DependentUpon>
+    <EmbeddedResource Include="ResultsForm.resx">
+      <DependentUpon>ResultsForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
diff --git a/CutToLength/Form1.Designer.cs b/CutToLength/MainForm.Designer.cs
similarity index 99%
rename from CutToLength/Form1.Designer.cs
rename to CutToLength/MainForm.Designer.cs
index 9ad8e3d..dcaccdb 100644
--- a/CutToLength/Form1.Designer.cs
+++ b/CutToLength/MainForm.Designer.cs
@@ -1,6 +1,6 @@
 namespace CutToLength
 {
-    partial class Form1
+    partial class MainForm
     {
         /// <summary>
         /// Required designer variable.
diff --git a/CutToLength/Form1.cs b/CutToLength/MainForm.cs
similarity index 97%
rename from CutToLength/Form1.cs
rename to CutToLength/MainForm.cs
index 6927cfb..5a9befb 100644
--- a/CutToLength/Form1.cs
+++ b/CutToLength/MainForm.cs
@@ -9,11 +9,11 @@ using System.Windows.Forms;
 
 namespace CutToLength
 {
-    public partial class Form1 : Form
+    public partial class MainForm : Form
     {
         private List<UIItem> items;
 
-        public Form1()
+        public MainForm()
         {
             InitializeComponent();
 
@@ -51,7 +51,7 @@ namespace CutToLength
         {
             var bins = GetResults();
 
-            var form = new Form2();
+            var form = new ResultsForm();
             form.Bins = bins;
             form.ShowDialog();
 
diff --git a/CutToLength/Form1.resx b/CutToLength/MainForm.resx
similarity index 100%
rename from CutToLength/Form1.resx
rename to CutToLength/MainForm.resx
diff --git a/CutToLength/Program.cs b/CutToLength/Program.cs
index d9cc403..dc9f365 100644
--- a/CutToLength/Program.cs
+++ b/CutToLength/Program.cs
@@ -16,7 +16,7 @@ namespace CutToLength
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
+            Application.Run(new MainForm());
         }
     }
 }
diff --git a/CutToLength/Form2.Designer.cs b/CutToLength/ResultsForm.Designer.cs
similarity index 99%
rename from CutToLength/Form2.Designer.cs
rename to CutToLength/ResultsForm.Designer.cs
index b950bf4..32ad93c 100644
--- a/CutToLength/Form2.Designer.cs
+++ b/CutToLength/ResultsForm.Designer.cs
@@ -1,6 +1,6 @@
 namespace CutToLength
 {
-	partial class Form2
+	partial class ResultsForm
 	{
 		/// <summary>
 		/// Required designer variable.
diff --git a/CutToLength/Form2.cs b/CutToLength/ResultsForm.cs
similarity index 92%
rename from CutToLength/Form2.cs
rename to CutToLength/ResultsForm.cs
index 842dae6..160b632 100644
--- a/CutToLength/Form2.cs
+++ b/CutToLength/ResultsForm.cs
@@ -10,9 +10,9 @@ using System.Windows.Forms;
 
 namespace CutToLength
 {
-	public partial class Form2 : Form
+	public partial class ResultsForm : Form
 	{
-		public Form2()
+		public ResultsForm()
 		{
 			InitializeComponent();
 		}
diff --git a/CutToLength/Form2.resx b/CutToLength/ResultsForm.resx
similarity index 100%
rename from CutToLength/Form2.resx
rename to CutToLength/ResultsForm.resx