diff --git a/schemas/iso/c/2024/int16_t.json b/schemas/iso/c/2024/int16.json
similarity index 100%
rename from schemas/iso/c/2024/int16_t.json
rename to schemas/iso/c/2024/int16.json
diff --git a/schemas/iso/c/2024/int32_t.json b/schemas/iso/c/2024/int32.json
similarity index 100%
rename from schemas/iso/c/2024/int32_t.json
rename to schemas/iso/c/2024/int32.json
diff --git a/schemas/iso/c/2024/int64_t.json b/schemas/iso/c/2024/int64.json
similarity index 100%
rename from schemas/iso/c/2024/int64_t.json
rename to schemas/iso/c/2024/int64.json
diff --git a/schemas/iso/c/2024/int8_t.json b/schemas/iso/c/2024/int8.json
similarity index 100%
rename from schemas/iso/c/2024/int8_t.json
rename to schemas/iso/c/2024/int8.json
diff --git a/schemas/iso/c/2024/uint16_t.json b/schemas/iso/c/2024/uint16.json
similarity index 100%
rename from schemas/iso/c/2024/uint16_t.json
rename to schemas/iso/c/2024/uint16.json
diff --git a/schemas/iso/c/2024/uint32_t.json b/schemas/iso/c/2024/uint32.json
similarity index 100%
rename from schemas/iso/c/2024/uint32_t.json
rename to schemas/iso/c/2024/uint32.json
diff --git a/schemas/iso/c/2024/uint8_t.json b/schemas/iso/c/2024/uint8.json
similarity index 100%
rename from schemas/iso/c/2024/uint8_t.json
rename to schemas/iso/c/2024/uint8.json
diff --git a/test/iso/c/2024/int16_t.test.json b/test/iso/c/2024/int16.test.json
similarity index 96%
rename from test/iso/c/2024/int16_t.test.json
rename to test/iso/c/2024/int16.test.json
index e8670b5..38b9e78 100644
--- a/test/iso/c/2024/int16_t.test.json
+++ b/test/iso/c/2024/int16.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/c/2024/int16_t.json",
+  "target": "../../../../schemas/iso/c/2024/int16.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/int32_t.test.json b/test/iso/c/2024/int32.test.json
similarity index 96%
rename from test/iso/c/2024/int32_t.test.json
rename to test/iso/c/2024/int32.test.json
index ff9d723..d5453ce 100644
--- a/test/iso/c/2024/int32_t.test.json
+++ b/test/iso/c/2024/int32.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/c/2024/int32_t.json",
+  "target": "../../../../schemas/iso/c/2024/int32.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/int64_t.test.json b/test/iso/c/2024/int64.test.json
similarity index 95%
rename from test/iso/c/2024/int64_t.test.json
rename to test/iso/c/2024/int64.test.json
index cbcf17f..d71487e 100644
--- a/test/iso/c/2024/int64_t.test.json
+++ b/test/iso/c/2024/int64.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/c/2024/int64_t.json",
+  "target": "../../../../schemas/iso/c/2024/int64.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/int8_t.test.json b/test/iso/c/2024/int8.test.json
similarity index 96%
rename from test/iso/c/2024/int8_t.test.json
rename to test/iso/c/2024/int8.test.json
index 14d3d57..350e339 100644
--- a/test/iso/c/2024/int8_t.test.json
+++ b/test/iso/c/2024/int8.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/c/2024/int8_t.json",
+  "target": "../../../../schemas/iso/c/2024/int8.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/uint16_t.test.json b/test/iso/c/2024/uint16.test.json
similarity index 96%
rename from test/iso/c/2024/uint16_t.test.json
rename to test/iso/c/2024/uint16.test.json
index c1a9c70..98de3a8 100644
--- a/test/iso/c/2024/uint16_t.test.json
+++ b/test/iso/c/2024/uint16.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/c/2024/uint16_t.json",
+  "target": "../../../../schemas/iso/c/2024/uint16.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/uint32_t.test.json b/test/iso/c/2024/uint32.test.json
similarity index 96%
rename from test/iso/c/2024/uint32_t.test.json
rename to test/iso/c/2024/uint32.test.json
index 96d5248..1c3e8a7 100644
--- a/test/iso/c/2024/uint32_t.test.json
+++ b/test/iso/c/2024/uint32.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/c/2024/uint32_t.json",
+  "target": "../../../../schemas/iso/c/2024/uint32.json",
   "tests": [
     {
       "description": "Valid - zero",
diff --git a/test/iso/c/2024/uint8_t.test.json b/test/iso/c/2024/uint8.test.json
similarity index 96%
rename from test/iso/c/2024/uint8_t.test.json
rename to test/iso/c/2024/uint8.test.json
index c9001f0..08f7d8e 100644
--- a/test/iso/c/2024/uint8_t.test.json
+++ b/test/iso/c/2024/uint8.test.json
@@ -1,6 +1,6 @@
 {
   "x-license": "https://github.com/sourcemeta/std/blob/main/LICENSE",
-  "target": "../../../../schemas/iso/c/2024/uint8_t.json",
+  "target": "../../../../schemas/iso/c/2024/uint8.json",
   "tests": [
     {
       "description": "Valid - zero",