diff --git a/README.md b/README.md
index 9a668f3b1cde07f17007cf1aae1ddb6dc4ca0bf9..c0fc227b29b62971ba604855bd1c303534cd4efc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# gRPC Helloworld Tutorial
+# gRPC Hello World Tutorial
 
 ## TODO: move this to the tutorial sub-folder
 
@@ -8,7 +8,7 @@ various features of gRPC.
 
 When you finish the tutorial, you will be able to
 
-- Create an protobuf schema that defines a simple RPC service
+- Create a protobuf schema that defines a simple RPC service
 - Create a Java server that implements the schema interface
 - Create a Java client that accesses the server
 - Create a Go client that accesses the Java server
diff --git a/Step_0.md b/Step_0.md
index 3fec8376d1aa4aba70f166cc82cb4399373d4c3c..02a2b04c0e3b23fe30ed833bf30cf282343f0e8c 100644
--- a/Step_0.md
+++ b/Step_0.md
@@ -37,5 +37,5 @@ The service stanza of the message is an example of protobuf service IDL
 receives a request containing a name and returns a response containing a
 message.
 
-Next, in [Step-1](Step-1.md), we'll use protoc to generate client code from
+Next, in [Step - 1](Step_1.md), we'll use protoc to generate client code from
 this IDL.
diff --git a/Step_1.md b/Step_1.md
index 4ac68aba5dfb2146344b650ea2e4b40a9b242f80..da85cb4e10f0073d77ac12f7abaa536e880103f6 100644
--- a/Step_1.md
+++ b/Step_1.md
@@ -29,5 +29,5 @@ $ protoc -I . helloworld.proto --plugin=protoc-gen-grpc=external/grpc_java/bins/
                                --java_out=src/main/java
 ```
 
-Next, in [Step-2](Step-2.md), we'll use the generated Stub implementation to
+Next, in [Step - 2](Step_2.md), we'll use the generated Stub implementation to
 write a client that uses the generated code to make a call to a service.
diff --git a/Step_2.md b/Step_2.md
index dd134a989c5fc8df57b42f4d04fef64615838919..32c578f18a90d990f9c280bffc756c5f428c81ec 100644
--- a/Step_2.md
+++ b/Step_2.md
@@ -72,7 +72,7 @@ $ mvn package
 ```
 
 It can also be run, but doing so now would end up a with a failure as there is
-no server available yet.  The [next step](Step-3.md), describes how to
+no server available yet.  The [next step](Step_3.md), describes how to
 implement, build and run a server that supports the service description.
 
 ## Notes