diff --git a/cpp/cpptutorial.md b/cpp/cpptutorial.md
index ec4584fc9c8ffb2c227b9c093763fcc4395f8e32..ebad7b183b7ab62640eec29617e976dda98d0a32 100644
--- a/cpp/cpptutorial.md
+++ b/cpp/cpptutorial.md
@@ -214,7 +214,7 @@ void RunServer(const std::string& db_path) {
   RouteGuideImpl service(db_path);
 
   ServerBuilder builder;
-  builder.AddPort(server_address, grpc::InsecureServerCredentials());
+  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
   builder.RegisterService(&service);
   std::unique_ptr<Server> server(builder.BuildAndStart());
   std::cout << "Server listening on " << server_address << std::endl;
@@ -225,7 +225,7 @@ As you can see, we build and start our server using a `ServerBuilder`. To do thi
 
 1. Create an instance of our service implementation class `RouteGuideImpl`.
 2. Create an instance of the factory `ServerBuilder` class.
-3. Specify the address and port we want to use to listen for client requests using the builder's `AddPort()` method.
+3. Specify the address and port we want to use to listen for client requests using the builder's `AddListeningPort()` method.
 4. Register our service implementation with the builder.
 5. Call `BuildAndStart()` on the builder to create and start an RPC server for our service.
 5. Call `Wait()` on the server to do a blocking wait until process is killed or `Shutdown()` is called.
diff --git a/cpp/helloworld/greeter_server.cc b/cpp/helloworld/greeter_server.cc
index 7885a160a05a71be2b7fde15880df07650e74af1..e7f355f4cef8f6b6dc8ef4c90d60855bcda1b1f7 100644
--- a/cpp/helloworld/greeter_server.cc
+++ b/cpp/helloworld/greeter_server.cc
@@ -65,7 +65,7 @@ void RunServer() {
   GreeterServiceImpl service;
 
   ServerBuilder builder;
-  builder.AddPort(server_address, grpc::InsecureServerCredentials());
+  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
   builder.RegisterService(&service);
   std::unique_ptr<Server> server(builder.BuildAndStart());
   std::cout << "Server listening on " << server_address << std::endl;
diff --git a/cpp/route_guide/route_guide_server.cc b/cpp/route_guide/route_guide_server.cc
index c6dbce5712a23d792ded64bf86264e6856e100ef..edef04841973c436db2d0847ddc6f6ce84e1e7bb 100644
--- a/cpp/route_guide/route_guide_server.cc
+++ b/cpp/route_guide/route_guide_server.cc
@@ -187,7 +187,7 @@ void RunServer(const std::string& db_path) {
   RouteGuideImpl service(db_path);
 
   ServerBuilder builder;
-  builder.AddPort(server_address, grpc::InsecureServerCredentials());
+  builder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
   builder.RegisterService(&service);
   std::unique_ptr<Server> server(builder.BuildAndStart());
   std::cout << "Server listening on " << server_address << std::endl;