diff --git a/templates/vsprojects/vs2013/GrpcTests.mak.template b/templates/vsprojects/vs2013/Grpc.mak.template
similarity index 82%
rename from templates/vsprojects/vs2013/GrpcTests.mak.template
rename to templates/vsprojects/vs2013/Grpc.mak.template
index d239801c7d4c2351cfca622964dc55008ff4208c..9bea79b3d62360078332357f7d5156a30574c7d8 100644
--- a/templates/vsprojects/vs2013/GrpcTests.mak.template
+++ b/templates/vsprojects/vs2013/Grpc.mak.template
@@ -4,9 +4,11 @@
 <%def name="to_windows_path(path)">${path.replace('/','\\')}</%def>\
 <%
   allowed_dependencies = set(['gpr', 'grpc', 'gpr_test_util', 'grpc_test_util'])
-  test_targets = [ target for target in targets if target.name.endswith('_test') and set(target.deps).issubset(allowed_dependencies)]
+  allowed_targets = [ target for target in targets if set(target.deps).issubset(allowed_dependencies) ]
+  test_targets = [ target for target in allowed_targets if target.name.endswith('_test') ]
 %>\
-# NMake file to build grpc tests on Windows.
+# NMake file to build secondary gRPC targets on Windows.
+# Use grpc.sln to solution to build the gRPC libraries.
 
 OUT_DIR=test_bin
 
diff --git a/vsprojects/vs2013/GrpcTests.mak b/vsprojects/vs2013/Grpc.mak
similarity index 99%
rename from vsprojects/vs2013/GrpcTests.mak
rename to vsprojects/vs2013/Grpc.mak
index 2398f3238162244e67d3cb72d89d934159b5a21d..2f9c27f2b68818417124b4e35958c54019a97e0c 100644
--- a/vsprojects/vs2013/GrpcTests.mak
+++ b/vsprojects/vs2013/Grpc.mak
@@ -1,4 +1,5 @@
-# NMake file to build grpc tests on Windows.
+# NMake file to build secondary gRPC targets on Windows.
+# Use grpc.sln to solution to build the gRPC libraries.
 
 OUT_DIR=test_bin
 
diff --git a/vsprojects/vs2013/make.bat b/vsprojects/vs2013/make.bat
index 3315302173d22f3ac0264152796593dbb1a83d60..5d924fef8b140b136b0278e48017356d50d11079 100644
--- a/vsprojects/vs2013/make.bat
+++ b/vsprojects/vs2013/make.bat
@@ -1,7 +1,7 @@
-@rem Convenience wrapper that run specified gRPC target using Nmake
+@rem Convenience wrapper that runs specified gRPC target using Nmake
 @rem Usage: make.bat TARGET_NAME
 
 @rem Set VS variables
 @call "%VS120COMNTOOLS%\..\..\vc\vcvarsall.bat" x86
 
-nmake.exe /f GrpcTests.mak %1
\ No newline at end of file
+nmake.exe /f Grpc.mak %1
\ No newline at end of file