diff --git a/WORKSPACE b/WORKSPACE
index d22ec4d..fe710dd 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,7 +15,7 @@
 )
 
 maven_jar(
-    name = "commons_lang",
+    name = "commons_lang3",
     artifact = "org.apache.commons:commons-lang3:3.1",
     sha1 = "905075e6c80f206bbe6cf1e809d2caa69f420c76",
 )
@@ -132,7 +132,7 @@
 JGIT_REPO = MAVEN_CENTRAL
 
 maven_jar(
-    name = "jgit",
+    name = "jgit_lib",
     artifact = "org.eclipse.jgit:org.eclipse.jgit:" + JGIT_VERS,
     repository = JGIT_REPO,
     sha1 = "99be65d1827276b97d4f51668b60f4a38f282bda",
@@ -153,7 +153,7 @@
 )
 
 maven_jar(
-    name = "jgit_archive_library",
+    name = "jgit_archive",
     artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + JGIT_VERS,
     repository = JGIT_REPO,
     sha1 = "f825504a903dfe8d3daa61d6ab5c26fbad92c954",
diff --git a/gitiles-servlet/BUILD b/gitiles-servlet/BUILD
index aeb013d..bc67ebd 100644
--- a/gitiles-servlet/BUILD
+++ b/gitiles-servlet/BUILD
@@ -6,7 +6,7 @@
 DEPS = [
     "//blame-cache:blame-cache",
     "//lib:autolink",
-    "//lib:commons-lang",
+    "//lib:commons-lang3",
     "//lib:gson",
     "//lib:guava",
     "//lib:joda-time",
diff --git a/lib/BUILD b/lib/BUILD
index 595854e..29710ff 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -8,7 +8,7 @@
 ) for n in [
     "autolink",
     "commonmark",
-    "commons-lang",
+    "commons-lang3",
     "cm-autolink",
     "gfm-strikethrough",
     "gfm-tables",
diff --git a/lib/jgit/BUILD b/lib/jgit/BUILD
index 9fd1d4f..bd8c100 100644
--- a/lib/jgit/BUILD
+++ b/lib/jgit/BUILD
@@ -9,7 +9,7 @@
 
 java_library(
     name = "jgit",
-    exports = ["@jgit//jar"],
+    exports = ["@jgit_lib//jar"],
 )
 
 java_library(
@@ -33,7 +33,7 @@
 
 java_library(
     name = "jgit-archive_library",
-    exports = ["@jgit_archive_library//jar"],
+    exports = ["@jgit_archive//jar"],
 )
 
 java_library(