diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/event_group.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/event_group.proto
index 88fd811aa5..7628a13a7b 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/event_group.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/event_group.proto
@@ -30,10 +30,12 @@ message EventGroup {
   option (google.api.resource) = {
     type: "reporting.halo-cmm.org/EventGroup"
     pattern: "measurementConsumers/{measurement_consumer}/eventGroups/{event_group}"
+    singular: "eventGroup"
+    plural: "eventGroups"
   };
 
   // Resource name.
-  string name = 1;
+  string name = 1 [(google.api.field_behavior) = IDENTIFIER];
 
   // Resource name of the corresponding `EventGroup` in the CMMS API.
   string cmms_event_group = 2 [
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/event_groups_service.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/event_groups_service.proto
index 07d8281bec..71ecab7695 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/event_groups_service.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/event_groups_service.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package wfa.measurement.reporting.v2alpha;
 
+import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/event_group.proto";
 
@@ -53,15 +53,15 @@ message ListEventGroupsRequest {
   // than this value. If unspecified, at most 50 `EventGroup`s will be
   // returned. The maximum value is 1000; values above 1000 will be coerced to
   // 1000.
-  int32 page_size = 2;
+  int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // A token from a previous call, specified to retrieve the next page. See
   // https://aip.dev/158.
-  string page_token = 3;
+  string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 
   // Result filter. Raw CEL expression that is applied to a message which has a
   // field for each event group template.
-  string filter = 4;
+  string filter = 4 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Response message for `ListEventGroups` method.
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/metric_calculation_specs_service.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/metric_calculation_specs_service.proto
index 7a82254e92..a1d09817c3 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/metric_calculation_specs_service.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/metric_calculation_specs_service.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package wfa.measurement.reporting.v2alpha;
 
+import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/metric_calculation_spec.proto";
 
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/metrics_service.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/metrics_service.proto
index dcfe8826e9..d4168279f6 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/metrics_service.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/metrics_service.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package wfa.measurement.reporting.v2alpha;
 
+import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/metric.proto";
 
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedule_iterations_service.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedule_iterations_service.proto
index d1e50a59ab..9f7f3319aa 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedule_iterations_service.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedule_iterations_service.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package wfa.measurement.reporting.v2alpha;
 
+import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/report_schedule_iteration.proto";
 
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedules_service.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedules_service.proto
index 040cfc4e3a..59c6929fda 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedules_service.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/report_schedules_service.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package wfa.measurement.reporting.v2alpha;
 
+import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/report_schedule.proto";
 
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_set.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_set.proto
index 00c3567b66..e1a746a32b 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_set.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_set.proto
@@ -28,13 +28,15 @@ message ReportingSet {
   option (google.api.resource) = {
     type: "reporting.halo-cmm.org/ReportingSet"
     pattern: "measurementConsumers/{measurement_consumer}/reportingSets/{reporting_set}"
+    singular: "reportingSet"
+    plural: "reportingSets"
   };
 
   // Resource name.
-  string name = 1;
+  string name = 1 [(google.api.field_behavior) = IDENTIFIER];
 
   // Human-readable name for display purposes.
-  string display_name = 2;
+  string display_name = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // A map of arbitrary key-value pairs to support tagging of ReportingSets
   // for upstream use by UIs and other rich clients.
@@ -88,7 +90,7 @@ message ReportingSet {
     Operand lhs = 3 [(google.api.field_behavior) = REQUIRED];
     // Right-hand side operand of the operation. If not specified, implies the
     // empty set.
-    Operand rhs = 4;
+    Operand rhs = 4 [(google.api.field_behavior) = OPTIONAL];
   }
 
   // Describes a set expression with a event filter. It's a
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_sets_service.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_sets_service.proto
index 8a423b7d53..9ccfdd876b 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_sets_service.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/reporting_sets_service.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package wfa.measurement.reporting.v2alpha;
 
+import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/reporting_set.proto";
 
@@ -51,7 +51,8 @@ service ReportingSets {
       post: "/v2alpha/{parent=measurementConsumers/*}/reportingSets"
       body: "reporting_set"
     };
-    option (google.api.method_signature) = "parent,reporting_set";
+    option (google.api.method_signature) =
+        "parent,reporting_set,reporting_set_id";
   }
 }
 
@@ -69,14 +70,14 @@ message ListReportingSetsRequest {
   // than this value.
   // If unspecified, at most 50 reportingSets will be returned.
   // The maximum value is 1000; values above 1000 will be coerced to 1000.
-  int32 page_size = 2;
+  int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL];
 
   // A page token, received from a previous `ListReportingSets` call.
   // Provide this to retrieve the subsequent page.
   //
   // When paginating, all other parameters provided to `ListReportingSets` must
   // match the call that provided the page token.
-  string page_token = 3;
+  string page_token = 3 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Response message for `ListReportingSet` method.
@@ -111,6 +112,7 @@ message CreateReportingSetRequest {
   ReportingSet reporting_set = 3 [(google.api.field_behavior) = REQUIRED];
 }
 
+// Request message for `GetReportingSet` method.
 message GetReportingSetRequest {
   // The name of the `ReportingSet` to retrieve.
   // Format:
diff --git a/src/main/proto/wfa/measurement/reporting/v2alpha/reports_service.proto b/src/main/proto/wfa/measurement/reporting/v2alpha/reports_service.proto
index 3af93e5883..bcbe24b12d 100644
--- a/src/main/proto/wfa/measurement/reporting/v2alpha/reports_service.proto
+++ b/src/main/proto/wfa/measurement/reporting/v2alpha/reports_service.proto
@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package wfa.measurement.reporting.v2alpha;
 
+import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/annotations.proto";
 import "google/api/resource.proto";
 import "wfa/measurement/reporting/v2alpha/report.proto";