diff --git a/google/iam/admin/v1/BUILD.bazel b/google/iam/admin/v1/BUILD.bazel
index 6c5d55c5d..053f04511 100644
--- a/google/iam/admin/v1/BUILD.bazel
+++ b/google/iam/admin/v1/BUILD.bazel
@@ -47,14 +47,15 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
     "java_grpc_library",
     "java_proto_library",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
 )
 
 java_proto_library(
@@ -70,11 +71,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "admin_java_gapic",
-    src = ":admin_proto_with_info",
+    srcs = [":admin_proto_with_info"],
     gapic_yaml = "iam_gapic.yaml",
     grpc_service_config = "iam_grpc_service_config.json",
     package = "google.iam.admin.v1",
-    service_yaml = "iam.yaml",
     test_deps = [
         ":admin_java_grpc",
         "//google/iam/v1:iam_java_grpc",
@@ -88,7 +88,7 @@ java_gapic_library(
 java_gapic_test(
     name = "admin_java_gapic_test_suite",
     test_classes = [
-        "com.google.cloud.iam.admin.v1.IamClientTest",
+        "com.google.cloud.iam.admin.v1.IAMClientTest",
     ],
     runtime_deps = [":admin_java_gapic_test"],
 )
@@ -359,8 +359,8 @@ csharp_grpc_library(
 csharp_gapic_library(
     name = "admin_csharp_gapic",
     srcs = [":admin_proto_with_info"],
-    grpc_service_config = "iam_grpc_service_config.json",
     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
+    grpc_service_config = "iam_grpc_service_config.json",
     deps = [
         ":admin_csharp_grpc",
         ":admin_csharp_proto",
@@ -382,8 +382,9 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
+    "cc_grpc_library",
     "cc_proto_library",
-    "cc_grpc_library")
+)
 
 cc_proto_library(
     name = "admin_cc_proto",
diff --git a/google/iam/credentials/v1/BUILD.bazel b/google/iam/credentials/v1/BUILD.bazel
index c4bbc4d00..d87031398 100644
--- a/google/iam/credentials/v1/BUILD.bazel
+++ b/google/iam/credentials/v1/BUILD.bazel
@@ -35,14 +35,15 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
     "java_grpc_library",
     "java_proto_library",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
 )
 
 java_proto_library(
@@ -58,11 +59,9 @@ java_grpc_library(
 
 java_gapic_library(
     name = "credentials_java_gapic",
-    src = ":credentials_proto_with_info",
-    gapic_yaml = "iamcredentials_gapic.yaml",
+    srcs = [":credentials_proto_with_info"],
     grpc_service_config = "iamcredentials_grpc_service_config.json",
     package = "google.iam.credentials.v1",
-    service_yaml = "//google/iam/credentials:iamcredentials_v1.yaml",
     test_deps = [
         ":credentials_java_grpc",
     ],
@@ -74,7 +73,7 @@ java_gapic_library(
 java_gapic_test(
     name = "credentials_java_gapic_test_suite",
     test_classes = [
-        "com.google.cloud.iam.credentials.v1.IamCredentialsClientTest",
+        "com.google.cloud.iam.credentials.v1.IAMCredentialsClientTest",
     ],
     runtime_deps = [":credentials_java_gapic_test"],
 )
@@ -304,8 +303,8 @@ csharp_grpc_library(
 csharp_gapic_library(
     name = "credentials_csharp_gapic",
     srcs = [":credentials_proto_with_info"],
-    grpc_service_config = "iamcredentials_grpc_service_config.json",
     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
+    grpc_service_config = "iamcredentials_grpc_service_config.json",
     deps = [
         ":credentials_csharp_grpc",
         ":credentials_csharp_proto",
@@ -327,8 +326,9 @@ csharp_gapic_assembly_pkg(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
+    "cc_grpc_library",
     "cc_proto_library",
-    "cc_grpc_library")
+)
 
 cc_proto_library(
     name = "credentials_cc_proto",
diff --git a/google/iam/credentials/v1/iamcredentials_gapic.yaml b/google/iam/credentials/v1/iamcredentials_gapic.yaml
index 32d7cab80..ba1dad1b7 100644
--- a/google/iam/credentials/v1/iamcredentials_gapic.yaml
+++ b/google/iam/credentials/v1/iamcredentials_gapic.yaml
@@ -2,8 +2,6 @@ type: com.google.api.codegen.ConfigProto
 config_schema_version: 2.0.0
 # The settings of generated code in a specific language.
 language_settings:
-  java:
-    package_name: com.google.cloud.iam.credentials.v1
   python:
     package_name: google.cloud.iam_credentials_v1.gapic
   go:
diff --git a/google/iam/v1beta/BUILD.bazel b/google/iam/v1beta/BUILD.bazel
index afa56dfdd..a2b58df02 100644
--- a/google/iam/v1beta/BUILD.bazel
+++ b/google/iam/v1beta/BUILD.bazel
@@ -43,12 +43,13 @@ proto_library_with_info(
 
 ##############################################################################
 # Java
+# DO NOT OVERRIDE this Java microgenerator section with autogenerated rules.
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "java_gapic_assembly_gradle_pkg",
-    "java_gapic_library",
-    "java_gapic_test",
+    java_gapic_assembly_gradle_pkg = "java_gapic_assembly_gradle_pkg2",
+    java_gapic_library = "java_gapic_library2",
+    java_gapic_test = "java_gapic_test2",
     "java_grpc_library",
     "java_proto_library",
 )
@@ -66,11 +67,10 @@ java_grpc_library(
 
 java_gapic_library(
     name = "iam_java_gapic",
-    src = ":iam_proto_with_info",
+    srcs = [":iam_proto_with_info"],
     gapic_yaml = "iam_gapic.yaml",
     grpc_service_config = "iam_grpc_service_config.json",
     package = "google.iam.v1beta",
-    service_yaml = "iam_v1beta.yaml",
     test_deps = [
         ":iam_java_grpc",
     ],