diff --git a/lib/BUILD b/lib/BUILD
index a2dc687..ab56df4 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -4,7 +4,7 @@
 
 [java_library(
     name = n,
-    exports = ["@%s//jar" % n.replace("-", "_")],
+    exports = ["@%s//jar" % n],
 ) for n in [
     "autolink",
     "commonmark",
diff --git a/lib/guice/BUILD b/lib/guice/BUILD
index a267316..1e60d10 100644
--- a/lib/guice/BUILD
+++ b/lib/guice/BUILD
@@ -7,16 +7,16 @@
     exports = [
         ":aopalliance",
         ":guice-assistedinject",
-        ":guice_library",
+        ":guice-library",
         ":javax-inject",
     ],
 )
 
 [java_library(
     name = n,
-    runtime_deps = ["@%s//jar" % n.replace("-", "_")],
+    runtime_deps = ["@%s//jar" % n],
 ) for n in [
-    "guice_library",
+    "guice-library",
     "guice-assistedinject",
     "javax-inject",
     "aopalliance",
diff --git a/lib/jgit/BUILD b/lib/jgit/BUILD
index bd8c100..f2c7435 100644
--- a/lib/jgit/BUILD
+++ b/lib/jgit/BUILD
@@ -4,12 +4,12 @@
 
 java_library(
     name = "jgit-servlet",
-    exports = ["@jgit_servlet//jar"],
+    exports = ["@jgit-servlet//jar"],
 )
 
 java_library(
     name = "jgit",
-    exports = ["@jgit_lib//jar"],
+    exports = ["@jgit-lib//jar"],
 )
 
 java_library(
@@ -23,20 +23,20 @@
 
 java_library(
     name = "tukaani-xz",
-    exports = ["@tukaani_xz//jar"],
+    exports = ["@tukaani-xz//jar"],
 )
 
 java_library(
     name = "commons-compress",
-    exports = ["@commons_compress//jar"],
+    exports = ["@commons-compress//jar"],
 )
 
 java_library(
     name = "jgit-archive_library",
-    exports = ["@jgit_archive//jar"],
+    exports = ["@jgit-archive//jar"],
 )
 
 java_library(
     name = "junit",
-    exports = ["@jgit_junit//jar"],
+    exports = ["@jgit-junit//jar"],
 )
diff --git a/lib/junit/BUILD b/lib/junit/BUILD
index c2a6fcc..3445f53 100644
--- a/lib/junit/BUILD
+++ b/lib/junit/BUILD
@@ -9,5 +9,5 @@
 
 java_library(
     name = "hamcrest-core",
-    exports = ["@hamcrest_core//jar"],
+    exports = ["@hamcrest-core//jar"],
 )
diff --git a/lib/slf4j/BUILD b/lib/slf4j/BUILD
index 4a27aac..b619aaa 100644
--- a/lib/slf4j/BUILD
+++ b/lib/slf4j/BUILD
@@ -4,13 +4,13 @@
 
 java_library(
     name = "slf4j-api",
-    exports = ["@slf4j_api//jar"],
+    exports = ["@slf4j-api//jar"],
 )
 
 java_library(
     name = "slf4j-simple",
     runtime_deps = [
         ":slf4j-api",
-        "@slf4j_simple//jar",
+        "@slf4j-simple//jar",
     ],
 )
diff --git a/lib/soy/BUILD b/lib/soy/BUILD
index 34835b3..5666b8c 100644
--- a/lib/soy/BUILD
+++ b/lib/soy/BUILD
@@ -8,7 +8,7 @@
         "@soy//jar",
     ],
     runtime_deps = [
-        "@html_types//jar",
+        "@html-types//jar",
         "@icu4j//jar",
         "@protobuf//jar",
     ],