diff --git a/CNTK.sln b/CNTK.sln
index 0fdef1604..56deddd9a 100644
--- a/CNTK.sln
+++ b/CNTK.sln
@@ -1447,7 +1447,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PerformanceProfilerDll", "S
 	ProjectSection(ProjectDependencies) = postProject
 		{86883653-8A61-4038-81A0-2379FAE4200A} = {86883653-8A61-4038-81A0-2379FAE4200A}
 	EndProjectSection
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CNTKLibraryManagedClientTest", "Tests\EndToEndTests\EvalClientTests\CNTKLibraryManagedClientTest\CNTKLibraryManagedClientTest.csproj", "{3500A847-E024-4E7D-92DD-CC587C17460B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CNTKLibraryManagedExamplesTest", "Tests\EndToEndTests\EvalClientTests\CNTKLibraryManagedExamplesTest\CNTKLibraryManagedExamplesTest.csproj", "{3500A847-E024-4E7D-92DD-CC587C17460B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Examples/Evaluation/CNTKLibraryManagedClient/Program.cs b/Examples/Evaluation/CNTKLibraryManagedExamples/Program.cs
similarity index 99%
rename from Examples/Evaluation/CNTKLibraryManagedClient/Program.cs
rename to Examples/Evaluation/CNTKLibraryManagedExamples/Program.cs
index f243f79b5..df46f9900 100644
--- a/Examples/Evaluation/CNTKLibraryManagedClient/Program.cs
+++ b/Examples/Evaluation/CNTKLibraryManagedExamples/Program.cs
@@ -13,7 +13,7 @@ using System.Text;
 using System.Threading.Tasks;
 using CNTK;
 
-namespace CNTKLibraryManagedClientTest
+namespace CNTKLibraryManagedExampleTest
 {
     public class Program
     {
diff --git a/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/App.config b/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/App.config
similarity index 100%
rename from Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/App.config
rename to Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/App.config
diff --git a/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/CNTKLibraryManagedClientTest.csproj b/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/CNTKLibraryManagedExamplesTest.csproj
similarity index 96%
rename from Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/CNTKLibraryManagedClientTest.csproj
rename to Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/CNTKLibraryManagedExamplesTest.csproj
index ebaedbe3e..7be632122 100644
--- a/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/CNTKLibraryManagedClientTest.csproj
+++ b/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/CNTKLibraryManagedExamplesTest.csproj
@@ -14,8 +14,8 @@
     <Prefer32Bit>false</Prefer32Bit>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CNTKLibraryManagedClientTest</RootNamespace>
-    <AssemblyName>CNTKLibraryManagedClientTest</AssemblyName>
+    <RootNamespace>CNTKLibraryManagedExamplesTest</RootNamespace>
+    <AssemblyName>CNTKLibraryManagedExamplesTest</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -76,7 +76,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\..\..\Examples\Evaluation\CNTKLibraryManagedClient\Program.cs">
+    <Compile Include="..\..\..\..\Examples\Evaluation\CNTKLibraryManagedExamples\Program.cs">
       <Link>Program.cs</Link>
     </Compile>
   </ItemGroup>
diff --git a/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/Properties/AssemblyInfo.cs b/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/Properties/AssemblyInfo.cs
similarity index 91%
rename from Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/Properties/AssemblyInfo.cs
rename to Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/Properties/AssemblyInfo.cs
index a76b93fbf..29227a351 100644
--- a/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedClientTest/Properties/AssemblyInfo.cs
+++ b/Tests/EndToEndTests/EvalClientTests/CNTKLibraryManagedExamplesTest/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("CNTKLibraryManagedClientTest")]
+[assembly: AssemblyTitle("CNTKLibraryManagedExamplesTest")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("CNTKLibraryManagedClientTest")]
+[assembly: AssemblyProduct("CNTKLibraryManagedExamplesTest")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/bindings/csharp/CNTKLibraryManagedDll/CntkBitmapExtensions.cs b/bindings/csharp/CNTKLibraryManagedDll/CntkBitmapExtensions.cs
index 8918a39b9..24433de7a 100644
--- a/bindings/csharp/CNTKLibraryManagedDll/CntkBitmapExtensions.cs
+++ b/bindings/csharp/CNTKLibraryManagedDll/CntkBitmapExtensions.cs
@@ -14,7 +14,7 @@ using System.Threading.Tasks;
 
 namespace CNTK
 {
-    public static class CntkBitmapExtensions
+    public static class BitmapExtensions
     {
         /// <summary>
         /// Resizes an image