Rename anonymous to generic globally
diff --git a/build.json b/build.json
index 9b217dc..4ec74b8 100644
--- a/build.json
+++ b/build.json
@@ -12,7 +12,6 @@
     {
       "name": "grpc++_base",
       "public_headers": [
-        "include/grpc++/anonymous_service.h",
         "include/grpc++/async_unary_call.h",
         "include/grpc++/byte_buffer.h",
         "include/grpc++/channel_arguments.h",
@@ -22,6 +21,7 @@
         "include/grpc++/config.h",
         "include/grpc++/create_channel.h",
         "include/grpc++/credentials.h",
+        "include/grpc++/generic_service.h",
         "include/grpc++/impl/call.h",
         "include/grpc++/impl/client_unary_call.h",
         "include/grpc++/impl/internal_stub.h",
@@ -57,7 +57,7 @@
         "src/cpp/common/completion_queue.cc",
         "src/cpp/common/rpc_method.cc",
         "src/cpp/proto/proto_utils.cc",
-        "src/cpp/server/anonymous_service.cc",
+        "src/cpp/server/generic_service.cc",
         "src/cpp/server/insecure_server_credentials.cc",
         "src/cpp/server/server.cc",
         "src/cpp/server/server_builder.cc",
@@ -1647,22 +1647,6 @@
       ]
     },
     {
-      "name": "anonymous_end2end_test",
-      "build": "test",
-      "language": "c++",
-      "src": [
-        "test/cpp/end2end/anonymous_end2end_test.cc"
-      ],
-      "deps": [
-        "grpc++_test_util",
-        "grpc_test_util",
-        "grpc++",
-        "grpc",
-        "gpr_test_util",
-        "gpr"
-      ]
-    },
-    {
       "name": "async_end2end_test",
       "build": "test",
       "language": "c++",
@@ -1721,6 +1705,22 @@
       ]
     },
     {
+      "name": "generic_end2end_test",
+      "build": "test",
+      "language": "c++",
+      "src": [
+        "test/cpp/end2end/generic_end2end_test.cc"
+      ],
+      "deps": [
+        "grpc++_test_util",
+        "grpc_test_util",
+        "grpc++",
+        "grpc",
+        "gpr_test_util",
+        "gpr"
+      ]
+    },
+    {
       "name": "grpc_cpp_plugin",
       "build": "protoc",
       "language": "c++",