diff --git a/BUCK b/BUCK
index 4136794b22..82f1d722be 100644
--- a/BUCK
+++ b/BUCK
@@ -9,9 +9,9 @@ gerrit_war(name = 'withdocs', docs = True)
 gerrit_war(name = 'release',  ui = 'ui_optdbg_r', docs = True, context = ['//plugins:core'],  visibility = ['//tools/maven:'])
 
 API_DEPS = [
-  '//gerrit-acceptance-framework:api',
-  '//gerrit-acceptance-framework:src',
-  '//gerrit-acceptance-framework:javadoc',
+  '//gerrit-acceptance-framework:acceptance-framework',
+  '//gerrit-acceptance-framework:acceptance-framework-src',
+  '//gerrit-acceptance-framework:acceptance-framework-javadoc',
   '//gerrit-extension-api:extension-api',
   '//gerrit-extension-api:extension-api-src',
   '//gerrit-extension-api:extension-api-javadoc',
diff --git a/gerrit-acceptance-framework/BUCK b/gerrit-acceptance-framework/BUCK
index f501d40627..d8f02762e2 100644
--- a/gerrit-acceptance-framework/BUCK
+++ b/gerrit-acceptance-framework/BUCK
@@ -31,7 +31,7 @@ PROVIDED = [
 ]
 
 java_binary(
-  name = 'api',
+  name = 'acceptance-framework',
   deps = [':lib'],
   visibility = ['PUBLIC'],
 )
@@ -57,8 +57,18 @@ java_sources(
   visibility = ['PUBLIC'],
 )
 
+# The above java_sources produces a .jar somewhere in the depths of
+# buck-out, but it does not bring it to
+# buck-out/gen/gerrit-acceptance-framework/gerrit-acceptance-framework-src.jar.
+# We fix that by the following java_binary.
+java_binary(
+  name = 'acceptance-framework-src',
+  deps = [ ':src' ],
+  visibility = ['PUBLIC'],
+)
+
 java_doc(
-  name = 'javadoc',
+  name = 'acceptance-framework-javadoc',
   title = 'Gerrit Acceptance Test Framework Documentation',
   pkgs = [' com.google.gerrit.acceptance'],
   paths = ['src/test/java'],
diff --git a/tools/maven/BUCK b/tools/maven/BUCK
index 0a1fd91ece..98a7ade3a4 100644
--- a/tools/maven/BUCK
+++ b/tools/maven/BUCK
@@ -10,19 +10,19 @@ maven_package(
   url = URL,
   version = GERRIT_VERSION,
   jar = {
-    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:api',
+    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework',
     'gerrit-extension-api': '//gerrit-extension-api:extension-api',
     'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api',
     'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api',
   },
   src = {
-    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:src',
+    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework-src',
     'gerrit-extension-api': '//gerrit-extension-api:extension-api-src',
     'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-src',
     'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-src',
   },
   doc = {
-    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:javadoc',
+    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework-javadoc',
     'gerrit-extension-api': '//gerrit-extension-api:extension-api-javadoc',
     'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-javadoc',
     'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-javadoc',