diff --git a/WORKSPACE b/WORKSPACE
index 2fbef06..9cdf2df 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -27,13 +27,13 @@
 )
 
 maven_jar(
-    name = "commons_lang3",
+    name = "commons-lang3",
     artifact = "org.apache.commons:commons-lang3:3.6",
     sha1 = "9d28a6b23650e8a7e9063c04588ace6cf7012c17",
 )
 
 maven_jar(
-    name = "commons_text",
+    name = "commons-text",
     artifact = "org.apache.commons:commons-text:1.2",
     sha1 = "74acdec7237f576c4803fff0c1008ab8a3808b2b",
 )
@@ -51,7 +51,7 @@
 )
 
 maven_jar(
-    name = "guava_failureaccess",
+    name = "guava-failureaccess",
     artifact = "com.google.guava:failureaccess:1.0.1",
     sha1 = "1dcf1de382a0bf95a3d8b0849546c88bac1292c9",
 )
@@ -80,7 +80,7 @@
 )
 
 maven_jar(
-    name = "cm_autolink",
+    name = "cm-autolink",
     artifact = "com.atlassian.commonmark:commonmark-ext-autolink:" + COMMONMARK_VERSION,
     sha1 = "a6056a5efbd68f57d420bc51bbc54b28a5d3c56b",
 )
@@ -92,25 +92,25 @@
 )
 
 maven_jar(
-    name = "gfm_strikethrough",
+    name = "gfm-strikethrough",
     artifact = "com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:" + COMMONMARK_VERSION,
     sha1 = "40837da951b421b545edddac57012e15fcc9e63c",
 )
 
 maven_jar(
-    name = "gfm_tables",
+    name = "gfm-tables",
     artifact = "com.atlassian.commonmark:commonmark-ext-gfm-tables:" + COMMONMARK_VERSION,
     sha1 = "c075db2a3301100cf70c7dced8ecf86b494458a2",
 )
 
 maven_jar(
-    name = "servlet_api_2_5",
+    name = "servlet-api_2_5",
     artifact = "org.eclipse.jetty.orbit:javax.servlet:2.5.0.v201103041518",
     sha1 = "9c16011c06bc6fe5e9dba080fcb40ddb4b75dc85",
 )
 
 maven_jar(
-    name = "servlet_api_3_0",
+    name = "servlet-api_3_0",
     artifact = "org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016",
     sha1 = "0aaaa85845fb5c59da00193f06b8e5278d8bf3f8",
 )
@@ -135,7 +135,7 @@
 )
 
 maven_jar(
-    name = "html_types",
+    name = "html-types",
     artifact = "com.google.common.html.types:types:1.0.4",
     sha1 = "2adf4c8bfccc0ff7346f9186ac5aa57d829ad065",
 )
@@ -157,28 +157,28 @@
 JGIT_REPO = MAVEN_CENTRAL
 
 maven_jar(
-    name = "jgit_lib",
+    name = "jgit-lib",
     artifact = "org.eclipse.jgit:org.eclipse.jgit:" + JGIT_VERS,
     repository = JGIT_REPO,
     sha1 = "250269f30458084777a480895e390d2a42143da3",
 )
 
 maven_jar(
-    name = "jgit_servlet",
+    name = "jgit-servlet",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + JGIT_VERS,
     repository = JGIT_REPO,
     sha1 = "5d7fbe1c8528d881e2987c75e512df2cfa408d73",
 )
 
 maven_jar(
-    name = "jgit_junit",
+    name = "jgit-junit",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + JGIT_VERS,
     repository = JGIT_REPO,
     sha1 = "723b9e6c54f8b3012dd7d4fe42b616b8d10ee230",
 )
 
 maven_jar(
-    name = "jgit_archive",
+    name = "jgit-archive",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + JGIT_VERS,
     repository = JGIT_REPO,
     sha1 = "6e49b0516b46ca90d394256d40c6069cdd8f2957",
@@ -193,7 +193,7 @@
 # When upgrading commons_compress, upgrade tukaani_xz to the
 # corresponding version
 maven_jar(
-    name = "commons_compress",
+    name = "commons-compress",
     artifact = "org.apache.commons:commons-compress:1.15",
     sha1 = "b686cd04abaef1ea7bc5e143c080563668eec17e",
 )
@@ -201,7 +201,7 @@
 # Transitive dependency of commons_compress. Should only be
 # upgraded at the same time as commons_compress.
 maven_jar(
-    name = "tukaani_xz",
+    name = "tukaani-xz",
     artifact = "org.tukaani:xz:1.6",
     attach_source = False,
     sha1 = "05b6f921f1810bdf90e25471968f741f87168b64",
@@ -214,7 +214,7 @@
 )
 
 maven_jar(
-    name = "hamcrest_core",
+    name = "hamcrest-core",
     artifact = "org.hamcrest:hamcrest-core:1.3",
     sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
 )
@@ -222,13 +222,13 @@
 SL_VERS = "1.7.7"
 
 maven_jar(
-    name = "slf4j_api",
+    name = "slf4j-api",
     artifact = "org.slf4j:slf4j-api:" + SL_VERS,
     sha1 = "2b8019b6249bb05d81d3a3094e468753e2b21311",
 )
 
 maven_jar(
-    name = "slf4j_simple",
+    name = "slf4j-simple",
     artifact = "org.slf4j:slf4j-simple:" + SL_VERS,
     sha1 = "8095d0b9f7e0a9cd79a663c740e0f8fb31d0e2c8",
 )
@@ -236,13 +236,13 @@
 GUICE_VERSION = "4.2.1"
 
 maven_jar(
-    name = "guice_library",
+    name = "guice-library",
     artifact = "com.google.inject:guice:" + GUICE_VERSION,
     sha1 = "f77dfd89318fe3ff293bafceaa75fbf66e4e4b10",
 )
 
 maven_jar(
-    name = "guice_assistedinject",
+    name = "guice-assistedinject",
     artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERSION,
     sha1 = "d327e4aee7c96f08cd657c17da231a1f4a8999ac",
 )
@@ -254,7 +254,7 @@
 )
 
 maven_jar(
-    name = "javax_inject",
+    name = "javax-inject",
     artifact = "javax.inject:javax.inject:1",
     sha1 = "6975da39a7040257bd51d21a231b76c915872d38",
 )
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",
     ],