diff --git a/examples/artifact_packaged.json b/examples/artifact_packaged.json
index 779a77cb..bdd247b5 100644
--- a/examples/artifact_packaged.json
+++ b/examples/artifact_packaged.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.packaged.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/artifact_published.json b/examples/artifact_published.json
index 1d41c81d..eaf8cea6 100644
--- a/examples/artifact_published.json
+++ b/examples/artifact_published.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.published.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/artifact_signed.json b/examples/artifact_signed.json
index c35c8ed3..bc7b1fd7 100644
--- a/examples/artifact_signed.json
+++ b/examples/artifact_signed.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.artifact.signed.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/branch_created.json b/examples/branch_created.json
index 2413876a..176f55a1 100644
--- a/examples/branch_created.json
+++ b/examples/branch_created.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.branch.created.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/branch_deleted.json b/examples/branch_deleted.json
index 2044eed4..a1bf1366 100644
--- a/examples/branch_deleted.json
+++ b/examples/branch_deleted.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.branch.deleted.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/build_finished.json b/examples/build_finished.json
index a93788e7..8a9bcaf1 100644
--- a/examples/build_finished.json
+++ b/examples/build_finished.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.build.finished.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/build_queued.json b/examples/build_queued.json
index b05b5fe2..652eb183 100644
--- a/examples/build_queued.json
+++ b/examples/build_queued.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.build.queued.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/build_started.json b/examples/build_started.json
index 6a19b3c1..5319caff 100644
--- a/examples/build_started.json
+++ b/examples/build_started.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.build.started.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/change_abandoned.json b/examples/change_abandoned.json
index 162a3cce..0633ce1e 100644
--- a/examples/change_abandoned.json
+++ b/examples/change_abandoned.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.abandoned.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/change_created.json b/examples/change_created.json
index 7f2bbd27..b6f50ca2 100644
--- a/examples/change_created.json
+++ b/examples/change_created.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.created.0.4.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/change_merged.json b/examples/change_merged.json
index 0607754f..b1d8bf32 100644
--- a/examples/change_merged.json
+++ b/examples/change_merged.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.merged.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/change_reviewed.json b/examples/change_reviewed.json
index 857e73b7..3759177a 100644
--- a/examples/change_reviewed.json
+++ b/examples/change_reviewed.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.reviewed.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/change_updated.json b/examples/change_updated.json
index 978cc0e3..6d04c7de 100644
--- a/examples/change_updated.json
+++ b/examples/change_updated.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.change.updated.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/environment_created.json b/examples/environment_created.json
index 2e245c69..1c49cbc1 100644
--- a/examples/environment_created.json
+++ b/examples/environment_created.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.environment.created.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/environment_deleted.json b/examples/environment_deleted.json
index 7dce76e4..3ce2b800 100644
--- a/examples/environment_deleted.json
+++ b/examples/environment_deleted.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.environment.deleted.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/environment_modified.json b/examples/environment_modified.json
index 1042ac5b..e934ab08 100644
--- a/examples/environment_modified.json
+++ b/examples/environment_modified.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.environment.modified.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/incident_detected.json b/examples/incident_detected.json
index 985789a3..2229435b 100644
--- a/examples/incident_detected.json
+++ b/examples/incident_detected.json
@@ -2,7 +2,7 @@
   "context": {
       "version": "0.5.0-draft",
       "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
-      "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+      "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
       "source": "/monitoring/prod1",
       "type": "dev.cdevents.incident.detected.0.3.0-draft",
       "timestamp": "2022-11-11T13:52:20.079Z"
diff --git a/examples/incident_reported.json b/examples/incident_reported.json
index 05fa1a76..5151f3bf 100644
--- a/examples/incident_reported.json
+++ b/examples/incident_reported.json
@@ -2,7 +2,7 @@
   "context": {
       "version": "0.5.0-draft",
       "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
-      "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+      "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
       "source": "/monitoring/prod1",
       "type": "dev.cdevents.incident.reported.0.3.0-draft",
       "timestamp": "2022-11-11T13:52:20.079Z"
diff --git a/examples/incident_resolved.json b/examples/incident_resolved.json
index c3155543..ba311894 100644
--- a/examples/incident_resolved.json
+++ b/examples/incident_resolved.json
@@ -2,7 +2,7 @@
   "context": {
       "version": "0.5.0-draft",
       "id": "F4BD2B55-B6F6-4F44-AF72-BD2D0E7A8708",
-      "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+      "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
       "source": "/monitoring/prod1",
       "type": "dev.cdevents.incident.resolved.0.3.0-draft",
       "timestamp": "2022-11-11T13:52:20.079Z"
diff --git a/examples/pipelinerun_finished.json b/examples/pipelinerun_finished.json
index 8ad781f0..1971b7d7 100644
--- a/examples/pipelinerun_finished.json
+++ b/examples/pipelinerun_finished.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.pipelinerun.finished.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/pipelinerun_queued.json b/examples/pipelinerun_queued.json
index f3a34043..cf07fb44 100644
--- a/examples/pipelinerun_queued.json
+++ b/examples/pipelinerun_queued.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.pipelinerun.queued.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/pipelinerun_started.json b/examples/pipelinerun_started.json
index 5d8809a1..6e84bf93 100644
--- a/examples/pipelinerun_started.json
+++ b/examples/pipelinerun_started.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.pipelinerun.started.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/repository_created.json b/examples/repository_created.json
index 9880992c..9eae6df4 100644
--- a/examples/repository_created.json
+++ b/examples/repository_created.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.repository.created.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/repository_deleted.json b/examples/repository_deleted.json
index 4c30ff09..6e7897b9 100644
--- a/examples/repository_deleted.json
+++ b/examples/repository_deleted.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.repository.deleted.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/repository_modified.json b/examples/repository_modified.json
index 3a42c7e6..c914f3a8 100644
--- a/examples/repository_modified.json
+++ b/examples/repository_modified.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.repository.modified.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/service_deployed.json b/examples/service_deployed.json
index 3e3deca2..36ebfb99 100644
--- a/examples/service_deployed.json
+++ b/examples/service_deployed.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.deployed.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/service_published.json b/examples/service_published.json
index f132c8e2..fcb666bf 100644
--- a/examples/service_published.json
+++ b/examples/service_published.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.published.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/service_removed.json b/examples/service_removed.json
index bd0b529c..120e7465 100644
--- a/examples/service_removed.json
+++ b/examples/service_removed.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.removed.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/service_rolledback.json b/examples/service_rolledback.json
index 2efc1db0..9cb2e498 100644
--- a/examples/service_rolledback.json
+++ b/examples/service_rolledback.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.rolledback.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/service_upgraded.json b/examples/service_upgraded.json
index 86ce0085..e79417b9 100644
--- a/examples/service_upgraded.json
+++ b/examples/service_upgraded.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.service.upgraded.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/taskrun_finished.json b/examples/taskrun_finished.json
index 8dd409b0..3509f9e9 100644
--- a/examples/taskrun_finished.json
+++ b/examples/taskrun_finished.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.taskrun.finished.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/taskrun_started.json b/examples/taskrun_started.json
index 6cedeea4..74263dbd 100644
--- a/examples/taskrun_started.json
+++ b/examples/taskrun_started.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.taskrun.started.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/testcaserun_finished.json b/examples/testcaserun_finished.json
index 55e35504..1073d717 100644
--- a/examples/testcaserun_finished.json
+++ b/examples/testcaserun_finished.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.testcaserun.finished.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/testcaserun_queued.json b/examples/testcaserun_queued.json
index a105fc13..7631d5e5 100644
--- a/examples/testcaserun_queued.json
+++ b/examples/testcaserun_queued.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.testcaserun.queued.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/testcaserun_started.json b/examples/testcaserun_started.json
index 33518f6c..b57d2c6e 100644
--- a/examples/testcaserun_started.json
+++ b/examples/testcaserun_started.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.testcaserun.started.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/testoutput_published.json b/examples/testoutput_published.json
index 46c48404..c6e68da9 100644
--- a/examples/testoutput_published.json
+++ b/examples/testoutput_published.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.testoutput.published.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/testsuiterun_finished.json b/examples/testsuiterun_finished.json
index a7a8325f..ab26ff14 100644
--- a/examples/testsuiterun_finished.json
+++ b/examples/testsuiterun_finished.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.testsuiterun.finished.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/testsuiterun_queued.json b/examples/testsuiterun_queued.json
index 82ffa61d..68d38fa6 100644
--- a/examples/testsuiterun_queued.json
+++ b/examples/testsuiterun_queued.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.testsuiterun.queued.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/examples/testsuiterun_started.json b/examples/testsuiterun_started.json
index a0d0d766..52d86661 100644
--- a/examples/testsuiterun_started.json
+++ b/examples/testsuiterun_started.json
@@ -2,7 +2,7 @@
   "context": {
     "version": "0.5.0-draft",
     "id": "271069a8-fc18-44f1-b38f-9d70a1695819",
-    "chain_id": "4c8cb7dd-3448-41de-8768-eec704e2829b",
+    "chainId": "4c8cb7dd-3448-41de-8768-eec704e2829b",
     "source": "/event/source/123",
     "type": "dev.cdevents.testsuiterun.started.0.3.0-draft",
     "timestamp": "2023-03-20T14:27:05.315384Z",
diff --git a/schemas/artifactdeleted.json b/schemas/artifactdeleted.json
index 4c3f12d6..83a1cb5e 100644
--- a/schemas/artifactdeleted.json
+++ b/schemas/artifactdeleted.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/artifactdownloaded.json b/schemas/artifactdownloaded.json
index 789a156f..838b962c 100644
--- a/schemas/artifactdownloaded.json
+++ b/schemas/artifactdownloaded.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/artifactpackaged.json b/schemas/artifactpackaged.json
index 9fbfe7dc..e505c1e0 100644
--- a/schemas/artifactpackaged.json
+++ b/schemas/artifactpackaged.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/artifactpublished.json b/schemas/artifactpublished.json
index 042636e5..335db21c 100644
--- a/schemas/artifactpublished.json
+++ b/schemas/artifactpublished.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/artifactsigned.json b/schemas/artifactsigned.json
index 1b9eb45f..0265c83d 100644
--- a/schemas/artifactsigned.json
+++ b/schemas/artifactsigned.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/branchcreated.json b/schemas/branchcreated.json
index 227312f5..05c0ebbb 100644
--- a/schemas/branchcreated.json
+++ b/schemas/branchcreated.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/branchdeleted.json b/schemas/branchdeleted.json
index fa5a3f9f..f641560c 100644
--- a/schemas/branchdeleted.json
+++ b/schemas/branchdeleted.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/buildfinished.json b/schemas/buildfinished.json
index ae5b5dd8..282eb036 100644
--- a/schemas/buildfinished.json
+++ b/schemas/buildfinished.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/buildqueued.json b/schemas/buildqueued.json
index c477b5eb..2d76af13 100644
--- a/schemas/buildqueued.json
+++ b/schemas/buildqueued.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/buildstarted.json b/schemas/buildstarted.json
index 56cf5694..2712692b 100644
--- a/schemas/buildstarted.json
+++ b/schemas/buildstarted.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/changeabandoned.json b/schemas/changeabandoned.json
index 5a99de0e..956957fe 100644
--- a/schemas/changeabandoned.json
+++ b/schemas/changeabandoned.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/changecreated.json b/schemas/changecreated.json
index e6b7fc40..16d5ff27 100644
--- a/schemas/changecreated.json
+++ b/schemas/changecreated.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/changemerged.json b/schemas/changemerged.json
index 4cf9bef1..e19358a1 100644
--- a/schemas/changemerged.json
+++ b/schemas/changemerged.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/changereviewed.json b/schemas/changereviewed.json
index 47a4ab2c..eb73d597 100644
--- a/schemas/changereviewed.json
+++ b/schemas/changereviewed.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/changeupdated.json b/schemas/changeupdated.json
index 6459f3bd..d8e78d87 100644
--- a/schemas/changeupdated.json
+++ b/schemas/changeupdated.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/environmentcreated.json b/schemas/environmentcreated.json
index 3ff28d9d..cba0e1ad 100644
--- a/schemas/environmentcreated.json
+++ b/schemas/environmentcreated.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/environmentdeleted.json b/schemas/environmentdeleted.json
index d93b2293..d8cad53f 100644
--- a/schemas/environmentdeleted.json
+++ b/schemas/environmentdeleted.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/environmentmodified.json b/schemas/environmentmodified.json
index 07fef1e5..f5b2b448 100644
--- a/schemas/environmentmodified.json
+++ b/schemas/environmentmodified.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/incidentdetected.json b/schemas/incidentdetected.json
index 6f6a41a3..f7d79ff3 100644
--- a/schemas/incidentdetected.json
+++ b/schemas/incidentdetected.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/incidentreported.json b/schemas/incidentreported.json
index 481684a6..3bc23056 100644
--- a/schemas/incidentreported.json
+++ b/schemas/incidentreported.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/incidentresolved.json b/schemas/incidentresolved.json
index 4231a820..e6bc0926 100644
--- a/schemas/incidentresolved.json
+++ b/schemas/incidentresolved.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/links/embeddedlinkend.json b/schemas/links/embeddedlinkend.json
index 2a876449..28bc5c43 100644
--- a/schemas/links/embeddedlinkend.json
+++ b/schemas/links/embeddedlinkend.json
@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://cdevents.dev/0.5.0-draft/schema/links/embeddedlinkend",
   "properties": {
-    "link_type": {
+    "linkType": {
       "type": "string",
       "enum": [
         "END"
@@ -12,13 +12,13 @@
       "description": "When consuming a CDEvent, you are consuming a parent event. So, when looking at the 'from' key, this is the parent's parent.",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "tags": {
@@ -29,7 +29,7 @@
   "additionalProperties": false,
   "type": "object",
   "required": [
-    "link_type"
+    "linkType"
   ]
 }
 
diff --git a/schemas/links/embeddedlinkpath.json b/schemas/links/embeddedlinkpath.json
index 5f16603d..adde4c09 100644
--- a/schemas/links/embeddedlinkpath.json
+++ b/schemas/links/embeddedlinkpath.json
@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://cdevents.dev/0.5.0-draft/schema/links/embeddedlinkpath",
   "properties": {
-    "link_type": {
+    "linkType": {
       "type": "string",
       "enum": [
         "PATH"
@@ -12,13 +12,13 @@
       "description": "When consuming a CDEvent, you are consuming a parent event. So, when looking at the 'from' key, this is the parent's parent.",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "tags": {
@@ -29,7 +29,7 @@
   "additionalProperties": false,
   "type": "object",
   "required": [
-    "link_type",
+    "linkType",
     "from"
   ]
 }
diff --git a/schemas/links/embeddedlinkrelation.json b/schemas/links/embeddedlinkrelation.json
index 331d4493..7aee327d 100644
--- a/schemas/links/embeddedlinkrelation.json
+++ b/schemas/links/embeddedlinkrelation.json
@@ -2,13 +2,13 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://cdevents.dev/0.5.0-draft/schema/links/embeddedlinkrelation",
   "properties": {
-    "link_type": {
+    "linkType": {
       "type": "string",
       "enum": [
         "RELATION"
       ]
     },
-    "link_kind": {
+    "linkKind": {
       "type": "string",
       "minLength": 1
     },
@@ -16,7 +16,7 @@
       "description": "",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
@@ -30,8 +30,8 @@
   "additionalProperties": false,
   "type": "object",
   "required": [
-    "link_type",
-    "link_kind",
+    "linkType",
+    "linkKind",
     "target"
   ]
 }
diff --git a/schemas/links/linkend.json b/schemas/links/linkend.json
index 5fa6c8f3..6500dab3 100644
--- a/schemas/links/linkend.json
+++ b/schemas/links/linkend.json
@@ -2,12 +2,12 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://cdevents.dev/0.5.0-draft/schema/links/linkend",
   "properties": {
-    "chain_id": {
+    "chainId": {
       "description": "This represents the full lifecycles of a series of events in CDEvents",
       "type": "string",
       "minLength": 1
     },
-    "link_type": {
+    "linkType": {
       "description": "The type associated with the link. In this case, 'END', suggesting the end of some CI/CD lifecycle",
       "type": "string",
       "enum": [
@@ -22,26 +22,26 @@
       "description": "This is the context ID of the producing CDEvent.",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "end": {
       "description": "This is the context ID of the final CDEvent in the chain",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "tags": {
@@ -52,8 +52,8 @@
   "additionalProperties": false,
   "type": "object",
   "required": [
-    "chain_id",
-    "link_type",
+    "chainId",
+    "linkType",
     "timestamp",
     "from",
     "end"
diff --git a/schemas/links/linkpath.json b/schemas/links/linkpath.json
index e4b9263f..98d50510 100644
--- a/schemas/links/linkpath.json
+++ b/schemas/links/linkpath.json
@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://cdevents.dev/0.5.0-draft/schema/links/linkpath",
   "properties": {
-    "chain_id": {
+    "chainId": {
       "type": "string",
       "minLength": 1
     },
@@ -10,7 +10,7 @@
       "type": "string",
       "format": "date-time"
     },
-    "link_type": {
+    "linkType": {
       "type": "string",
       "enum": [
         "PATH"
@@ -19,25 +19,25 @@
     "from": {
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "to": {
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "tags": {
@@ -48,8 +48,8 @@
   "additionalProperties": false,
   "type": "object",
   "required": [
-    "chain_id",
-    "link_type",
+    "chainId",
+    "linkType",
     "timestamp",
     "from",
     "to"
diff --git a/schemas/links/linkrelation.json b/schemas/links/linkrelation.json
index 8eec372c..d84deb7c 100644
--- a/schemas/links/linkrelation.json
+++ b/schemas/links/linkrelation.json
@@ -2,18 +2,18 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://cdevents.dev/0.5.0-draft/schema/links/linkrelation",
   "properties": {
-    "chain_id": {
+    "chainId": {
       "description": "This represents the full lifecycles of a series of events in CDEvents",
       "type": "string",
       "minLength": 1
     },
-    "link_type": {
+    "linkType": {
       "type": "string",
       "enum": [
         "RELATION"
       ]
     },
-    "link_kind": {
+    "linkKind": {
       "type": "string",
       "minLength": 1
     },
@@ -25,26 +25,26 @@
       "description": "",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "target": {
       "description": "",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "tags": {
@@ -55,8 +55,8 @@
   "additionalProperties": false,
   "type": "object",
   "required": [
-    "chain_id",
-    "link_type",
+    "chainId",
+    "linkType",
     "timestamp",
     "source",
     "target"
diff --git a/schemas/links/linkstart.json b/schemas/links/linkstart.json
index c00a81b2..d9e7014b 100644
--- a/schemas/links/linkstart.json
+++ b/schemas/links/linkstart.json
@@ -2,12 +2,12 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://cdevents.dev/0.5.0-draft/schema/links/linkstart",
   "properties": {
-    "chain_id": {
+    "chainId": {
       "description": "This represents the full lifecycles of a series of events in CDEvents",
       "type": "string",
       "minLength": 1
     },
-    "link_type": {
+    "linkType": {
       "description": "The type associated with the link. In this case, 'START', suggesting the start of some CI/CD lifecycle",
       "type": "string",
       "enum": [
@@ -22,13 +22,13 @@
       "description": "This is the context ID of the starting CDEvent in the chain.",
       "type": "object",
       "properties": {
-        "context_id": {
+        "contextId": {
           "type": "string",
           "minLength": 1
         }
       },
       "required": [
-        "context_id"
+        "contextId"
       ]
     },
     "tags": {
@@ -39,8 +39,8 @@
   "additionalProperties": false,
   "type": "object",
   "required": [
-    "chain_id",
-    "link_type",
+    "chainId",
+    "linkType",
     "timestamp",
     "start"
   ]
diff --git a/schemas/pipelinerunfinished.json b/schemas/pipelinerunfinished.json
index 9f13ac0e..33d30853 100644
--- a/schemas/pipelinerunfinished.json
+++ b/schemas/pipelinerunfinished.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/pipelinerunqueued.json b/schemas/pipelinerunqueued.json
index c2cf0e69..444a14a9 100644
--- a/schemas/pipelinerunqueued.json
+++ b/schemas/pipelinerunqueued.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/pipelinerunstarted.json b/schemas/pipelinerunstarted.json
index 51cf357a..efd3b765 100644
--- a/schemas/pipelinerunstarted.json
+++ b/schemas/pipelinerunstarted.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/repositorycreated.json b/schemas/repositorycreated.json
index eb8e7bd5..a601191e 100644
--- a/schemas/repositorycreated.json
+++ b/schemas/repositorycreated.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/repositorydeleted.json b/schemas/repositorydeleted.json
index 62bf62d6..02329fed 100644
--- a/schemas/repositorydeleted.json
+++ b/schemas/repositorydeleted.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/repositorymodified.json b/schemas/repositorymodified.json
index b495d07a..c3c51fd6 100644
--- a/schemas/repositorymodified.json
+++ b/schemas/repositorymodified.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/servicedeployed.json b/schemas/servicedeployed.json
index 7f89145c..a087d027 100644
--- a/schemas/servicedeployed.json
+++ b/schemas/servicedeployed.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/servicepublished.json b/schemas/servicepublished.json
index 0c258d59..eadcf107 100644
--- a/schemas/servicepublished.json
+++ b/schemas/servicepublished.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/serviceremoved.json b/schemas/serviceremoved.json
index e99d180a..4bee163e 100644
--- a/schemas/serviceremoved.json
+++ b/schemas/serviceremoved.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/servicerolledback.json b/schemas/servicerolledback.json
index d2701566..876c7271 100644
--- a/schemas/servicerolledback.json
+++ b/schemas/servicerolledback.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/serviceupgraded.json b/schemas/serviceupgraded.json
index f968c6c4..16d53a77 100644
--- a/schemas/serviceupgraded.json
+++ b/schemas/serviceupgraded.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/taskrunfinished.json b/schemas/taskrunfinished.json
index 5ec9068f..78f241c5 100644
--- a/schemas/taskrunfinished.json
+++ b/schemas/taskrunfinished.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/taskrunstarted.json b/schemas/taskrunstarted.json
index 5be3b281..80c71e70 100644
--- a/schemas/taskrunstarted.json
+++ b/schemas/taskrunstarted.json
@@ -33,7 +33,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/testcaserunfinished.json b/schemas/testcaserunfinished.json
index 003b80ad..062a29ee 100644
--- a/schemas/testcaserunfinished.json
+++ b/schemas/testcaserunfinished.json
@@ -32,7 +32,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/testcaserunqueued.json b/schemas/testcaserunqueued.json
index d1283858..6c240da5 100644
--- a/schemas/testcaserunqueued.json
+++ b/schemas/testcaserunqueued.json
@@ -32,7 +32,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/testcaserunstarted.json b/schemas/testcaserunstarted.json
index a51294a5..5925eed7 100644
--- a/schemas/testcaserunstarted.json
+++ b/schemas/testcaserunstarted.json
@@ -32,7 +32,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/testoutputpublished.json b/schemas/testoutputpublished.json
index e164860d..e5ee7024 100644
--- a/schemas/testoutputpublished.json
+++ b/schemas/testoutputpublished.json
@@ -32,7 +32,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/testsuiterunfinished.json b/schemas/testsuiterunfinished.json
index 26004c21..68b3fd49 100644
--- a/schemas/testsuiterunfinished.json
+++ b/schemas/testsuiterunfinished.json
@@ -32,7 +32,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/testsuiterunqueued.json b/schemas/testsuiterunqueued.json
index dee69ac1..9e4fa555 100644
--- a/schemas/testsuiterunqueued.json
+++ b/schemas/testsuiterunqueued.json
@@ -32,7 +32,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },
diff --git a/schemas/testsuiterunstarted.json b/schemas/testsuiterunstarted.json
index aa755cfa..cb3c076d 100644
--- a/schemas/testsuiterunstarted.json
+++ b/schemas/testsuiterunstarted.json
@@ -32,7 +32,7 @@
           "minLength": 1,
           "format": "uri"
         },
-        "chain_id": {
+        "chainId": {
           "type": "string",
           "minLength": 1
         },