3 files changed, 6 insertions, 19 deletions
diff --git a/third_party/grpc/BUILD b/third_party/grpc/BUILD
index 386813e52e..deaefd0b2f 100644
--- a/third_party/grpc/BUILD
+++ b/third_party/grpc/BUILD
@@ -539,6 +539,6 @@ cc_library(
     ],
     deps = [
         ":grpc_unsecure",
-        "//third_party/protobuf:protobuf_clib",
+        "//third_party/protobuf:protobuf",
     ],
 )
diff --git a/third_party/protobuf/3.0.0/BUILD b/third_party/protobuf/3.0.0/BUILD
index ce5caaa6fb..46a34ebf0d 100644
--- a/third_party/protobuf/3.0.0/BUILD
+++ b/third_party/protobuf/3.0.0/BUILD
@@ -18,7 +18,7 @@ filegroup(
 )
 
 java_import(
-    name = "protobuf-util",
+    name = "protobuf_java_util",
     jars = ["protobuf-java-util-3.0.0.jar"],
     exports = [
         "//third_party:gson",
@@ -142,11 +142,8 @@ cc_library(
     visibility = ["//visibility:public"],
 )
 
-# This is named just "protobuf" in protobuf's BUILD file, but it is renamed here
-# to "protobuf_clib" to avoid conflicting with the java_import named "protobuf"
-# above.
 cc_library(
-    name = "protobuf_clib",
+    name = "protobuf",
     srcs = [
         # AUTOGEN(protobuf_srcs)
         "src/google/protobuf/any.cc",
@@ -311,7 +308,7 @@ cc_library(
     includes = ["src/"],
     linkopts = LINK_OPTS,
     visibility = ["//visibility:public"],
-    deps = [":protobuf_clib"],
+    deps = [":protobuf"],
 )
 
 proto_lang_toolchain(
diff --git a/third_party/protobuf/BUILD b/third_party/protobuf/BUILD
index 6dae212e45..60845b08a6 100644
--- a/third_party/protobuf/BUILD
+++ b/third_party/protobuf/BUILD
@@ -20,21 +20,11 @@ proto_alias("protobuf_java", PROTOBUF_VERSION)
 
 proto_alias("protobuf-jars", PROTOBUF_VERSION)
 
-proto_alias("protobuf-util", PROTOBUF_VERSION)
-
-alias(
-    name = "protobuf_java_util",
-    actual = "//third_party/protobuf/3.0.0:protobuf-util"
-)
+proto_alias("protobuf_java_util", PROTOBUF_VERSION)
 
 proto_alias("protobuf_python", PROTOBUF_VERSION)
 
-proto_alias("protobuf_clib", PROTOBUF_VERSION)
-
-alias(
-    name = "protobuf",
-    actual = "//third_party/protobuf/3.0.0:protobuf_clib"
-)
+proto_alias("protobuf", PROTOBUF_VERSION)
 
 proto_alias("protoc_lib", PROTOBUF_VERSION)