diff --git a/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json b/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json
index ec1251a2b85b..1be4650e3699 100644
--- a/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json
+++ b/specification/eventgrid/data-plane/Microsoft.EventHub/stable/2018-01-01/EventHub.json
@@ -7,7 +7,7 @@
     },
     "paths": {},
     "definitions": {
-        "CaptureFileCreatedEventData": {
+        "EventHubCaptureFileCreatedEventData": {
             "description": "Schema of the Data property of an EventGridEvent for an Microsoft.EventHub.CaptureFileCreated event.",
             "type": "object",
             "properties": {
diff --git a/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json b/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json
index a4b340b24057..02619144dfc7 100644
--- a/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json
+++ b/specification/eventgrid/data-plane/Microsoft.Storage/stable/2018-01-01/Storage.json
@@ -7,7 +7,7 @@
     },
     "paths": {},
     "definitions": {
-        "BlobCreatedEventData": {
+        "StorageBlobCreatedEventData": {
             "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Storage.BlobCreated event.",
             "type": "object",
             "properties": {
@@ -53,7 +53,7 @@
                 }
             }
         },
-        "BlobDeletedEventData": {
+        "StorageBlobDeletedEventData": {
             "description": "Schema of the Data property of an EventGridEvent for an Microsoft.Storage.BlobDeleted event.",
             "type": "object",
             "properties": {