Renamed the client and server forms to have their role in the name.

TestClient/ClientForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace TestClient
 {
-    partial class Form1
+    partial class ClientForm
     {
         /// <summary>
         /// Required designer variable.

TestClient/ClientForm.cs

@@ -17,7 +17,7 @@ namespace TestClient
 {
     using Message = TestProtocol.Message;
 
-    public partial class Form1 : Form
+    public partial class ClientForm : Form
     {
         private ClientContext context;
         private ClientCredential cred;
@@ -30,7 +30,7 @@ namespace TestClient
 
         private byte[] lastServerToken;
 
-        public Form1()
+        public ClientForm()
         {
             this.connected = false;
             this.initializing = false;

TestClient/Program.cs

@@ -16,7 +16,7 @@ namespace TestClient
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault( false );
-            Application.Run( new Form1() );
+            Application.Run( new ClientForm() );
         }
     }
 }

TestClient/TestClient.csproj

@@ -44,18 +44,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
+    <Compile Include="ClientForm.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <Compile Include="ClientForm.Designer.cs">
+      <DependentUpon>ClientForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Program.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
+    <EmbeddedResource Include="ClientForm.resx">
+      <DependentUpon>ClientForm.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>

TestServer/Program.cs

@@ -16,7 +16,7 @@ namespace TestServer
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault( false );
-            Application.Run( new Form1() );
+            Application.Run( new ServerForm() );
         }
     }
 }

TestServer/ServerForm.Designer.cs

@@ -1,6 +1,6 @@
 namespace TestServer
 {
-    partial class Form1
+    partial class ServerForm
     {
         /// <summary>
         /// Required designer variable.

TestServer/ServerForm.cs

@@ -16,7 +16,7 @@ namespace TestServer
     using NSspi.Credentials;
     using Message = TestProtocol.Message;
 
-    public partial class Form1 : Form
+    public partial class ServerForm : Form
     {
         private ServerCredential serverCred;
 
@@ -30,7 +30,7 @@ namespace TestServer
 
         private bool connected;
 
-        public Form1()
+        public ServerForm()
         {
             InitializeComponent();
 

TestServer/TestServer.csproj

@@ -44,17 +44,14 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.cs">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
+    <Compile Include="ServerForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="ServerForm.Designer.cs">
+      <DependentUpon>ServerForm.cs</DependentUpon>
+    </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -64,6 +61,9 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <EmbeddedResource Include="ServerForm.resx">
+      <DependentUpon>ServerForm.cs</DependentUpon>
+    </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>