diff --git a/src/csharp/GrpcCore/Utils/RecordingQueue.cs b/src/csharp/GrpcCore/Utils/RecordingQueue.cs
index 8e2f8a496d4c57f5cb76818c9fd5f7034ecaa34f..0726f00af7a7e8ecb2c6371d94926da715262f41 100644
--- a/src/csharp/GrpcCore/Utils/RecordingQueue.cs
+++ b/src/csharp/GrpcCore/Utils/RecordingQueue.cs
@@ -5,6 +5,11 @@ using System.Collections.Concurrent;
 
 namespace Google.GRPC.Core.Utils
 {
+    /// <summary>
+    /// Observer that allows us to await incoming messages one-by-one.
+    /// The implementation is not ideal and class will be probably replaced 
+    /// by something more versatile in the future.
+    /// </summary>
     public class RecordingQueue<T> : IObserver<T>
     {
         readonly BlockingCollection<T> queue = new BlockingCollection<T>();
diff --git a/src/csharp/InteropClient/InteropClient.cs b/src/csharp/InteropClient/Client.cs
similarity index 98%
rename from src/csharp/InteropClient/InteropClient.cs
rename to src/csharp/InteropClient/Client.cs
index 40c4781304d772482586c6b7769a94a187c55e69..9f5815050e7cbedf97ee151a06d5d33d53ac35c2 100644
--- a/src/csharp/InteropClient/InteropClient.cs
+++ b/src/csharp/InteropClient/Client.cs
@@ -7,9 +7,9 @@ using Google.GRPC.Core.Utils;
 using Google.ProtocolBuffers;
 using grpc.testing;
 
-namespace InteropClient
+namespace Google.GRPC.Interop
 {
-    class InteropClient
+    class Client
     {
         private class ClientOptions
         {
@@ -24,7 +24,8 @@ namespace InteropClient
 
         ClientOptions options;
 
-        private InteropClient(ClientOptions options) {
+        private Client(ClientOptions options)
+        {
             this.options = options;
         }
 
@@ -53,7 +54,7 @@ namespace InteropClient
                 Environment.Exit(1);
             }
 
-            var interopClient = new InteropClient(options);
+            var interopClient = new Client(options);
             interopClient.Run();
         }
 
diff --git a/src/csharp/InteropClient/InteropClient.csproj b/src/csharp/InteropClient/InteropClient.csproj
index ecc1c1087597f2f73b5e34735d2126620b5f261c..b8e099d7852820769a3a09448e44531c46691182 100644
--- a/src/csharp/InteropClient/InteropClient.csproj
+++ b/src/csharp/InteropClient/InteropClient.csproj
@@ -9,7 +9,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>InteropClient</RootNamespace>
     <AssemblyName>InteropClient</AssemblyName>
-    <StartupObject>InteropClient.InteropClient</StartupObject>
+    <StartupObject>Google.GRPC.Interop.Client</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
@@ -43,7 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="InteropClient.cs" />
+    <Compile Include="Client.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>