diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD b/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD
index 2d5f91e96e8dbf..f2b0ec43a187a6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD
@@ -5,7 +5,7 @@ filegroup(
     name = "embedded_tools",
     srcs = [
         "BUILD.tools",
-        "desugar_bin_deploy.jar",
+        "Desugar_deploy.jar",
     ],
     visibility = ["//src/tools/android/java/com/google/devtools/build/android:__pkg__"],
 )
@@ -28,8 +28,8 @@ java_library(
 )
 
 java_binary(
-    name = "desugar_bin",
-    main_class = "does.not.exist",
+    name = "Desugar",
+    main_class = "com.google.devtools.build.android.desugar.Desugar",
     runtime_deps = [":desugar"],
 )
 
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD.tools b/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD.tools
index 29e860205ce614..5d0a8e867c1a19 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD.tools
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/BUILD.tools
@@ -1,7 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
+# This target is named "Desugar_embedded" instead of "Desugar" so as to avoid
+# a naming conflict with the existing Desugar_deploy.jar that it depends on.
 java_binary(
-    name = "Desugar",
+    name = "Desugar_embedded",
     main_class = "com.google.devtools.build.android.desugar.Desugar",
-    runtime_deps = [":desugar_bin_deploy.jar"],
-)
\ No newline at end of file
+    runtime_deps = [":Desugar_deploy.jar"],
+)
diff --git a/tools/android/BUILD.tools b/tools/android/BUILD.tools
index 27da6a27060032..2c2e10f18bf10d 100644
--- a/tools/android/BUILD.tools
+++ b/tools/android/BUILD.tools
@@ -42,7 +42,7 @@ alias(
 
 alias(
     name = "desugar_java8",
-    actual = "//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar",
+    actual = "//src/tools/android/java/com/google/devtools/build/android/desugar:Desugar_embedded",
 )
 
 # Bazel puts this on the bootclasspath of android_* targets to support Java 8