diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java
index e3f20c3870f80..fee760e66c64d 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java
+++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailDeliveryReportReceivedEventData.java
@@ -185,7 +185,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("messageId", this.messageId);
         jsonWriter.writeStringField("status", this.status == null ? null : this.status.toString());
         jsonWriter.writeJsonField("deliveryStatusDetails", this.deliveryStatusDetails);
-        jsonWriter.writeStringField("deliveryAttemptTimeStamp", this.deliveryAttemptTimestamp == null ? null
+        jsonWriter.writeStringField("deliveryAttemptTimestamp", this.deliveryAttemptTimestamp == null ? null
             : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.deliveryAttemptTimestamp));
         return jsonWriter.writeEndObject();
     }
@@ -218,7 +218,7 @@ public static AcsEmailDeliveryReportReceivedEventData fromJson(JsonReader jsonRe
                 } else if ("deliveryStatusDetails".equals(fieldName)) {
                     deserializedAcsEmailDeliveryReportReceivedEventData.deliveryStatusDetails
                         = AcsEmailDeliveryReportStatusDetails.fromJson(reader);
-                } else if ("deliveryAttemptTimeStamp".equals(fieldName)) {
+                } else if ("deliveryAttemptTimestamp".equals(fieldName)) {
                     deserializedAcsEmailDeliveryReportReceivedEventData.deliveryAttemptTimestamp
                         = reader.getNullable(nonNullReader -> OffsetDateTime.parse(nonNullReader.getString()));
                 } else {
diff --git a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailEngagementTrackingReportReceivedEventData.java b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailEngagementTrackingReportReceivedEventData.java
index 0fd3c5776064b..87b66acaca33e 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailEngagementTrackingReportReceivedEventData.java
+++ b/sdk/eventgrid/azure-messaging-eventgrid/src/main/java/com/azure/messaging/eventgrid/systemevents/AcsEmailEngagementTrackingReportReceivedEventData.java
@@ -208,7 +208,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStringField("sender", this.sender);
         jsonWriter.writeStringField("recipient", this.recipient);
         jsonWriter.writeStringField("messageId", this.messageId);
-        jsonWriter.writeStringField("userActionTimeStamp", this.userActionTimestamp == null ? null
+        jsonWriter.writeStringField("userActionTimestamp", this.userActionTimestamp == null ? null
             : DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(this.userActionTimestamp));
         jsonWriter.writeStringField("engagementContext", this.engagementContext);
         jsonWriter.writeStringField("userAgent", this.userAgent);
@@ -238,7 +238,7 @@ public static AcsEmailEngagementTrackingReportReceivedEventData fromJson(JsonRea
                     deserializedAcsEmailEngagementTrackingReportReceivedEventData.recipient = reader.getString();
                 } else if ("messageId".equals(fieldName)) {
                     deserializedAcsEmailEngagementTrackingReportReceivedEventData.messageId = reader.getString();
-                } else if ("userActionTimeStamp".equals(fieldName)) {
+                } else if ("userActionTimestamp".equals(fieldName)) {
                     deserializedAcsEmailEngagementTrackingReportReceivedEventData.userActionTimestamp
                         = reader.getNullable(nonNullReader -> OffsetDateTime.parse(nonNullReader.getString()));
                 } else if ("engagementContext".equals(fieldName)) {
diff --git a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md
index 65c366a8964b3..d72bf4ff5d2dc 100644
--- a/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md
+++ b/sdk/eventgrid/azure-messaging-eventgrid/swagger/README.md
@@ -81,33 +81,33 @@ custom-types: CloudEvent,EventGridEvent,AcsRouterCommunicationError,AcsMessageCh
 model-override-setter-from-superclass: true
 
 input-file:
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json
-- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/5bc43b02efc097affda7d0bf23285f24433d6364/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Resources/stable/2018-01-01/Resources.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/EventGrid.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.EventGrid/stable/2018-01-01/SystemEvents.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Devices/stable/2018-01-01/IotHub.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ContainerRegistry/stable/2018-01-01/ContainerRegistry.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ServiceBus/stable/2018-01-01/ServiceBus.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Media/stable/2018-01-01/MediaServices.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Maps/stable/2018-01-01/Maps.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.AppConfiguration/stable/2018-01-01/AppConfiguration.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.SignalRService/stable/2018-01-01/SignalRService.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.KeyVault/stable/2018-01-01/KeyVault.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.MachineLearningServices/stable/2018-01-01/MachineLearningServices.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Cache/stable/2018-01-01/RedisCache.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Web/stable/2018-01-01/Web.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.Communication/stable/2018-01-01/AzureCommunicationServices.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.PolicyInsights/stable/2018-01-01/PolicyInsights.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ContainerService/stable/2018-01-01/ContainerService.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ApiManagement/stable/2018-01-01/APIManagement.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.HealthcareApis/stable/2018-01-01/HealthcareApis.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.DataBox/stable/2018-01-01/DataBox.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/common.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/HealthResources.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ResourceNotifications/stable/2018-01-01/Resources.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.AVS/stable/2018-01-01/PrivateCloud.json
+- https://raw.githubusercontent.com/Azure/azure-rest-api-specs/1b0e82df2f7f953796af2aee0372e34e00baa2d2/specification/eventgrid/data-plane/Microsoft.ApiCenter/stable/2018-01-01/ApiCenter.json
 ```
 
 ### KeyVault updates