diff --git a/src/main/java/com/google/events/cloud/audit/v1/DestinationAttributes.java b/src/main/java/com/google/events/cloud/audit/v1/DestinationAttributes.java
index 2c51ae70..797ec8ef 100644
--- a/src/main/java/com/google/events/cloud/audit/v1/DestinationAttributes.java
+++ b/src/main/java/com/google/events/cloud/audit/v1/DestinationAttributes.java
@@ -28,7 +28,7 @@
 public class DestinationAttributes {
     private String ip;
     private Map<String, String> labels;
-    private NumResponseItems port;
+    private Long port;
     private String principal;
     private String regionCode;
 
@@ -47,8 +47,8 @@ public class DestinationAttributes {
     /**
      * The network port of the peer.
      */
-    public NumResponseItems getPort() { return port; }
-    public void setPort(NumResponseItems value) { this.port = value; }
+    public Long getPort() { return port; }
+    public void setPort(Long value) { this.port = value; }
 
     /**
      * The identity of this peer. Similar to `Request.auth.principal`, but
diff --git a/src/main/java/com/google/events/cloud/audit/v1/LogEntryData.java b/src/main/java/com/google/events/cloud/audit/v1/LogEntryData.java
index ce742aa6..c40356b9 100644
--- a/src/main/java/com/google/events/cloud/audit/v1/LogEntryData.java
+++ b/src/main/java/com/google/events/cloud/audit/v1/LogEntryData.java
@@ -20,10 +20,7 @@
 import java.util.Map;
 
 /**
- * Generic log entry, used as a wrapper for Cloud Audit Logs in events.
- * This is copied from
- * https://github.com/googleapis/googleapis/blob/master/google/logging/v2/log_entry.proto
- * and adapted appropriately.
+ * The data within all Cloud Audit Logs log entry events.
  */
 public class LogEntryData {
     private String insertID;
@@ -33,7 +30,7 @@ public class LogEntryData {
     private ProtoPayload protoPayload;
     private OffsetDateTime receiveTimestamp;
     private Resource resource;
-    private NumResponseItems severity;
+    private Severity severity;
     private String spanID;
     private OffsetDateTime timestamp;
     private String trace;
@@ -88,8 +85,8 @@ public class LogEntryData {
     /**
      * The severity of the log entry.
      */
-    public NumResponseItems getSeverity() { return severity; }
-    public void setSeverity(NumResponseItems value) { this.severity = value; }
+    public Severity getSeverity() { return severity; }
+    public void setSeverity(Severity value) { this.severity = value; }
 
     /**
      * The span ID within the trace associated with the log entry, if any.
diff --git a/src/main/java/com/google/events/cloud/audit/v1/ProtoPayload.java b/src/main/java/com/google/events/cloud/audit/v1/ProtoPayload.java
index 2d2c0eda..8e223e3c 100644
--- a/src/main/java/com/google/events/cloud/audit/v1/ProtoPayload.java
+++ b/src/main/java/com/google/events/cloud/audit/v1/ProtoPayload.java
@@ -24,7 +24,7 @@ public class ProtoPayload {
     private AuthorizationInfo[] authorizationInfo;
     private Metadata metadata;
     private String methodName;
-    private NumResponseItems numResponseItems;
+    private Long numResponseItems;
     private Request request;
     private RequestMetadata requestMetadata;
     private ResourceLocation resourceLocation;
@@ -71,8 +71,8 @@ public class ProtoPayload {
      * The number of items returned from a List or Query API method,
      * if applicable.
      */
-    public NumResponseItems getNumResponseItems() { return numResponseItems; }
-    public void setNumResponseItems(NumResponseItems value) { this.numResponseItems = value; }
+    public Long getNumResponseItems() { return numResponseItems; }
+    public void setNumResponseItems(Long value) { this.numResponseItems = value; }
 
     /**
      * The operation request. This may not include all request parameters,
diff --git a/src/main/java/com/google/events/cloud/audit/v1/RequestAttributes.java b/src/main/java/com/google/events/cloud/audit/v1/RequestAttributes.java
index 28aa7ac7..adafbbaf 100644
--- a/src/main/java/com/google/events/cloud/audit/v1/RequestAttributes.java
+++ b/src/main/java/com/google/events/cloud/audit/v1/RequestAttributes.java
@@ -40,7 +40,7 @@ public class RequestAttributes {
     private String query;
     private String reason;
     private String scheme;
-    private NumResponseItems size;
+    private Long size;
     private OffsetDateTime time;
 
     /**
@@ -117,8 +117,8 @@ public class RequestAttributes {
     /**
      * The HTTP request size in bytes. If unknown, it must be -1.
      */
-    public NumResponseItems getSize() { return size; }
-    public void setSize(NumResponseItems value) { this.size = value; }
+    public Long getSize() { return size; }
+    public void setSize(Long value) { this.size = value; }
 
     /**
      * The timestamp when the `destination` service receives the first byte of
diff --git a/src/main/java/com/google/events/cloud/audit/v1/NumResponseItems.java b/src/main/java/com/google/events/cloud/audit/v1/Severity.java
similarity index 91%
rename from src/main/java/com/google/events/cloud/audit/v1/NumResponseItems.java
rename to src/main/java/com/google/events/cloud/audit/v1/Severity.java
index 9ab30163..4f93a4b1 100644
--- a/src/main/java/com/google/events/cloud/audit/v1/NumResponseItems.java
+++ b/src/main/java/com/google/events/cloud/audit/v1/Severity.java
@@ -18,7 +18,10 @@
 
 import java.io.IOException;
 
-public class NumResponseItems {
+/**
+ * The severity of the log entry.
+ */
+public class Severity {
     public Long integerValue;
     public String stringValue;
 }
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventData.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventData.java
index 289df0eb..cde79ba9 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventData.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventData.java
@@ -20,11 +20,7 @@
 import java.util.Map;
 
 /**
- * Build event data
- * Common build format for Google Cloud Platform API operations.
- * Copied from
- *
- * https://github.com/googleapis/googleapis/blob/master/google/devtools/cloudbuild/v1/cloudbuild.proto.
+ * Build event data for Google Cloud Platform API operations.
  */
 public class BuildEventData {
     private Artifacts artifacts;
@@ -43,7 +39,7 @@ public class BuildEventData {
     private Source source;
     private SourceProvenance sourceProvenance;
     private OffsetDateTime startTime;
-    private Status status;
+    private BuildEventDataStatus status;
     private String statusDetail;
     private Step[] steps;
     private Map<String, String> substitutions;
@@ -171,8 +167,8 @@ public class BuildEventData {
     /**
      * Status of the build.
      */
-    public Status getStatus() { return status; }
-    public void setStatus(Status value) { this.status = value; }
+    public BuildEventDataStatus getStatus() { return status; }
+    public void setStatus(BuildEventDataStatus value) { this.status = value; }
 
     /**
      * Customer-readable message about the current status.
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/Status.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventDataStatus.java
similarity index 95%
rename from src/main/java/com/google/events/cloud/cloudbuild/v1/Status.java
rename to src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventDataStatus.java
index 8d7c74b4..38a6547c 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/Status.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventDataStatus.java
@@ -21,7 +21,7 @@
 /**
  * Status of the build.
  */
-public class Status {
+public class BuildEventDataStatus {
     public Long integerValue;
     public StatusEnum enumValue;
 }
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventDataTimeout.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventDataTimeout.java
index 190557db..020a30aa 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventDataTimeout.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/BuildEventDataTimeout.java
@@ -23,7 +23,7 @@
  */
 public class BuildEventDataTimeout {
     private Long nanos;
-    private DiskSizeGBUnion seconds;
+    private Long seconds;
 
     /**
      * Signed fractions of a second at nanosecond resolution of the span
@@ -41,6 +41,6 @@ public class BuildEventDataTimeout {
      * to +315,576,000,000 inclusive. Note: these bounds are computed from:
      * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
      */
-    public DiskSizeGBUnion getSeconds() { return seconds; }
-    public void setSeconds(DiskSizeGBUnion value) { this.seconds = value; }
+    public Long getSeconds() { return seconds; }
+    public void setSeconds(Long value) { this.seconds = value; }
 }
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/Options.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/Options.java
index ec24f836..16e652ca 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/Options.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/Options.java
@@ -20,7 +20,7 @@
  * Special options for this build.
  */
 public class Options {
-    private DiskSizeGBUnion diskSizeGB;
+    private Long diskSizeGB;
     private String[] env;
     private Logging logging;
     private LogStreamingOption logStreamingOption;
@@ -40,8 +40,8 @@ public class Options {
      * requested. At present, the maximum disk size is 1000GB; builds that request
      * more than the maximum are rejected with an error.
      */
-    public DiskSizeGBUnion getDiskSizeGB() { return diskSizeGB; }
-    public void setDiskSizeGB(DiskSizeGBUnion value) { this.diskSizeGB = value; }
+    public Long getDiskSizeGB() { return diskSizeGB; }
+    public void setDiskSizeGB(Long value) { this.diskSizeGB = value; }
 
     /**
      * A list of global environment variable definitions that will exist for all
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/QueueTTL.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/QueueTTL.java
index 825b4a67..d25f4de4 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/QueueTTL.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/QueueTTL.java
@@ -25,7 +25,7 @@
  */
 public class QueueTTL {
     private Long nanos;
-    private DiskSizeGBUnion seconds;
+    private Long seconds;
 
     /**
      * Signed fractions of a second at nanosecond resolution of the span
@@ -43,6 +43,6 @@ public class QueueTTL {
      * to +315,576,000,000 inclusive. Note: these bounds are computed from:
      * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
      */
-    public DiskSizeGBUnion getSeconds() { return seconds; }
-    public void setSeconds(DiskSizeGBUnion value) { this.seconds = value; }
+    public Long getSeconds() { return seconds; }
+    public void setSeconds(Long value) { this.seconds = value; }
 }
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/ResolvedStorageSourceClass.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/ResolvedStorageSourceClass.java
index e103085f..a2d1ac15 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/ResolvedStorageSourceClass.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/ResolvedStorageSourceClass.java
@@ -26,7 +26,7 @@
  */
 public class ResolvedStorageSourceClass {
     private String bucket;
-    private DiskSizeGBUnion generation;
+    private Long generation;
     private String object;
 
     /**
@@ -41,8 +41,8 @@ public class ResolvedStorageSourceClass {
      * Google Cloud Storage generation for the object. If the generation is
      * omitted, the latest generation will be used.
      */
-    public DiskSizeGBUnion getGeneration() { return generation; }
-    public void setGeneration(DiskSizeGBUnion value) { this.generation = value; }
+    public Long getGeneration() { return generation; }
+    public void setGeneration(Long value) { this.generation = value; }
 
     /**
      * Google Cloud Storage object containing the source.
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/Results.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/Results.java
index 8e85a9eb..ff302f04 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/Results.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/Results.java
@@ -25,7 +25,7 @@ public class Results {
     private String[] buildStepImages;
     private String[] buildStepOutputs;
     private Image[] images;
-    private DiskSizeGBUnion numArtifacts;
+    private Long numArtifacts;
 
     /**
      * Path to the artifact manifest. Only populated when artifacts are uploaded.
@@ -66,6 +66,6 @@ public class Results {
     /**
      * Number of artifacts uploaded. Only populated when artifacts are uploaded.
      */
-    public DiskSizeGBUnion getNumArtifacts() { return numArtifacts; }
-    public void setNumArtifacts(DiskSizeGBUnion value) { this.numArtifacts = value; }
+    public Long getNumArtifacts() { return numArtifacts; }
+    public void setNumArtifacts(Long value) { this.numArtifacts = value; }
 }
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/Step.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/Step.java
index 25480fd7..bbc57b5e 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/Step.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/Step.java
@@ -28,7 +28,7 @@ public class Step {
     private String name;
     private PullTiming pullTiming;
     private String[] secretEnv;
-    private DiskSizeGBUnion status;
+    private StepStatus status;
     private StepTimeout timeout;
     private StepTiming timing;
     private Volume[] volumes;
@@ -126,8 +126,8 @@ public class Step {
      * only updated on build completion; step status is not updated in real-time
      * as the build progresses.
      */
-    public DiskSizeGBUnion getStatus() { return status; }
-    public void setStatus(DiskSizeGBUnion value) { this.status = value; }
+    public StepStatus getStatus() { return status; }
+    public void setStatus(StepStatus value) { this.status = value; }
 
     /**
      * Time limit for executing this build step. If not defined, the step has no
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/DiskSizeGBUnion.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/StepStatus.java
similarity index 95%
rename from src/main/java/com/google/events/cloud/cloudbuild/v1/DiskSizeGBUnion.java
rename to src/main/java/com/google/events/cloud/cloudbuild/v1/StepStatus.java
index dae85a55..6dc1f1d1 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/DiskSizeGBUnion.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/StepStatus.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 
-public class DiskSizeGBUnion {
+public class StepStatus {
     public Long integerValue;
     public String stringValue;
 }
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/StepTimeout.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/StepTimeout.java
index 89ffc041..66a4f844 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/StepTimeout.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/StepTimeout.java
@@ -23,7 +23,7 @@
  */
 public class StepTimeout {
     private Long nanos;
-    private DiskSizeGBUnion seconds;
+    private Long seconds;
 
     /**
      * Signed fractions of a second at nanosecond resolution of the span
@@ -41,6 +41,6 @@ public class StepTimeout {
      * to +315,576,000,000 inclusive. Note: these bounds are computed from:
      * 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
      */
-    public DiskSizeGBUnion getSeconds() { return seconds; }
-    public void setSeconds(DiskSizeGBUnion value) { this.seconds = value; }
+    public Long getSeconds() { return seconds; }
+    public void setSeconds(Long value) { this.seconds = value; }
 }
diff --git a/src/main/java/com/google/events/cloud/cloudbuild/v1/StorageSourceClass.java b/src/main/java/com/google/events/cloud/cloudbuild/v1/StorageSourceClass.java
index 9b19c962..7a94997f 100644
--- a/src/main/java/com/google/events/cloud/cloudbuild/v1/StorageSourceClass.java
+++ b/src/main/java/com/google/events/cloud/cloudbuild/v1/StorageSourceClass.java
@@ -23,7 +23,7 @@
  */
 public class StorageSourceClass {
     private String bucket;
-    private DiskSizeGBUnion generation;
+    private Long generation;
     private String object;
 
     /**
@@ -38,8 +38,8 @@ public class StorageSourceClass {
      * Google Cloud Storage generation for the object. If the generation is
      * omitted, the latest generation will be used.
      */
-    public DiskSizeGBUnion getGeneration() { return generation; }
-    public void setGeneration(DiskSizeGBUnion value) { this.generation = value; }
+    public Long getGeneration() { return generation; }
+    public void setGeneration(Long value) { this.generation = value; }
 
     /**
      * Google Cloud Storage object containing the source.
diff --git a/src/main/java/com/google/events/cloud/firestore/v1/MapValueField.java b/src/main/java/com/google/events/cloud/firestore/v1/MapValueField.java
index c9e2f80d..6475673b 100644
--- a/src/main/java/com/google/events/cloud/firestore/v1/MapValueField.java
+++ b/src/main/java/com/google/events/cloud/firestore/v1/MapValueField.java
@@ -27,9 +27,9 @@ public class MapValueField {
     private String bytesValue;
     private Double doubleValue;
     private GeoPointValue geoPointValue;
-    private IntegerValueUnion integerValue;
+    private Long integerValue;
     private MapValue mapValue;
-    private IntegerValueUnion nullValue;
+    private NullValue nullValue;
     private String referenceValue;
     private String stringValue;
     private OffsetDateTime timestampValue;
@@ -73,8 +73,8 @@ public class MapValueField {
     /**
      * An integer value.
      */
-    public IntegerValueUnion getIntegerValue() { return integerValue; }
-    public void setIntegerValue(IntegerValueUnion value) { this.integerValue = value; }
+    public Long getIntegerValue() { return integerValue; }
+    public void setIntegerValue(Long value) { this.integerValue = value; }
 
     /**
      * A map value.
@@ -85,8 +85,8 @@ public class MapValueField {
     /**
      * A null value.
      */
-    public IntegerValueUnion getNullValue() { return nullValue; }
-    public void setNullValue(IntegerValueUnion value) { this.nullValue = value; }
+    public NullValue getNullValue() { return nullValue; }
+    public void setNullValue(NullValue value) { this.nullValue = value; }
 
     /**
      * A reference to a document. For example:
diff --git a/src/main/java/com/google/events/cloud/firestore/v1/IntegerValueUnion.java b/src/main/java/com/google/events/cloud/firestore/v1/NullValue.java
similarity index 93%
rename from src/main/java/com/google/events/cloud/firestore/v1/IntegerValueUnion.java
rename to src/main/java/com/google/events/cloud/firestore/v1/NullValue.java
index a005c5aa..20799a11 100644
--- a/src/main/java/com/google/events/cloud/firestore/v1/IntegerValueUnion.java
+++ b/src/main/java/com/google/events/cloud/firestore/v1/NullValue.java
@@ -18,7 +18,10 @@
 
 import java.io.IOException;
 
-public class IntegerValueUnion {
+/**
+ * A null value.
+ */
+public class NullValue {
     public Long integerValue;
     public String stringValue;
 }
diff --git a/src/main/java/com/google/events/cloud/firestore/v1/OldValueField.java b/src/main/java/com/google/events/cloud/firestore/v1/OldValueField.java
index bc4aa63d..947f1b62 100644
--- a/src/main/java/com/google/events/cloud/firestore/v1/OldValueField.java
+++ b/src/main/java/com/google/events/cloud/firestore/v1/OldValueField.java
@@ -27,9 +27,9 @@ public class OldValueField {
     private String bytesValue;
     private Double doubleValue;
     private GeoPointValue geoPointValue;
-    private IntegerValueUnion integerValue;
+    private Long integerValue;
     private MapValue mapValue;
-    private IntegerValueUnion nullValue;
+    private NullValue nullValue;
     private String referenceValue;
     private String stringValue;
     private OffsetDateTime timestampValue;
@@ -73,8 +73,8 @@ public class OldValueField {
     /**
      * An integer value.
      */
-    public IntegerValueUnion getIntegerValue() { return integerValue; }
-    public void setIntegerValue(IntegerValueUnion value) { this.integerValue = value; }
+    public Long getIntegerValue() { return integerValue; }
+    public void setIntegerValue(Long value) { this.integerValue = value; }
 
     /**
      * A map value.
@@ -85,8 +85,8 @@ public class OldValueField {
     /**
      * A null value.
      */
-    public IntegerValueUnion getNullValue() { return nullValue; }
-    public void setNullValue(IntegerValueUnion value) { this.nullValue = value; }
+    public NullValue getNullValue() { return nullValue; }
+    public void setNullValue(NullValue value) { this.nullValue = value; }
 
     /**
      * A reference to a document. For example:
diff --git a/src/main/java/com/google/events/cloud/firestore/v1/ValueElement.java b/src/main/java/com/google/events/cloud/firestore/v1/ValueElement.java
index 762affd9..92887728 100644
--- a/src/main/java/com/google/events/cloud/firestore/v1/ValueElement.java
+++ b/src/main/java/com/google/events/cloud/firestore/v1/ValueElement.java
@@ -27,9 +27,9 @@ public class ValueElement {
     private String bytesValue;
     private Double doubleValue;
     private GeoPointValue geoPointValue;
-    private IntegerValueUnion integerValue;
+    private Long integerValue;
     private MapValue mapValue;
-    private IntegerValueUnion nullValue;
+    private NullValue nullValue;
     private String referenceValue;
     private String stringValue;
     private OffsetDateTime timestampValue;
@@ -73,8 +73,8 @@ public class ValueElement {
     /**
      * An integer value.
      */
-    public IntegerValueUnion getIntegerValue() { return integerValue; }
-    public void setIntegerValue(IntegerValueUnion value) { this.integerValue = value; }
+    public Long getIntegerValue() { return integerValue; }
+    public void setIntegerValue(Long value) { this.integerValue = value; }
 
     /**
      * A map value.
@@ -85,8 +85,8 @@ public class ValueElement {
     /**
      * A null value.
      */
-    public IntegerValueUnion getNullValue() { return nullValue; }
-    public void setNullValue(IntegerValueUnion value) { this.nullValue = value; }
+    public NullValue getNullValue() { return nullValue; }
+    public void setNullValue(NullValue value) { this.nullValue = value; }
 
     /**
      * A reference to a document. For example:
diff --git a/src/main/java/com/google/events/cloud/pubsub/v1/MessagePublishedData.java b/src/main/java/com/google/events/cloud/pubsub/v1/MessagePublishedData.java
index 4368d2db..218546b9 100644
--- a/src/main/java/com/google/events/cloud/pubsub/v1/MessagePublishedData.java
+++ b/src/main/java/com/google/events/cloud/pubsub/v1/MessagePublishedData.java
@@ -17,7 +17,7 @@
 package com.google.events.cloud.pubsub.v1;
 
 /**
- * The data received in an event when a message is published to a topic.
+ * The event data when a message is published to a topic.
  */
 public class MessagePublishedData {
     private Message message;
diff --git a/src/main/java/com/google/events/cloud/storage/v1/Generation.java b/src/main/java/com/google/events/cloud/storage/v1/Generation.java
deleted file mode 100644
index 437561a8..00000000
--- a/src/main/java/com/google/events/cloud/storage/v1/Generation.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.events.cloud.storage.v1;
-
-import java.io.IOException;
-
-public class Generation {
-    public Long integerValue;
-    public String stringValue;
-}
diff --git a/src/main/java/com/google/events/cloud/storage/v1/StorageObjectData.java b/src/main/java/com/google/events/cloud/storage/v1/StorageObjectData.java
index c88ce2b1..caacf9b4 100644
--- a/src/main/java/com/google/events/cloud/storage/v1/StorageObjectData.java
+++ b/src/main/java/com/google/events/cloud/storage/v1/StorageObjectData.java
@@ -34,18 +34,18 @@ public class StorageObjectData {
     private CustomerEncryption customerEncryption;
     private String etag;
     private Boolean eventBasedHold;
-    private Generation generation;
+    private Long generation;
     private String id;
     private String kind;
     private String kmsKeyName;
     private String md5Hash;
     private String mediaLink;
     private Map<String, String> metadata;
-    private Generation metageneration;
+    private Long metageneration;
     private String name;
     private OffsetDateTime retentionExpirationTime;
     private String selfLink;
-    private Generation size;
+    private Long size;
     private String storageClass;
     private Boolean temporaryHold;
     private OffsetDateTime timeCreated;
@@ -137,8 +137,8 @@ public class StorageObjectData {
      * The content generation of this object. Used for object versioning.
      * Attempting to set this field will result in an error.
      */
-    public Generation getGeneration() { return generation; }
-    public void setGeneration(Generation value) { this.generation = value; }
+    public Long getGeneration() { return generation; }
+    public void setGeneration(Long value) { this.generation = value; }
 
     /**
      * The ID of the object, including the bucket name, object name, and
@@ -188,8 +188,8 @@ public class StorageObjectData {
      * number is only meaningful in the context of a particular generation of a
      * particular object.
      */
-    public Generation getMetageneration() { return metageneration; }
-    public void setMetageneration(Generation value) { this.metageneration = value; }
+    public Long getMetageneration() { return metageneration; }
+    public void setMetageneration(Long value) { this.metageneration = value; }
 
     /**
      * The name of the object.
@@ -214,8 +214,8 @@ public class StorageObjectData {
      * Content-Length of the object data in bytes, matching
      * [https://tools.ietf.org/html/rfc7230#section-3.3.2][RFC 7230 §3.3.2].
      */
-    public Generation getSize() { return size; }
-    public void setSize(Generation value) { this.size = value; }
+    public Long getSize() { return size; }
+    public void setSize(Long value) { this.size = value; }
 
     /**
      * Storage class of the object.
diff --git a/src/main/java/com/google/events/firebase/analytics/v1/AnalyticsValue.java b/src/main/java/com/google/events/firebase/analytics/v1/AnalyticsValue.java
index 206ed472..bfad9b8a 100644
--- a/src/main/java/com/google/events/firebase/analytics/v1/AnalyticsValue.java
+++ b/src/main/java/com/google/events/firebase/analytics/v1/AnalyticsValue.java
@@ -23,7 +23,7 @@
 public class AnalyticsValue {
     private Double doubleValue;
     private Double floatValue;
-    private IntValue intValue;
+    private Long intValue;
     private String stringValue;
 
     public Double getDoubleValue() { return doubleValue; }
@@ -32,8 +32,8 @@ public class AnalyticsValue {
     public Double getFloatValue() { return floatValue; }
     public void setFloatValue(Double value) { this.floatValue = value; }
 
-    public IntValue getIntValue() { return intValue; }
-    public void setIntValue(IntValue value) { this.intValue = value; }
+    public Long getIntValue() { return intValue; }
+    public void setIntValue(Long value) { this.intValue = value; }
 
     public String getStringValue() { return stringValue; }
     public void setStringValue(String value) { this.stringValue = value; }
diff --git a/src/main/java/com/google/events/firebase/analytics/v1/BundleInfo.java b/src/main/java/com/google/events/firebase/analytics/v1/BundleInfo.java
index 5d8c9000..9291145b 100644
--- a/src/main/java/com/google/events/firebase/analytics/v1/BundleInfo.java
+++ b/src/main/java/com/google/events/firebase/analytics/v1/BundleInfo.java
@@ -21,7 +21,7 @@
  */
 public class BundleInfo {
     private Long bundleSequenceID;
-    private IntValue serverTimestampOffsetMicros;
+    private Long serverTimestampOffsetMicros;
 
     /**
      * Monotonically increasing index for each bundle set by SDK.
@@ -32,6 +32,6 @@ public class BundleInfo {
     /**
      * Timestamp offset between collection time and upload time.
      */
-    public IntValue getServerTimestampOffsetMicros() { return serverTimestampOffsetMicros; }
-    public void setServerTimestampOffsetMicros(IntValue value) { this.serverTimestampOffsetMicros = value; }
+    public Long getServerTimestampOffsetMicros() { return serverTimestampOffsetMicros; }
+    public void setServerTimestampOffsetMicros(Long value) { this.serverTimestampOffsetMicros = value; }
 }
diff --git a/src/main/java/com/google/events/firebase/analytics/v1/EventDim.java b/src/main/java/com/google/events/firebase/analytics/v1/EventDim.java
index 29e2618e..eebb93c8 100644
--- a/src/main/java/com/google/events/firebase/analytics/v1/EventDim.java
+++ b/src/main/java/com/google/events/firebase/analytics/v1/EventDim.java
@@ -25,8 +25,8 @@ public class EventDim {
     private String date;
     private String name;
     private Map<String, AnalyticsValue> params;
-    private IntValue previousTimestampMicros;
-    private IntValue timestampMicros;
+    private Long previousTimestampMicros;
+    private Long timestampMicros;
     private Double valueInUsd;
 
     /**
@@ -51,14 +51,14 @@ public class EventDim {
     /**
      * UTC client time when the previous event happened.
      */
-    public IntValue getPreviousTimestampMicros() { return previousTimestampMicros; }
-    public void setPreviousTimestampMicros(IntValue value) { this.previousTimestampMicros = value; }
+    public Long getPreviousTimestampMicros() { return previousTimestampMicros; }
+    public void setPreviousTimestampMicros(Long value) { this.previousTimestampMicros = value; }
 
     /**
      * UTC client time when the event happened.
      */
-    public IntValue getTimestampMicros() { return timestampMicros; }
-    public void setTimestampMicros(IntValue value) { this.timestampMicros = value; }
+    public Long getTimestampMicros() { return timestampMicros; }
+    public void setTimestampMicros(Long value) { this.timestampMicros = value; }
 
     /**
      * Value param in USD.
diff --git a/src/main/java/com/google/events/firebase/analytics/v1/IntValue.java b/src/main/java/com/google/events/firebase/analytics/v1/IntValue.java
deleted file mode 100644
index ba876a81..00000000
--- a/src/main/java/com/google/events/firebase/analytics/v1/IntValue.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2020 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.events.firebase.analytics.v1;
-
-import java.io.IOException;
-
-public class IntValue {
-    public Long integerValue;
-    public String stringValue;
-}
diff --git a/src/main/java/com/google/events/firebase/analytics/v1/UserDim.java b/src/main/java/com/google/events/firebase/analytics/v1/UserDim.java
index d0681a30..621d0fec 100644
--- a/src/main/java/com/google/events/firebase/analytics/v1/UserDim.java
+++ b/src/main/java/com/google/events/firebase/analytics/v1/UserDim.java
@@ -25,7 +25,7 @@ public class UserDim {
     private AppInfo appInfo;
     private BundleInfo bundleInfo;
     private DeviceInfo deviceInfo;
-    private IntValue firstOpenTimestampMicros;
+    private Long firstOpenTimestampMicros;
     private GeoInfo geoInfo;
     private LtvInfo ltvInfo;
     private TrafficSource trafficSource;
@@ -53,8 +53,8 @@ public class UserDim {
     /**
      * The time (in microseconds) at which the user first opened the app.
      */
-    public IntValue getFirstOpenTimestampMicros() { return firstOpenTimestampMicros; }
-    public void setFirstOpenTimestampMicros(IntValue value) { this.firstOpenTimestampMicros = value; }
+    public Long getFirstOpenTimestampMicros() { return firstOpenTimestampMicros; }
+    public void setFirstOpenTimestampMicros(Long value) { this.firstOpenTimestampMicros = value; }
 
     /**
      * User's geographic information.
diff --git a/src/main/java/com/google/events/firebase/analytics/v1/UserProperty.java b/src/main/java/com/google/events/firebase/analytics/v1/UserProperty.java
index 75774954..3e049fa5 100644
--- a/src/main/java/com/google/events/firebase/analytics/v1/UserProperty.java
+++ b/src/main/java/com/google/events/firebase/analytics/v1/UserProperty.java
@@ -18,7 +18,7 @@
 
 public class UserProperty {
     private Long index;
-    private IntValue setTimestampUsec;
+    private Long setTimestampUsec;
     private Value value;
 
     /**
@@ -30,8 +30,8 @@ public class UserProperty {
     /**
      * UTC client time when user property was last set.
      */
-    public IntValue getSetTimestampUsec() { return setTimestampUsec; }
-    public void setSetTimestampUsec(IntValue value) { this.setTimestampUsec = value; }
+    public Long getSetTimestampUsec() { return setTimestampUsec; }
+    public void setSetTimestampUsec(Long value) { this.setTimestampUsec = value; }
 
     /**
      * Last set value of user property.
diff --git a/src/main/java/com/google/events/firebase/analytics/v1/Value.java b/src/main/java/com/google/events/firebase/analytics/v1/Value.java
index 232cc530..b9028c16 100644
--- a/src/main/java/com/google/events/firebase/analytics/v1/Value.java
+++ b/src/main/java/com/google/events/firebase/analytics/v1/Value.java
@@ -25,7 +25,7 @@
 public class Value {
     private Double doubleValue;
     private Double floatValue;
-    private IntValue intValue;
+    private Long intValue;
     private String stringValue;
 
     public Double getDoubleValue() { return doubleValue; }
@@ -34,8 +34,8 @@ public class Value {
     public Double getFloatValue() { return floatValue; }
     public void setFloatValue(Double value) { this.floatValue = value; }
 
-    public IntValue getIntValue() { return intValue; }
-    public void setIntValue(IntValue value) { this.intValue = value; }
+    public Long getIntValue() { return intValue; }
+    public void setIntValue(Long value) { this.intValue = value; }
 
     public String getStringValue() { return stringValue; }
     public void setStringValue(String value) { this.stringValue = value; }
diff --git a/src/main/java/com/google/events/firebase/auth/v1/AuthEventData.java b/src/main/java/com/google/events/firebase/auth/v1/AuthEventData.java
index 4bd90058..0724ea1f 100644
--- a/src/main/java/com/google/events/firebase/auth/v1/AuthEventData.java
+++ b/src/main/java/com/google/events/firebase/auth/v1/AuthEventData.java
@@ -17,7 +17,7 @@
 package com.google.events.firebase.auth.v1;
 
 /**
- * The data within all Firebase Auth events
+ * The data within all Firebase Auth events.
  */
 public class AuthEventData {
     private CustomClaims customClaims;
diff --git a/src/main/java/com/google/events/firebase/remoteconfig/v1/RemoteConfigEventData.java b/src/main/java/com/google/events/firebase/remoteconfig/v1/RemoteConfigEventData.java
index 81b104bc..333aa376 100644
--- a/src/main/java/com/google/events/firebase/remoteconfig/v1/RemoteConfigEventData.java
+++ b/src/main/java/com/google/events/firebase/remoteconfig/v1/RemoteConfigEventData.java
@@ -23,12 +23,12 @@
  */
 public class RemoteConfigEventData {
     private String description;
-    private RollbackSource rollbackSource;
-    private RollbackSource updateOrigin;
+    private Long rollbackSource;
+    private Update updateOrigin;
     private OffsetDateTime updateTime;
-    private RollbackSource updateType;
+    private Update updateType;
     private UpdateUser updateUser;
-    private RollbackSource versionNumber;
+    private Long versionNumber;
 
     /**
      * The user-provided description of the corresponding Remote Config template.
@@ -40,14 +40,14 @@ public class RemoteConfigEventData {
      * Only present if this version is the result of a rollback, and will be the
      * version number of the Remote Config template that was rolled-back to.
      */
-    public RollbackSource getRollbackSource() { return rollbackSource; }
-    public void setRollbackSource(RollbackSource value) { this.rollbackSource = value; }
+    public Long getRollbackSource() { return rollbackSource; }
+    public void setRollbackSource(Long value) { this.rollbackSource = value; }
 
     /**
      * Where the update action originated.
      */
-    public RollbackSource getUpdateOrigin() { return updateOrigin; }
-    public void setUpdateOrigin(RollbackSource value) { this.updateOrigin = value; }
+    public Update getUpdateOrigin() { return updateOrigin; }
+    public void setUpdateOrigin(Update value) { this.updateOrigin = value; }
 
     /**
      * When the Remote Config template was written to the Remote Config server.
@@ -58,8 +58,8 @@ public class RemoteConfigEventData {
     /**
      * What type of update was made.
      */
-    public RollbackSource getUpdateType() { return updateType; }
-    public void setUpdateType(RollbackSource value) { this.updateType = value; }
+    public Update getUpdateType() { return updateType; }
+    public void setUpdateType(Update value) { this.updateType = value; }
 
     /**
      * Aggregation of all metadata fields about the account that performed the update.
@@ -70,6 +70,6 @@ public class RemoteConfigEventData {
     /**
      * The version number of the version's corresponding Remote Config template.
      */
-    public RollbackSource getVersionNumber() { return versionNumber; }
-    public void setVersionNumber(RollbackSource value) { this.versionNumber = value; }
+    public Long getVersionNumber() { return versionNumber; }
+    public void setVersionNumber(Long value) { this.versionNumber = value; }
 }
diff --git a/src/main/java/com/google/events/firebase/remoteconfig/v1/RollbackSource.java b/src/main/java/com/google/events/firebase/remoteconfig/v1/Update.java
similarity index 96%
rename from src/main/java/com/google/events/firebase/remoteconfig/v1/RollbackSource.java
rename to src/main/java/com/google/events/firebase/remoteconfig/v1/Update.java
index 9de4a020..179e8b1c 100644
--- a/src/main/java/com/google/events/firebase/remoteconfig/v1/RollbackSource.java
+++ b/src/main/java/com/google/events/firebase/remoteconfig/v1/Update.java
@@ -18,7 +18,7 @@
 
 import java.io.IOException;
 
-public class RollbackSource {
+public class Update {
     public Long integerValue;
     public String stringValue;
 }