diff --git a/BUCK b/BUCK
index 2c2bc1a..e5912d0 100644
--- a/BUCK
+++ b/BUCK
@@ -4,7 +4,7 @@
 genrule(
   name = 'gitiles',
   cmd = ' && '.join([
-    'cp $(location :gitiles_base) $OUT',
+    'cp $(location :gitiles__base) $OUT',
     'unzip -qd $TMP $(location :gitiles-servlet) "com/google/gitiles/static/*"',
     'cd $TMP/com/google/gitiles',
     'mv static +static',
@@ -13,12 +13,12 @@
   out = 'gitiles.jar',
   deps = [
     ':gitiles-servlet',
-    ':gitiles_base',
+    ':gitiles__base',
   ],
 )
 
 gerrit_plugin(
-  name = 'gitiles_base',
+  name = 'gitiles',
   srcs = glob(['src/main/java/**/*.java']),
   deps = [
     ':gitiles-servlet',
@@ -46,6 +46,7 @@
     'Gerrit-HttpDocumentationPrefix: +Documentation',
   ],
   visibility = [],
+  target_suffix = '__base'
 )
 
 java_library(