diff --git a/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1/AssuredWorkloadsServiceClient.java b/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1/AssuredWorkloadsServiceClient.java
index 2cfc931b6cdd..22a6c36fc7af 100644
--- a/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1/AssuredWorkloadsServiceClient.java
+++ b/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1/AssuredWorkloadsServiceClient.java
@@ -764,7 +764,7 @@ public final ListWorkloadsPagedResponse listWorkloads(ListWorkloadsRequest reque
    *   while (true) {
    *     ListWorkloadsResponse response =
    *         assuredWorkloadsServiceClient.listWorkloadsCallable().call(request);
-   *     for (Workload element : response.getResponsesList()) {
+   *     for (Workload element : response.getWorkloadsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
diff --git a/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java b/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java
index 93eef0fe4f24..bd7b423d53a9 100644
--- a/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java
+++ b/java-assured-workloads/google-cloud-assured-workloads/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceClient.java
@@ -766,7 +766,7 @@ public final ListWorkloadsPagedResponse listWorkloads(ListWorkloadsRequest reque
    *   while (true) {
    *     ListWorkloadsResponse response =
    *         assuredWorkloadsServiceClient.listWorkloadsCallable().call(request);
-   *     for (Workload element : response.getResponsesList()) {
+   *     for (Workload element : response.getWorkloadsList()) {
    *       // doThingsWith(element);
    *     }
    *     String nextPageToken = response.getNextPageToken();
diff --git a/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java b/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java
index 36ae997d29c5..92c0204de4c8 100644
--- a/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java
+++ b/java-assured-workloads/grpc-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredWorkloadsServiceGrpc.java
@@ -26,7 +26,7 @@
  */
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
-    comments = "Source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto")
+    comments = "Source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class AssuredWorkloadsServiceGrpc {
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java
index 06c84039cc79..09c58a608ba4 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/AssuredworkloadsProto.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
@@ -104,171 +104,170 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
 
   static {
     java.lang.String[] descriptorData = {
-      "\nDgoogle/cloud/assuredworkloads/v1beta1/"
-          + "assuredworkloads_v1beta1.proto\022%google.c"
-          + "loud.assuredworkloads.v1beta1\032\034google/ap"
-          + "i/annotations.proto\032\027google/api/client.p"
-          + "roto\032\037google/api/field_behavior.proto\032\031g"
-          + "oogle/api/resource.proto\032#google/longrun"
-          + "ning/operations.proto\032\036google/protobuf/d"
-          + "uration.proto\032\033google/protobuf/empty.pro"
-          + "to\032 google/protobuf/field_mask.proto\032\037go"
-          + "ogle/protobuf/timestamp.proto\"\273\001\n\025Create"
-          + "WorkloadRequest\022@\n\006parent\030\001 \001(\tB0\340A\002\372A*\022"
-          + "(assuredworkloads.googleapis.com/Workloa"
-          + "d\022F\n\010workload\030\002 \001(\0132/.google.cloud.assur"
-          + "edworkloads.v1beta1.WorkloadB\003\340A\002\022\030\n\013ext"
-          + "ernal_id\030\003 \001(\tB\003\340A\001\"\225\001\n\025UpdateWorkloadRe"
-          + "quest\022F\n\010workload\030\001 \001(\0132/.google.cloud.a"
-          + "ssuredworkloads.v1beta1.WorkloadB\003\340A\002\0224\n"
-          + "\013update_mask\030\002 \001(\0132\032.google.protobuf.Fie"
-          + "ldMaskB\003\340A\002\"j\n\025DeleteWorkloadRequest\022>\n\004"
-          + "name\030\001 \001(\tB0\340A\002\372A*\n(assuredworkloads.goo"
-          + "gleapis.com/Workload\022\021\n\004etag\030\002 \001(\tB\003\340A\001\""
-          + "T\n\022GetWorkloadRequest\022>\n\004name\030\001 \001(\tB0\340A\002"
-          + "\372A*\n(assuredworkloads.googleapis.com/Wor"
-          + "kload\"\217\001\n\024ListWorkloadsRequest\022@\n\006parent"
-          + "\030\001 \001(\tB0\340A\002\372A*\022(assuredworkloads.googlea"
-          + "pis.com/Workload\022\021\n\tpage_size\030\002 \001(\005\022\022\n\np"
-          + "age_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t\"t\n\025ListW"
-          + "orkloadsResponse\022B\n\tworkloads\030\001 \003(\0132/.go"
-          + "ogle.cloud.assuredworkloads.v1beta1.Work"
-          + "load\022\027\n\017next_page_token\030\002 \001(\t\"\213\033\n\010Worklo"
-          + "ad\022\021\n\004name\030\001 \001(\tB\003\340A\001\022\031\n\014display_name\030\002 "
-          + "\001(\tB\003\340A\002\022T\n\tresources\030\003 \003(\0132<.google.clo"
-          + "ud.assuredworkloads.v1beta1.Workload.Res"
-          + "ourceInfoB\003\340A\003\022c\n\021compliance_regime\030\004 \001("
-          + "\0162@.google.cloud.assuredworkloads.v1beta"
-          + "1.Workload.ComplianceRegimeB\006\340A\002\340A\005\0227\n\013c"
-          + "reate_time\030\005 \001(\0132\032.google.protobuf.Times"
-          + "tampB\006\340A\003\340A\005\022\034\n\017billing_account\030\006 \001(\tB\003\340"
-          + "A\004\022`\n\014il4_settings\030\007 \001(\0132;.google.cloud."
-          + "assuredworkloads.v1beta1.Workload.IL4Set"
-          + "tingsB\013\030\001\340A\002\340A\004\340A\005H\000\022b\n\rcjis_settings\030\010 "
-          + "\001(\0132<.google.cloud.assuredworkloads.v1be"
-          + "ta1.Workload.CJISSettingsB\013\030\001\340A\002\340A\004\340A\005H\000"
-          + "\022q\n\025fedramp_high_settings\030\013 \001(\0132C.google"
-          + ".cloud.assuredworkloads.v1beta1.Workload"
-          + ".FedrampHighSettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022y\n\031f"
-          + "edramp_moderate_settings\030\014 \001(\0132G.google."
-          + "cloud.assuredworkloads.v1beta1.Workload."
-          + "FedrampModerateSettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022\021"
-          + "\n\004etag\030\t \001(\tB\003\340A\001\022P\n\006labels\030\n \003(\0132;.goog"
+      "\n<google/cloud/assuredworkloads/v1beta1/"
+          + "assuredworkloads.proto\022%google.cloud.ass"
+          + "uredworkloads.v1beta1\032\034google/api/annota"
+          + "tions.proto\032\027google/api/client.proto\032\037go"
+          + "ogle/api/field_behavior.proto\032\031google/ap"
+          + "i/resource.proto\032#google/longrunning/ope"
+          + "rations.proto\032\036google/protobuf/duration."
+          + "proto\032\033google/protobuf/empty.proto\032 goog"
+          + "le/protobuf/field_mask.proto\032\037google/pro"
+          + "tobuf/timestamp.proto\"\273\001\n\025CreateWorkload"
+          + "Request\022@\n\006parent\030\001 \001(\tB0\340A\002\372A*\022(assured"
+          + "workloads.googleapis.com/Workload\022F\n\010wor"
+          + "kload\030\002 \001(\0132/.google.cloud.assuredworklo"
+          + "ads.v1beta1.WorkloadB\003\340A\002\022\030\n\013external_id"
+          + "\030\003 \001(\tB\003\340A\001\"\225\001\n\025UpdateWorkloadRequest\022F\n"
+          + "\010workload\030\001 \001(\0132/.google.cloud.assuredwo"
+          + "rkloads.v1beta1.WorkloadB\003\340A\002\0224\n\013update_"
+          + "mask\030\002 \001(\0132\032.google.protobuf.FieldMaskB\003"
+          + "\340A\002\"j\n\025DeleteWorkloadRequest\022>\n\004name\030\001 \001"
+          + "(\tB0\340A\002\372A*\n(assuredworkloads.googleapis."
+          + "com/Workload\022\021\n\004etag\030\002 \001(\tB\003\340A\001\"T\n\022GetWo"
+          + "rkloadRequest\022>\n\004name\030\001 \001(\tB0\340A\002\372A*\n(ass"
+          + "uredworkloads.googleapis.com/Workload\"\217\001"
+          + "\n\024ListWorkloadsRequest\022@\n\006parent\030\001 \001(\tB0"
+          + "\340A\002\372A*\022(assuredworkloads.googleapis.com/"
+          + "Workload\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_toke"
+          + "n\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t\"t\n\025ListWorkloads"
+          + "Response\022B\n\tworkloads\030\001 \003(\0132/.google.clo"
+          + "ud.assuredworkloads.v1beta1.Workload\022\027\n\017"
+          + "next_page_token\030\002 \001(\t\"\213\033\n\010Workload\022\021\n\004na"
+          + "me\030\001 \001(\tB\003\340A\001\022\031\n\014display_name\030\002 \001(\tB\003\340A\002"
+          + "\022T\n\tresources\030\003 \003(\0132<.google.cloud.assur"
+          + "edworkloads.v1beta1.Workload.ResourceInf"
+          + "oB\003\340A\003\022c\n\021compliance_regime\030\004 \001(\0162@.goog"
           + "le.cloud.assuredworkloads.v1beta1.Worklo"
-          + "ad.LabelsEntryB\003\340A\001\022)\n\034provisioned_resou"
-          + "rces_parent\030\r \001(\tB\003\340A\004\022V\n\014kms_settings\030\016"
-          + " \001(\0132;.google.cloud.assuredworkloads.v1b"
-          + "eta1.Workload.KMSSettingsB\003\340A\004\022`\n\021resour"
-          + "ce_settings\030\017 \003(\0132@.google.cloud.assured"
-          + "workloads.v1beta1.Workload.ResourceSetti"
-          + "ngsB\003\340A\004\022e\n\024kaj_enrollment_state\030\021 \001(\0162B"
-          + ".google.cloud.assuredworkloads.v1beta1.W"
-          + "orkload.KajEnrollmentStateB\003\340A\003\022&\n\031enabl"
-          + "e_sovereign_controls\030\022 \001(\010B\003\340A\001\022k\n\027saa_e"
-          + "nrollment_response\030\024 \001(\0132E.google.cloud."
-          + "assuredworkloads.v1beta1.Workload.SaaEnr"
-          + "ollmentResponseB\003\340A\003\032\216\002\n\014ResourceInfo\022\023\n"
-          + "\013resource_id\030\001 \001(\003\022`\n\rresource_type\030\002 \001("
-          + "\0162I.google.cloud.assuredworkloads.v1beta"
-          + "1.Workload.ResourceInfo.ResourceType\"\206\001\n"
-          + "\014ResourceType\022\035\n\031RESOURCE_TYPE_UNSPECIFI"
-          + "ED\020\000\022\030\n\020CONSUMER_PROJECT\020\001\032\002\010\001\022\023\n\017CONSUM"
-          + "ER_FOLDER\020\004\022\033\n\027ENCRYPTION_KEYS_PROJECT\020\002"
-          + "\022\013\n\007KEYRING\020\003\032\217\001\n\013KMSSettings\022A\n\022next_ro"
-          + "tation_time\030\001 \001(\0132\032.google.protobuf.Time"
-          + "stampB\t\340A\002\340A\004\340A\005\022=\n\017rotation_period\030\002 \001("
-          + "\0132\031.google.protobuf.DurationB\t\340A\002\340A\004\340A\005\032"
-          + "o\n\013IL4Settings\022\\\n\014kms_settings\030\001 \001(\0132;.g"
+          + "ad.ComplianceRegimeB\006\340A\002\340A\005\0227\n\013create_ti"
+          + "me\030\005 \001(\0132\032.google.protobuf.TimestampB\006\340A"
+          + "\003\340A\005\022\034\n\017billing_account\030\006 \001(\tB\003\340A\004\022`\n\014il"
+          + "4_settings\030\007 \001(\0132;.google.cloud.assuredw"
+          + "orkloads.v1beta1.Workload.IL4SettingsB\013\030"
+          + "\001\340A\002\340A\004\340A\005H\000\022b\n\rcjis_settings\030\010 \001(\0132<.go"
+          + "ogle.cloud.assuredworkloads.v1beta1.Work"
+          + "load.CJISSettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022q\n\025fedr"
+          + "amp_high_settings\030\013 \001(\0132C.google.cloud.a"
+          + "ssuredworkloads.v1beta1.Workload.Fedramp"
+          + "HighSettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022y\n\031fedramp_m"
+          + "oderate_settings\030\014 \001(\0132G.google.cloud.as"
+          + "suredworkloads.v1beta1.Workload.FedrampM"
+          + "oderateSettingsB\013\030\001\340A\002\340A\004\340A\005H\000\022\021\n\004etag\030\t"
+          + " \001(\tB\003\340A\001\022P\n\006labels\030\n \003(\0132;.google.cloud"
+          + ".assuredworkloads.v1beta1.Workload.Label"
+          + "sEntryB\003\340A\001\022)\n\034provisioned_resources_par"
+          + "ent\030\r \001(\tB\003\340A\004\022V\n\014kms_settings\030\016 \001(\0132;.g"
           + "oogle.cloud.assuredworkloads.v1beta1.Wor"
-          + "kload.KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032p\n\014CJIS"
-          + "Settings\022\\\n\014kms_settings\030\001 \001(\0132;.google."
+          + "kload.KMSSettingsB\003\340A\004\022`\n\021resource_setti"
+          + "ngs\030\017 \003(\0132@.google.cloud.assuredworkload"
+          + "s.v1beta1.Workload.ResourceSettingsB\003\340A\004"
+          + "\022e\n\024kaj_enrollment_state\030\021 \001(\0162B.google."
           + "cloud.assuredworkloads.v1beta1.Workload."
-          + "KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032w\n\023FedrampHig"
-          + "hSettings\022\\\n\014kms_settings\030\001 \001(\0132;.google"
-          + ".cloud.assuredworkloads.v1beta1.Workload"
-          + ".KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032{\n\027FedrampMo"
-          + "derateSettings\022\\\n\014kms_settings\030\001 \001(\0132;.g"
-          + "oogle.cloud.assuredworkloads.v1beta1.Wor"
-          + "kload.KMSSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032\237\001\n\020Res"
-          + "ourceSettings\022\023\n\013resource_id\030\001 \001(\t\022`\n\rre"
-          + "source_type\030\002 \001(\0162I.google.cloud.assured"
-          + "workloads.v1beta1.Workload.ResourceInfo."
-          + "ResourceType\022\024\n\014display_name\030\003 \001(\t\032\206\004\n\025S"
-          + "aaEnrollmentResponse\022k\n\014setup_status\030\001 \001"
-          + "(\0162P.google.cloud.assuredworkloads.v1bet"
-          + "a1.Workload.SaaEnrollmentResponse.SetupS"
-          + "tateH\000\210\001\001\022f\n\014setup_errors\030\002 \003(\0162P.google"
-          + ".cloud.assuredworkloads.v1beta1.Workload"
-          + ".SaaEnrollmentResponse.SetupError\"R\n\nSet"
-          + "upState\022\033\n\027SETUP_STATE_UNSPECIFIED\020\000\022\022\n\016"
-          + "STATUS_PENDING\020\001\022\023\n\017STATUS_COMPLETE\020\002\"\262\001"
-          + "\n\nSetupError\022\033\n\027SETUP_ERROR_UNSPECIFIED\020"
-          + "\000\022\034\n\030ERROR_INVALID_BASE_SETUP\020\001\022&\n\"ERROR"
-          + "_MISSING_EXTERNAL_SIGNING_KEY\020\002\022#\n\037ERROR"
-          + "_NOT_ALL_SERVICES_ENROLLED\020\003\022\034\n\030ERROR_SE"
-          + "TUP_CHECK_FAILED\020\004B\017\n\r_setup_status\032-\n\013L"
-          + "abelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002"
-          + "8\001\"\330\001\n\020ComplianceRegime\022!\n\035COMPLIANCE_RE"
-          + "GIME_UNSPECIFIED\020\000\022\007\n\003IL4\020\001\022\010\n\004CJIS\020\002\022\020\n"
-          + "\014FEDRAMP_HIGH\020\003\022\024\n\020FEDRAMP_MODERATE\020\004\022\026\n"
-          + "\022US_REGIONAL_ACCESS\020\005\022\t\n\005HIPAA\020\006\022\013\n\007HITR"
-          + "UST\020\007\022\032\n\026EU_REGIONS_AND_SUPPORT\020\010\022\032\n\026CA_"
-          + "REGIONS_AND_SUPPORT\020\t\"\177\n\022KajEnrollmentSt"
-          + "ate\022$\n KAJ_ENROLLMENT_STATE_UNSPECIFIED\020"
-          + "\000\022 \n\034KAJ_ENROLLMENT_STATE_PENDING\020\001\022!\n\035K"
-          + "AJ_ENROLLMENT_STATE_COMPLETE\020\002:u\352Ar\n(ass"
-          + "uredworkloads.googleapis.com/Workload\022Fo"
-          + "rganizations/{organization}/locations/{l"
-          + "ocation}/workloads/{workload}B\034\n\032complia"
-          + "nce_regime_settings\"\313\002\n\037CreateWorkloadOp"
-          + "erationMetadata\0224\n\013create_time\030\001 \001(\0132\032.g"
-          + "oogle.protobuf.TimestampB\003\340A\001\022\031\n\014display"
-          + "_name\030\002 \001(\tB\003\340A\001\022\023\n\006parent\030\003 \001(\tB\003\340A\001\022`\n"
-          + "\021compliance_regime\030\004 \001(\0162@.google.cloud."
-          + "assuredworkloads.v1beta1.Workload.Compli"
-          + "anceRegimeB\003\340A\001\022`\n\021resource_settings\030\005 \003"
-          + "(\0132@.google.cloud.assuredworkloads.v1bet"
-          + "a1.Workload.ResourceSettingsB\003\340A\0012\243\t\n\027As"
-          + "suredWorkloadsService\022\371\001\n\016CreateWorkload"
-          + "\022<.google.cloud.assuredworkloads.v1beta1"
-          + ".CreateWorkloadRequest\032\035.google.longrunn"
-          + "ing.Operation\"\211\001\202\323\344\223\002C\"7/v1beta1/{parent"
-          + "=organizations/*/locations/*}/workloads:"
-          + "\010workload\332A\017parent,workload\312A+\n\010Workload"
-          + "\022\037CreateWorkloadOperationMetadata\022\352\001\n\016Up"
-          + "dateWorkload\022<.google.cloud.assuredworkl"
-          + "oads.v1beta1.UpdateWorkloadRequest\032/.goo"
+          + "KajEnrollmentStateB\003\340A\003\022&\n\031enable_sovere"
+          + "ign_controls\030\022 \001(\010B\003\340A\001\022k\n\027saa_enrollmen"
+          + "t_response\030\024 \001(\0132E.google.cloud.assuredw"
+          + "orkloads.v1beta1.Workload.SaaEnrollmentR"
+          + "esponseB\003\340A\003\032\216\002\n\014ResourceInfo\022\023\n\013resourc"
+          + "e_id\030\001 \001(\003\022`\n\rresource_type\030\002 \001(\0162I.goog"
+          + "le.cloud.assuredworkloads.v1beta1.Worklo"
+          + "ad.ResourceInfo.ResourceType\"\206\001\n\014Resourc"
+          + "eType\022\035\n\031RESOURCE_TYPE_UNSPECIFIED\020\000\022\030\n\020"
+          + "CONSUMER_PROJECT\020\001\032\002\010\001\022\023\n\017CONSUMER_FOLDE"
+          + "R\020\004\022\033\n\027ENCRYPTION_KEYS_PROJECT\020\002\022\013\n\007KEYR"
+          + "ING\020\003\032\217\001\n\013KMSSettings\022A\n\022next_rotation_t"
+          + "ime\030\001 \001(\0132\032.google.protobuf.TimestampB\t\340"
+          + "A\002\340A\004\340A\005\022=\n\017rotation_period\030\002 \001(\0132\031.goog"
+          + "le.protobuf.DurationB\t\340A\002\340A\004\340A\005\032o\n\013IL4Se"
+          + "ttings\022\\\n\014kms_settings\030\001 \001(\0132;.google.cl"
+          + "oud.assuredworkloads.v1beta1.Workload.KM"
+          + "SSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032p\n\014CJISSettings"
+          + "\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud.as"
+          + "suredworkloads.v1beta1.Workload.KMSSetti"
+          + "ngsB\t\340A\002\340A\004\340A\005:\002\030\001\032w\n\023FedrampHighSetting"
+          + "s\022\\\n\014kms_settings\030\001 \001(\0132;.google.cloud.a"
+          + "ssuredworkloads.v1beta1.Workload.KMSSett"
+          + "ingsB\t\340A\002\340A\004\340A\005:\002\030\001\032{\n\027FedrampModerateSe"
+          + "ttings\022\\\n\014kms_settings\030\001 \001(\0132;.google.cl"
+          + "oud.assuredworkloads.v1beta1.Workload.KM"
+          + "SSettingsB\t\340A\002\340A\004\340A\005:\002\030\001\032\237\001\n\020ResourceSet"
+          + "tings\022\023\n\013resource_id\030\001 \001(\t\022`\n\rresource_t"
+          + "ype\030\002 \001(\0162I.google.cloud.assuredworkload"
+          + "s.v1beta1.Workload.ResourceInfo.Resource"
+          + "Type\022\024\n\014display_name\030\003 \001(\t\032\206\004\n\025SaaEnroll"
+          + "mentResponse\022k\n\014setup_status\030\001 \001(\0162P.goo"
           + "gle.cloud.assuredworkloads.v1beta1.Workl"
-          + "oad\"i\202\323\344\223\002L2@/v1beta1/{workload.name=org"
-          + "anizations/*/locations/*/workloads/*}:\010w"
-          + "orkload\332A\024workload,update_mask\022\256\001\n\016Delet"
-          + "eWorkload\022<.google.cloud.assuredworkload"
-          + "s.v1beta1.DeleteWorkloadRequest\032\026.google"
-          + ".protobuf.Empty\"F\202\323\344\223\0029*7/v1beta1/{name="
-          + "organizations/*/locations/*/workloads/*}"
-          + "\332A\004name\022\301\001\n\013GetWorkload\0229.google.cloud.a"
-          + "ssuredworkloads.v1beta1.GetWorkloadReque"
-          + "st\032/.google.cloud.assuredworkloads.v1bet"
-          + "a1.Workload\"F\202\323\344\223\0029\0227/v1beta1/{name=orga"
-          + "nizations/*/locations/*/workloads/*}\332A\004n"
-          + "ame\022\324\001\n\rListWorkloads\022;.google.cloud.ass"
-          + "uredworkloads.v1beta1.ListWorkloadsReque"
-          + "st\032<.google.cloud.assuredworkloads.v1bet"
-          + "a1.ListWorkloadsResponse\"H\202\323\344\223\0029\0227/v1bet"
-          + "a1/{parent=organizations/*/locations/*}/"
-          + "workloads\332A\006parent\032S\312A\037assuredworkloads."
-          + "googleapis.com\322A.https://www.googleapis."
-          + "com/auth/cloud-platformB\366\002\n)com.google.c"
-          + "loud.assuredworkloads.v1beta1B\025Assuredwo"
-          + "rkloadsProtoP\001ZUgoogle.golang.org/genpro"
-          + "to/googleapis/cloud/assuredworkloads/v1b"
-          + "eta1;assuredworkloads\252\002%Google.Cloud.Ass"
-          + "uredWorkloads.V1Beta1\312\002%Google\\Cloud\\Ass"
-          + "uredWorkloads\\V1beta1\352\002(Google::Cloud::A"
-          + "ssuredWorkloads::V1beta1\352A]\n(assuredwork"
-          + "loads.googleapis.com/Location\0221organizat"
+          + "oad.SaaEnrollmentResponse.SetupStateH\000\210\001"
+          + "\001\022f\n\014setup_errors\030\002 \003(\0162P.google.cloud.a"
+          + "ssuredworkloads.v1beta1.Workload.SaaEnro"
+          + "llmentResponse.SetupError\"R\n\nSetupState\022"
+          + "\033\n\027SETUP_STATE_UNSPECIFIED\020\000\022\022\n\016STATUS_P"
+          + "ENDING\020\001\022\023\n\017STATUS_COMPLETE\020\002\"\262\001\n\nSetupE"
+          + "rror\022\033\n\027SETUP_ERROR_UNSPECIFIED\020\000\022\034\n\030ERR"
+          + "OR_INVALID_BASE_SETUP\020\001\022&\n\"ERROR_MISSING"
+          + "_EXTERNAL_SIGNING_KEY\020\002\022#\n\037ERROR_NOT_ALL"
+          + "_SERVICES_ENROLLED\020\003\022\034\n\030ERROR_SETUP_CHEC"
+          + "K_FAILED\020\004B\017\n\r_setup_status\032-\n\013LabelsEnt"
+          + "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\330\001\n\020C"
+          + "omplianceRegime\022!\n\035COMPLIANCE_REGIME_UNS"
+          + "PECIFIED\020\000\022\007\n\003IL4\020\001\022\010\n\004CJIS\020\002\022\020\n\014FEDRAMP"
+          + "_HIGH\020\003\022\024\n\020FEDRAMP_MODERATE\020\004\022\026\n\022US_REGI"
+          + "ONAL_ACCESS\020\005\022\t\n\005HIPAA\020\006\022\013\n\007HITRUST\020\007\022\032\n"
+          + "\026EU_REGIONS_AND_SUPPORT\020\010\022\032\n\026CA_REGIONS_"
+          + "AND_SUPPORT\020\t\"\177\n\022KajEnrollmentState\022$\n K"
+          + "AJ_ENROLLMENT_STATE_UNSPECIFIED\020\000\022 \n\034KAJ"
+          + "_ENROLLMENT_STATE_PENDING\020\001\022!\n\035KAJ_ENROL"
+          + "LMENT_STATE_COMPLETE\020\002:u\352Ar\n(assuredwork"
+          + "loads.googleapis.com/Workload\022Forganizat"
           + "ions/{organization}/locations/{location}"
-          + "b\006proto3"
+          + "/workloads/{workload}B\034\n\032compliance_regi"
+          + "me_settings\"\313\002\n\037CreateWorkloadOperationM"
+          + "etadata\0224\n\013create_time\030\001 \001(\0132\032.google.pr"
+          + "otobuf.TimestampB\003\340A\001\022\031\n\014display_name\030\002 "
+          + "\001(\tB\003\340A\001\022\023\n\006parent\030\003 \001(\tB\003\340A\001\022`\n\021complia"
+          + "nce_regime\030\004 \001(\0162@.google.cloud.assuredw"
+          + "orkloads.v1beta1.Workload.ComplianceRegi"
+          + "meB\003\340A\001\022`\n\021resource_settings\030\005 \003(\0132@.goo"
+          + "gle.cloud.assuredworkloads.v1beta1.Workl"
+          + "oad.ResourceSettingsB\003\340A\0012\243\t\n\027AssuredWor"
+          + "kloadsService\022\371\001\n\016CreateWorkload\022<.googl"
+          + "e.cloud.assuredworkloads.v1beta1.CreateW"
+          + "orkloadRequest\032\035.google.longrunning.Oper"
+          + "ation\"\211\001\202\323\344\223\002C\"7/v1beta1/{parent=organiz"
+          + "ations/*/locations/*}/workloads:\010workloa"
+          + "d\332A\017parent,workload\312A+\n\010Workload\022\037Create"
+          + "WorkloadOperationMetadata\022\352\001\n\016UpdateWork"
+          + "load\022<.google.cloud.assuredworkloads.v1b"
+          + "eta1.UpdateWorkloadRequest\032/.google.clou"
+          + "d.assuredworkloads.v1beta1.Workload\"i\202\323\344"
+          + "\223\002L2@/v1beta1/{workload.name=organizatio"
+          + "ns/*/locations/*/workloads/*}:\010workload\332"
+          + "A\024workload,update_mask\022\256\001\n\016DeleteWorkloa"
+          + "d\022<.google.cloud.assuredworkloads.v1beta"
+          + "1.DeleteWorkloadRequest\032\026.google.protobu"
+          + "f.Empty\"F\202\323\344\223\0029*7/v1beta1/{name=organiza"
+          + "tions/*/locations/*/workloads/*}\332A\004name\022"
+          + "\301\001\n\013GetWorkload\0229.google.cloud.assuredwo"
+          + "rkloads.v1beta1.GetWorkloadRequest\032/.goo"
+          + "gle.cloud.assuredworkloads.v1beta1.Workl"
+          + "oad\"F\202\323\344\223\0029\0227/v1beta1/{name=organization"
+          + "s/*/locations/*/workloads/*}\332A\004name\022\324\001\n\r"
+          + "ListWorkloads\022;.google.cloud.assuredwork"
+          + "loads.v1beta1.ListWorkloadsRequest\032<.goo"
+          + "gle.cloud.assuredworkloads.v1beta1.ListW"
+          + "orkloadsResponse\"H\202\323\344\223\0029\0227/v1beta1/{pare"
+          + "nt=organizations/*/locations/*}/workload"
+          + "s\332A\006parent\032S\312A\037assuredworkloads.googleap"
+          + "is.com\322A.https://www.googleapis.com/auth"
+          + "/cloud-platformB\366\002\n)com.google.cloud.ass"
+          + "uredworkloads.v1beta1B\025AssuredworkloadsP"
+          + "rotoP\001ZUgoogle.golang.org/genproto/googl"
+          + "eapis/cloud/assuredworkloads/v1beta1;ass"
+          + "uredworkloads\252\002%Google.Cloud.AssuredWork"
+          + "loads.V1Beta1\312\002%Google\\Cloud\\AssuredWork"
+          + "loads\\V1beta1\352\002(Google::Cloud::AssuredWo"
+          + "rkloads::V1beta1\352A]\n(assuredworkloads.go"
+          + "ogleapis.com/Location\0221organizations/{or"
+          + "ganization}/locations/{location}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadata.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadata.java
index 573fe990c0f5..8708651e9c55 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadata.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadata.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadataOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadataOrBuilder.java
index 7273ee145e5d..bcfe9418512f 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadataOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadOperationMetadataOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequest.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequest.java
index c5589f6ad2b4..fc1a8f1ec40c 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequest.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequestOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequestOrBuilder.java
index 6b3ba204e41f..1c6fdac222f6 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequestOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/CreateWorkloadRequestOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequest.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequest.java
index dccb1fcef480..ea7ce0c31593 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequest.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequestOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequestOrBuilder.java
index 6454e7e34dbb..08dcd620e712 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequestOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/DeleteWorkloadRequestOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequest.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequest.java
index 364a64777eae..c59da5e3da80 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequest.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequestOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequestOrBuilder.java
index 4dd6e746dbfd..91f4d12ce594 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequestOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/GetWorkloadRequestOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequest.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequest.java
index f59fd3852e09..2b09c8ea2ad8 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequest.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequestOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequestOrBuilder.java
index 808d6aa12bf8..14ced5a96ca5 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequestOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsRequestOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponse.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponse.java
index b0464e519669..40737ded9df5 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponse.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponse.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponseOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponseOrBuilder.java
index 5c6c0ad40068..047a178e5ea2 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponseOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/ListWorkloadsResponseOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequest.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequest.java
index cd2bf4fe307a..cb251925c302 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequest.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequestOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequestOrBuilder.java
index 2b65f0702d43..6b6c0921f529 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequestOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/UpdateWorkloadRequestOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java
index 50033a5c8e8b..d588da1e3f2a 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/Workload.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
@@ -9583,7 +9583,7 @@ public com.google.protobuf.ByteString getBillingAccountBytes() {
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.il4_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=455
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=455
    * @return Whether the il4Settings field is set.
    */
   @java.lang.Override
@@ -9604,7 +9604,7 @@ public boolean hasIl4Settings() {
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.il4_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=455
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=455
    * @return The il4Settings.
    */
   @java.lang.Override
@@ -9653,7 +9653,7 @@ public com.google.cloud.assuredworkloads.v1beta1.Workload.IL4Settings getIl4Sett
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.cjis_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=464
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=464
    * @return Whether the cjisSettings field is set.
    */
   @java.lang.Override
@@ -9674,7 +9674,7 @@ public boolean hasCjisSettings() {
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.cjis_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=464
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=464
    * @return The cjisSettings.
    */
   @java.lang.Override
@@ -9723,7 +9723,7 @@ public com.google.cloud.assuredworkloads.v1beta1.Workload.CJISSettings getCjisSe
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_high_settings is deprecated.
-   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=473
+   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=473
    * @return Whether the fedrampHighSettings field is set.
    */
   @java.lang.Override
@@ -9744,7 +9744,7 @@ public boolean hasFedrampHighSettings() {
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_high_settings is deprecated.
-   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=473
+   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=473
    * @return The fedrampHighSettings.
    */
   @java.lang.Override
@@ -9796,7 +9796,7 @@ public boolean hasFedrampHighSettings() {
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_moderate_settings is
-   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=482
+   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=482
    * @return Whether the fedrampModerateSettings field is set.
    */
   @java.lang.Override
@@ -9817,7 +9817,7 @@ public boolean hasFedrampModerateSettings() {
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_moderate_settings is
-   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=482
+   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=482
    * @return The fedrampModerateSettings.
    */
   @java.lang.Override
@@ -12360,7 +12360,7 @@ public Builder setBillingAccountBytes(com.google.protobuf.ByteString value) {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.il4_settings is deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=455
+     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=455
      * @return Whether the il4Settings field is set.
      */
     @java.lang.Override
@@ -12381,7 +12381,7 @@ public boolean hasIl4Settings() {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.il4_settings is deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=455
+     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=455
      * @return The il4Settings.
      */
     @java.lang.Override
@@ -12620,7 +12620,7 @@ public Builder clearIl4Settings() {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.cjis_settings is deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=464
+     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=464
      * @return Whether the cjisSettings field is set.
      */
     @java.lang.Override
@@ -12641,7 +12641,7 @@ public boolean hasCjisSettings() {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.cjis_settings is deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=464
+     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=464
      * @return The cjisSettings.
      */
     @java.lang.Override
@@ -12880,8 +12880,7 @@ public Builder clearCjisSettings() {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_high_settings is
-     *     deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=473
+     *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=473
      * @return Whether the fedrampHighSettings field is set.
      */
     @java.lang.Override
@@ -12902,8 +12901,7 @@ public boolean hasFedrampHighSettings() {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_high_settings is
-     *     deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=473
+     *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=473
      * @return The fedrampHighSettings.
      */
     @java.lang.Override
@@ -13148,8 +13146,7 @@ public Builder clearFedrampHighSettings() {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_moderate_settings is
-     *     deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=482
+     *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=482
      * @return Whether the fedrampModerateSettings field is set.
      */
     @java.lang.Override
@@ -13170,8 +13167,7 @@ public boolean hasFedrampModerateSettings() {
      * </code>
      *
      * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_moderate_settings is
-     *     deprecated. See
-     *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=482
+     *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=482
      * @return The fedrampModerateSettings.
      */
     @java.lang.Override
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java
index 3362cd95f7de..615a234e19e4 100644
--- a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java
+++ b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/java/com/google/cloud/assuredworkloads/v1beta1/WorkloadOrBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
+// source: google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
 
 package com.google.cloud.assuredworkloads.v1beta1;
 
@@ -288,7 +288,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.il4_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=455
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=455
    * @return Whether the il4Settings field is set.
    */
   @java.lang.Deprecated
@@ -306,7 +306,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.il4_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=455
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=455
    * @return The il4Settings.
    */
   @java.lang.Deprecated
@@ -339,7 +339,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.cjis_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=464
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=464
    * @return Whether the cjisSettings field is set.
    */
   @java.lang.Deprecated
@@ -357,7 +357,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.cjis_settings is deprecated. See
-   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=464
+   *     google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=464
    * @return The cjisSettings.
    */
   @java.lang.Deprecated
@@ -391,7 +391,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_high_settings is deprecated.
-   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=473
+   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=473
    * @return Whether the fedrampHighSettings field is set.
    */
   @java.lang.Deprecated
@@ -409,7 +409,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_high_settings is deprecated.
-   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=473
+   *     See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=473
    * @return The fedrampHighSettings.
    */
   @java.lang.Deprecated
@@ -443,7 +443,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_moderate_settings is
-   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=482
+   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=482
    * @return Whether the fedrampModerateSettings field is set.
    */
   @java.lang.Deprecated
@@ -461,7 +461,7 @@ com.google.cloud.assuredworkloads.v1beta1.Workload.ResourceInfoOrBuilder getReso
    * </code>
    *
    * @deprecated google.cloud.assuredworkloads.v1beta1.Workload.fedramp_moderate_settings is
-   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto;l=482
+   *     deprecated. See google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto;l=482
    * @return The fedrampModerateSettings.
    */
   @java.lang.Deprecated
diff --git a/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto b/java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto
similarity index 100%
rename from java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads_v1beta1.proto
rename to java-assured-workloads/proto-google-cloud-assured-workloads-v1beta1/src/main/proto/google/cloud/assuredworkloads/v1beta1/assuredworkloads.proto