diff --git a/schemas/pipelinerunfinished.json b/schemas/pipelinerunfinished.json
index b646d49..e953a73 100644
--- a/schemas/pipelinerunfinished.json
+++ b/schemas/pipelinerunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/pipeline-run-finished-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/pipelinerun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/pipelinerunqueued.json b/schemas/pipelinerunqueued.json
index 591a7e8..52fc9f3 100644
--- a/schemas/pipelinerunqueued.json
+++ b/schemas/pipelinerunqueued.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/pipeline-run-queued-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/pipelinerun-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/pipelinerunstarted.json b/schemas/pipelinerunstarted.json
index 4e4d49a..bcdaf52 100644
--- a/schemas/pipelinerunstarted.json
+++ b/schemas/pipelinerunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/pipeline-run-started-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/pipelinerun-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/taskrunfinished.json b/schemas/taskrunfinished.json
index a417f4f..eb49095 100644
--- a/schemas/taskrunfinished.json
+++ b/schemas/taskrunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/task-run-finished-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/taskrun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/taskrunstarted.json b/schemas/taskrunstarted.json
index 6297f51..08290dd 100644
--- a/schemas/taskrunstarted.json
+++ b/schemas/taskrunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/task-run-started-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/taskrun-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunfinished.json b/schemas/testcaserunfinished.json
index 834ada6..f3b3d94 100644
--- a/schemas/testcaserunfinished.json
+++ b/schemas/testcaserunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/test-case-run-finished-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/testcaserun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunqueued.json b/schemas/testcaserunqueued.json
index c54b8be..4255cb5 100644
--- a/schemas/testcaserunqueued.json
+++ b/schemas/testcaserunqueued.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/test-case-run-queued-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/testcaserun-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunskipped.json b/schemas/testcaserunskipped.json
index 61cc8cf..39cfdbd 100644
--- a/schemas/testcaserunskipped.json
+++ b/schemas/testcaserunskipped.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/test-case-run-skipped-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/testcaserun-skipped-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testcaserunstarted.json b/schemas/testcaserunstarted.json
index 9245877..2650784 100644
--- a/schemas/testcaserunstarted.json
+++ b/schemas/testcaserunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/test-case-run-started-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/testcaserun-started-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunfinished.json b/schemas/testsuiterunfinished.json
index 386bcfd..d47bad7 100644
--- a/schemas/testsuiterunfinished.json
+++ b/schemas/testsuiterunfinished.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/test-suite-run-finished-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/testsuiterun-finished-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunqueued.json b/schemas/testsuiterunqueued.json
index 2e7d8dd..c4f3ee1 100644
--- a/schemas/testsuiterunqueued.json
+++ b/schemas/testsuiterunqueued.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/test-suite-run-queued-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/testsuiterun-queued-event",
   "properties": {
     "context": {
       "properties": {
diff --git a/schemas/testsuiterunstarted.json b/schemas/testsuiterunstarted.json
index da895f9..c2e8400 100644
--- a/schemas/testsuiterunstarted.json
+++ b/schemas/testsuiterunstarted.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json-schema.org/draft/2020-12/schema",
-  "$id": "https://cdevents.dev/0.5.0-draft/schema/test-suite-run-started-event",
+  "$id": "https://cdevents.dev/0.5.0-draft/schema/testsuiterun-started-event",
   "properties": {
     "context": {
       "properties": {