diff --git a/examples/route_guide/README.md b/examples/route_guide/README.md
index 57b78c5c..3d73948f 100644
--- a/examples/route_guide/README.md
+++ b/examples/route_guide/README.md
@@ -1,5 +1,5 @@
 # Description
-The route guide server and client demonstrates how to use grpc go libraries to
+The route guide server and client demonstrate how to use grpc go libraries to
 perform unary, client streaming, server streaming and full duplex RPCs.
 
 See the definition of the route guide service in proto/route_guide.proto.
diff --git a/examples/route_guide/client/client.go b/examples/route_guide/client/client.go
index 70469677..a96361ff 100644
--- a/examples/route_guide/client/client.go
+++ b/examples/route_guide/client/client.go
@@ -31,7 +31,7 @@
  *
  */
 
-// Package main implements a simple grpc client that demonstrates how to use grpc go libraries
+// Package main implements a simple gRPC client that demonstrates how to use gRPC-Go libraries
 // to perform unary, client streaming, server streaming and full duplex RPCs.
 //
 // It interacts with the route guide service whose definition can be found in proto/route_guide.proto.
@@ -127,13 +127,13 @@ func runRouteChat(client pb.RouteGuideClient) {
 	if err != nil {
 		log.Fatalf("%v.RouteChat(_) = _, %v", client, err)
 	}
-	waitc := make(chan int)
+	waitc := make(chan struct{})
 	go func() {
 		for {
 			in, err := stream.Recv()
 			if err == io.EOF {
 				// read done.
-				waitc <- 1
+				close(waitc)
 				return
 			}
 			if err != nil {
diff --git a/examples/route_guide/server/server.go b/examples/route_guide/server/server.go
index d2691487..7fa8d861 100644
--- a/examples/route_guide/server/server.go
+++ b/examples/route_guide/server/server.go
@@ -31,7 +31,7 @@
  *
  */
 
-// Package main implements a simple grpc server that demonstrates how to use grpc go libraries
+// Package main implements a simple gRPC server that demonstrates how to use gRPC-Go libraries
 // to perform unary, client streaming, server streaming and full duplex RPCs.
 //
 // It implements the route guide service whose definition can be found in proto/route_guide.proto.