  
  style-local:
  	$(CPPSTYLE_CMD)
+ 
+ EXTRA_DIST = \
+ 	CMakeLists.txt \
+-	CppClient.cpp \
+-	CppServer.cpp
++	GrpcClient.cpp \
++	GrpcServer.cpp
 diff --git a/tutorial/cpp/test.thrift b/tutorial/cpp/test.thrift
 new file mode 100644
 index 0000000..de3c9a4

+      indent() << "    " << (*f_iter)->get_name() << "_args request);" << endl << endl;
+  }
+
+  if (tservice->get_extends() != nullptr) {
+    t_service* extend_service = tservice->get_extends();
+    functions = extend_service->get_functions();
+    string extend_service_name = extend_service->get_name() + "Grpc";

   if (style == "CobCl") {
     // Forward declare the client.
     string client_name = service_name_ + "CobClient";
@@ -1764,13 +2049,15 @@ void t_cpp_generator::generate_service_interface(t_service* tservice, string sty
   }
 
   string extends = "";
-  if (tservice->get_extends() != NULL) {
-    extends = " : virtual public " + type_name(tservice->get_extends()) + style + "If";
+  if (tservice->get_extends()) {
+    extends = " : virtual public " + type_name(tservice->get_extends()) + style + "::Service";
     if (style == "CobCl" && gen_templates_) {
       // TODO(simpkins): If gen_templates_ is enabled, we currently assume all
