diff --git a/src/csharp/Grpc.Tools.Tests/CppGeneratorTest.cs b/src/csharp/Grpc.Tools.Tests/CppGeneratorTest.cs
index bd0405a03a1..37e8f323271 100644
--- a/src/csharp/Grpc.Tools.Tests/CppGeneratorTest.cs
+++ b/src/csharp/Grpc.Tools.Tests/CppGeneratorTest.cs
@@ -72,8 +72,8 @@ namespace Grpc.Tools.Tests
             Assert.AreEqual(4, poss.Length);
             Assert.Contains("foo.pb.cc", poss);
             Assert.Contains("foo.pb.h", poss);
-            Assert.Contains("foo_grpc.pb.cc", poss);
-            Assert.Contains("foo_grpc.pb.h", poss);
+            Assert.Contains("foo.grpc.pb.cc", poss);
+            Assert.Contains("foo.grpc.pb.h", poss);
         }
 
         [Test]
diff --git a/src/csharp/Grpc.Tools/GeneratorServices.cs b/src/csharp/Grpc.Tools/GeneratorServices.cs
index c69c6893a03..903dd3dacd9 100644
--- a/src/csharp/Grpc.Tools/GeneratorServices.cs
+++ b/src/csharp/Grpc.Tools/GeneratorServices.cs
@@ -157,8 +157,8 @@ namespace Grpc.Tools
                 {
                     fileStem = Path.Combine(outdir, relative, filename);
                 }
-                outputs[2] = fileStem + "_grpc.pb.cc";
-                outputs[3] = fileStem + "_grpc.pb.h";
+                outputs[2] = fileStem + ".grpc.pb.cc";
+                outputs[3] = fileStem + ".grpc.pb.h";
             }
             return outputs;
         }