17 files changed, 13 insertions, 20 deletions
diff --git a/src/csharp/Grpc.Api.Tests/.gitignore b/src/csharp/Grpc.Examples.Tests/.gitignore
index 4795a95b94..4795a95b94 100644
--- a/src/csharp/Grpc.Api.Tests/.gitignore
+++ b/src/csharp/Grpc.Examples.Tests/.gitignore
diff --git a/src/csharp/Grpc.Api.Tests/Grpc.Api.Tests.csproj b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj
index 93c3b688fa..cf5a640079 100644
--- a/src/csharp/Grpc.Api.Tests/Grpc.Api.Tests.csproj
+++ b/src/csharp/Grpc.Examples.Tests/Grpc.Examples.Tests.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{143B1C29-C442-4BE0-BF3F-A8F92288AC9F}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>Grpc.Api.Tests</RootNamespace>
-    <AssemblyName>Grpc.Api.Tests</AssemblyName>
+    <RootNamespace>Grpc.Examples.Tests</RootNamespace>
+    <AssemblyName>Grpc.Examples.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -48,9 +48,9 @@
       <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project>
       <Name>Grpc.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Grpc.Api\Grpc.Api.csproj">
+    <ProjectReference Include="..\Grpc.Examples\Grpc.Examples.csproj">
       <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project>
-      <Name>Grpc.Api</Name>
+      <Name>Grpc.Examples</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -59,4 +59,4 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/src/csharp/Grpc.Api.Tests/MathClientServerTests.cs b/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
index 767340d6f2..767340d6f2 100644
--- a/src/csharp/Grpc.Api.Tests/MathClientServerTests.cs
+++ b/src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
diff --git a/src/csharp/Grpc.Api.Tests/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Examples.Tests/Properties/AssemblyInfo.cs
index 35ac86d8df..44b075ac0a 100644
--- a/src/csharp/Grpc.Api.Tests/Properties/AssemblyInfo.cs
+++ b/src/csharp/Grpc.Examples.Tests/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
-[assembly: AssemblyTitle("Grpc.Api.Tests")]
+[assembly: AssemblyTitle("Grpc.Examples.Tests")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
diff --git a/src/csharp/Grpc.Api.Tests/packages.config b/src/csharp/Grpc.Examples.Tests/packages.config
index 51c17bcd5e..51c17bcd5e 100644
--- a/src/csharp/Grpc.Api.Tests/packages.config
+++ b/src/csharp/Grpc.Examples.Tests/packages.config
diff --git a/src/csharp/Grpc.Api/.gitignore b/src/csharp/Grpc.Examples/.gitignore
index 4795a95b94..4795a95b94 100644
--- a/src/csharp/Grpc.Api/.gitignore
+++ b/src/csharp/Grpc.Examples/.gitignore
diff --git a/src/csharp/Grpc.Api/Grpc.Api.csproj b/src/csharp/Grpc.Examples/Grpc.Examples.csproj
index e03a25b121..1609c4e3df 100644
--- a/src/csharp/Grpc.Api/Grpc.Api.csproj
+++ b/src/csharp/Grpc.Examples/Grpc.Examples.csproj
@@ -7,8 +7,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <RootNamespace>Grpc.Api</RootNamespace>
-    <AssemblyName>Grpc.Api</AssemblyName>
+    <RootNamespace>Grpc.Examples</RootNamespace>
+    <AssemblyName>Grpc.Examples</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/src/csharp/Grpc.Api/Math.cs b/src/csharp/Grpc.Examples/Math.cs
index 75b1e9dbc2..75b1e9dbc2 100644
--- a/src/csharp/Grpc.Api/Math.cs
+++ b/src/csharp/Grpc.Examples/Math.cs
diff --git a/src/csharp/Grpc.Api/MathExamples.cs b/src/csharp/Grpc.Examples/MathExamples.cs
index 97c91b1b1b..97c91b1b1b 100644
--- a/src/csharp/Grpc.Api/MathExamples.cs
+++ b/src/csharp/Grpc.Examples/MathExamples.cs
diff --git a/src/csharp/Grpc.Api/MathGrpc.cs b/src/csharp/Grpc.Examples/MathGrpc.cs
index f938a24543..f938a24543 100644
--- a/src/csharp/Grpc.Api/MathGrpc.cs
+++ b/src/csharp/Grpc.Examples/MathGrpc.cs
diff --git a/src/csharp/Grpc.Api/MathServiceImpl.cs b/src/csharp/Grpc.Examples/MathServiceImpl.cs
index 462fab4454..462fab4454 100644
--- a/src/csharp/Grpc.Api/MathServiceImpl.cs
+++ b/src/csharp/Grpc.Examples/MathServiceImpl.cs
diff --git a/src/csharp/Grpc.Api/Properties/AssemblyInfo.cs b/src/csharp/Grpc.Examples/Properties/AssemblyInfo.cs
index cef3a983c4..7603db7ffd 100644
--- a/src/csharp/Grpc.Api/Properties/AssemblyInfo.cs
+++ b/src/csharp/Grpc.Examples/Properties/AssemblyInfo.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 
 // Information about this assembly is defined by the following attributes.
 // Change them to the values specific to your project.
-[assembly: AssemblyTitle ("Grpc.Api")]
+[assembly: AssemblyTitle ("Grpc.Examples")]
 [assembly: AssemblyDescription ("")]
 [assembly: AssemblyConfiguration ("")]
 [assembly: AssemblyCompany ("")]
diff --git a/src/csharp/Grpc.Api/packages.config b/src/csharp/Grpc.Examples/packages.config
index a6a949b3b3..a6a949b3b3 100644
--- a/src/csharp/Grpc.Api/packages.config
+++ b/src/csharp/Grpc.Examples/packages.config
diff --git a/src/csharp/Grpc.Api/proto/math.proto b/src/csharp/Grpc.Examples/proto/math.proto
index 5485d580c3..5485d580c3 100644
--- a/src/csharp/Grpc.Api/proto/math.proto
+++ b/src/csharp/Grpc.Examples/proto/math.proto
diff --git a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
index 88d0f9b655..9b46a644bc 100644
--- a/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
+++ b/src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
@@ -54,10 +54,6 @@
       <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project>
       <Name>Grpc.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Grpc.Api\Grpc.Api.csproj">
-      <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project>
-      <Name>Grpc.Api</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/src/csharp/Grpc.sln b/src/csharp/Grpc.sln
index 7022c54370..f11b67bcd6 100644
--- a/src/csharp/Grpc.sln
+++ b/src/csharp/Grpc.sln
@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Api", "Grpc.Api\Grpc.Api.csproj", "{7DC1433E-3225-42C7-B7EA-546D56E27A4B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Examples", "Grpc.Examples\Grpc.Examples.csproj", "{7DC1433E-3225-42C7-B7EA-546D56E27A4B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Core", "Grpc.Core\Grpc.Core.csproj", "{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Core.Tests", "Grpc.Core.Tests\Grpc.Core.Tests.csproj", "{86EC5CB4-4EA2-40A2-8057-86542A0353BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Api.Tests", "Grpc.Api.Tests\Grpc.Api.Tests.csproj", "{143B1C29-C442-4BE0-BF3F-A8F92288AC9F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Grpc.Examples.Tests", "Grpc.Examples.Tests\Grpc.Examples.Tests.csproj", "{143B1C29-C442-4BE0-BF3F-A8F92288AC9F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MathClient", "MathClient\MathClient.csproj", "{61ECB8EE-0C96-4F8E-B187-8E4D227417C0}"
 EndProject
@@ -44,7 +44,4 @@ Global
 		{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}.Release|x86.ActiveCfg = Release|Any CPU
 		{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Grpc.Api\Grpc.Api.csproj
-	EndGlobalSection
 EndGlobal
diff --git a/src/csharp/MathClient/MathClient.csproj b/src/csharp/MathClient/MathClient.csproj
index 448ef13f70..fdecee13ff 100644
--- a/src/csharp/MathClient/MathClient.csproj
+++ b/src/csharp/MathClient/MathClient.csproj
@@ -44,9 +44,9 @@
       <Project>{CCC4440E-49F7-4790-B0AF-FEABB0837AE7}</Project>
       <Name>Grpc.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Grpc.Api\Grpc.Api.csproj">
+    <ProjectReference Include="..\Grpc.Api\Grpc.Examples.csproj">
       <Project>{7DC1433E-3225-42C7-B7EA-546D56E27A4B}</Project>
-      <Name>Grpc.Api</Name>
+      <Name>Grpc.Examples</Name>
     </ProjectReference>
   </ItemGroup>
 </Project>
 \ No newline at end of file