diff --git a/gapic/api/artman_errorreporting.yaml b/gapic/api/artman_errorreporting.yaml
index e0626017..7da23c61 100644
--- a/gapic/api/artman_errorreporting.yaml
+++ b/gapic/api/artman_errorreporting.yaml
@@ -13,6 +13,7 @@ common:
   output_dir: ${REPOROOT}/artman/output
 java:
   final_repo_dir: ${REPOROOT}/google-cloud-java/google-cloud-errorreporting
+  enable_batch_generation: True
 python:
   final_repo_dir: ${REPOROOT}/artman/output/gcloud-python-errorreporting
 go:
diff --git a/gapic/api/artman_language.yaml b/gapic/api/artman_language.yaml
index e620f31c..06d437be 100644
--- a/gapic/api/artman_language.yaml
+++ b/gapic/api/artman_language.yaml
@@ -13,6 +13,7 @@ common:
     - ${REPOROOT}/googleapis/google/cloud/language/v1beta1/language_gapic.yaml
 java:
   final_repo_dir: ${REPOROOT}/google-cloud-java/google-cloud-language
+  enable_batch_generation: True
 python:
   final_repo_dir: ${REPOROOT}/artman/output/gcloud-python-cloud-language
 go:
diff --git a/gapic/api/artman_monitoring.yaml b/gapic/api/artman_monitoring.yaml
index ec9afbce..5fcb09b6 100644
--- a/gapic/api/artman_monitoring.yaml
+++ b/gapic/api/artman_monitoring.yaml
@@ -13,6 +13,7 @@ common:
   output_dir: ${REPOROOT}/artman/output
 java:
   final_repo_dir: ${REPOROOT}/google-cloud-java/google-cloud-monitoring
+  enable_batch_generation: True
 php:
   final_repo_dir: ${REPOROOT}/artman/output/gcloud-php-monitoring
 python:
diff --git a/gapic/api/artman_speech.yaml b/gapic/api/artman_speech.yaml
index 651cabb1..beff2b28 100644
--- a/gapic/api/artman_speech.yaml
+++ b/gapic/api/artman_speech.yaml
@@ -13,6 +13,7 @@ common:
     - ${REPOROOT}/googleapis/google/cloud/speech/v1beta1/cloud_speech_gapic.yaml
 java:
   final_repo_dir: ${REPOROOT}/google-cloud-java/google-cloud-speech
+  enable_batch_generation: True
 python:
   final_repo_dir: ${REPOROOT}/artman/output/gcloud-python-cloud-speech
 go:
diff --git a/gapic/api/artman_trace.yaml b/gapic/api/artman_trace.yaml
index 22c99a06..e1b4382e 100644
--- a/gapic/api/artman_trace.yaml
+++ b/gapic/api/artman_trace.yaml
@@ -13,6 +13,7 @@ common:
   output_dir: ${REPOROOT}/artman/output
 java:
   final_repo_dir: ${REPOROOT}/google-cloud-java/google-cloud-trace
+  enable_batch_generation: True
 python:
   final_repo_dir: ${REPOROOT}/artman/output/gcloud-python-trace
 ruby:
diff --git a/gapic/api/artman_vision.yaml b/gapic/api/artman_vision.yaml
index a83d703d..a9bc9cbe 100644
--- a/gapic/api/artman_vision.yaml
+++ b/gapic/api/artman_vision.yaml
@@ -11,6 +11,7 @@ common:
   output_dir: ${REPOROOT}/artman/output
   gapic_api_yaml:
     - ${REPOROOT}/googleapis/google/cloud/vision/v1/vision_gapic.yaml
+  enable_batch_generation: True
 java:
   final_repo_dir: ${REPOROOT}/google-cloud-java/google-cloud-vision
 python:
diff --git a/gapic/lang/common.yaml b/gapic/lang/common.yaml
index 94bc1951..bce989da 100644
--- a/gapic/lang/common.yaml
+++ b/gapic/lang/common.yaml
@@ -1,6 +1,6 @@
 common:
   toolkit_path: ${REPOROOT}/toolkit
-  staging_repo_dir: ${REPOROOT}/client-library-staging/generated
+  staging_repo_dir: ${REPOROOT}/api-client-staging/generated
 java:
   enable_batch_generation: True
   gapic_language_yaml: