diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fa0af7b..e0fe902 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,6 +6,6 @@ repos:
     types: [file]  # override `types: [json]`
     files: \.(json)$
   - id: pretty-format-json
-    args: ['--autofix', '--no-sort-keys']
+    args: ['--autofix', '--no-sort-keys', '--no-ensure-ascii']
     types: [file]  # override `types: [json]`
     files: \.(json)$
diff --git a/data/iracing/nascar-chevrolet-montecarlo-gen4-2003.json b/data/iracing/stockcars-gen4-chevymontecarlo03.json
similarity index 77%
rename from data/iracing/nascar-chevrolet-montecarlo-gen4-2003.json
rename to data/iracing/stockcars-gen4-chevymontecarlo03.json
index 2ffea11..8dd2b45 100644
--- a/data/iracing/nascar-chevrolet-montecarlo-gen4-2003.json
+++ b/data/iracing/stockcars-gen4-chevymontecarlo03.json
@@ -1,6 +1,6 @@
 {
-  "carName": "Gen 4 Chevrolet Monte Carlo - 2003",
-  "carId": "nascar-chevrolet-montecarlo-gen4-2003",
+  "carName": "NASCAR Gen 4 Chevrolet Monte Carlo (2003)",
+  "carId": "stockcars\\chevymontecarlo03",
   "carClass": "Gen4",
   "ledNumber": 1,
   "redlineBlinkInterval": 0,
diff --git a/data/iracing/nascar-ford-taurus-gen4-2003.json b/data/iracing/stockcars-gen4-fordtaurus03.json
similarity index 80%
rename from data/iracing/nascar-ford-taurus-gen4-2003.json
rename to data/iracing/stockcars-gen4-fordtaurus03.json
index 7e9fd51..aa06554 100644
--- a/data/iracing/nascar-ford-taurus-gen4-2003.json
+++ b/data/iracing/stockcars-gen4-fordtaurus03.json
@@ -1,6 +1,6 @@
 {
-  "carName": "Gen 4 Ford Taurus - 2003",
-  "carId": "nascar-ford-taurus-gen4-2003",
+  "carName": "NASCAR Gen 4 Ford Taurus (2003)",
+  "carId": "stockcars\\fordtaurus03",
   "carClass": "Gen4",
   "ledNumber": 1,
   "redlineBlinkInterval": 0,
diff --git a/data/iracing/nascar-ford-mustang-nextgen.json b/data/iracing/stockcars-nextgenchevrolet.json
similarity index 92%
rename from data/iracing/nascar-ford-mustang-nextgen.json
rename to data/iracing/stockcars-nextgenchevrolet.json
index f13f90d..3d37961 100644
--- a/data/iracing/nascar-ford-mustang-nextgen.json
+++ b/data/iracing/stockcars-nextgenchevrolet.json
@@ -1,6 +1,6 @@
 {
-  "carName": "NASCAR Ford Mustang Next Gen",
-  "carId": "nascar-ford-mustang-nextgen",
+  "carName": "NASCAR Cup Next Gen Chevrolet Camaro ZL1",
+  "carId": "stockcars\\chevroletcamaro2022",
   "carClass": "NXG",
   "ledNumber": 9,
   "redlineBlinkInterval": 0,
diff --git a/data/iracing/nascar-chevrolet-camaro-nextgen.json b/data/iracing/stockcars-nextgenford.json
similarity index 92%
rename from data/iracing/nascar-chevrolet-camaro-nextgen.json
rename to data/iracing/stockcars-nextgenford.json
index a3f1285..641bc88 100644
--- a/data/iracing/nascar-chevrolet-camaro-nextgen.json
+++ b/data/iracing/stockcars-nextgenford.json
@@ -1,6 +1,6 @@
 {
-  "carName": "NASCAR Chevrolet Camaro Next Gen",
-  "carId": "nascar-chevrolet-camaro-nextgen",
+  "carName": "NASCAR Cup Next Gen Ford Mustang Dark Horse",
+  "carId": "stockcars\\fordmustang2022",
   "carClass": "NXG",
   "ledNumber": 9,
   "redlineBlinkInterval": 0,
diff --git a/data/iracing/nascar-toyota-camry-nextgen.json b/data/iracing/stockcars-nextgentoyota.json
similarity index 93%
rename from data/iracing/nascar-toyota-camry-nextgen.json
rename to data/iracing/stockcars-nextgentoyota.json
index 51ccf33..4e83df5 100644
--- a/data/iracing/nascar-toyota-camry-nextgen.json
+++ b/data/iracing/stockcars-nextgentoyota.json
@@ -1,6 +1,6 @@
 {
-  "carName": "NASCAR Toyota Camry Next Gen",
-  "carId": "nascar-toyota-camry-nextgen",
+  "carName": "NASCAR Cup Next Gen Toyota Camry",
+  "carId": "stockcars\\toyotacamry2022",
   "carClass": "NXG",
   "ledNumber": 9,
   "redlineBlinkInterval": 0,
diff --git a/data/iracing/nascar-oreilly-chevrolet-camaro.json b/data/iracing/stockcars-oreillychevy.json
similarity index 89%
rename from data/iracing/nascar-oreilly-chevrolet-camaro.json
rename to data/iracing/stockcars-oreillychevy.json
index c0d4d37..5b9f521 100644
--- a/data/iracing/nascar-oreilly-chevrolet-camaro.json
+++ b/data/iracing/stockcars-oreillychevy.json
@@ -1,6 +1,6 @@
 {
   "carName": "NASCAR O'Reilly Chevrolet Camaro",
-  "carId": "nascar-oreilly-chevrolet-camaro",
+  "carId": "stockcars2\\camaro2019",
   "carClass": "ORE",
   "ledNumber": 1,
   "redlineBlinkInterval": 0,
diff --git a/data/iracing/nascar-oreilly-ford-mustang.json b/data/iracing/stockcars-oreillyford.json
similarity index 90%
rename from data/iracing/nascar-oreilly-ford-mustang.json
rename to data/iracing/stockcars-oreillyford.json
index 2a780cd..cb1890e 100644
--- a/data/iracing/nascar-oreilly-ford-mustang.json
+++ b/data/iracing/stockcars-oreillyford.json
@@ -1,6 +1,6 @@
 {
   "carName": "NASCAR O'Reilly Ford Mustang",
-  "carId": "nascar-oreilly-ford-mustang",
+  "carId": "stockcars2\\mustang2019",
   "carClass": "ORE",
   "ledNumber": 1,
   "redlineBlinkInterval": 0,
diff --git a/data/iracing/nascar-oreilly-toyota-supra.json b/data/iracing/stockcars-oreillytoyota.json
similarity index 90%
rename from data/iracing/nascar-oreilly-toyota-supra.json
rename to data/iracing/stockcars-oreillytoyota.json
index 5930b8a..202ed31 100644
--- a/data/iracing/nascar-oreilly-toyota-supra.json
+++ b/data/iracing/stockcars-oreillytoyota.json
@@ -1,6 +1,6 @@
 {
   "carName": "NASCAR O'Reilly Toyota Supra",
-  "carId": "nascar-oreilly-toyota-supra",
+  "carId": "stockcars2\\supra2019",
   "carClass": "ORE",
   "ledNumber": 1,
   "redlineBlinkInterval": 0,
diff --git a/data/manifest.json b/data/manifest.json
index f2bac58..2d6b615 100644
--- a/data/manifest.json
+++ b/data/manifest.json
@@ -1603,46 +1603,6 @@
         "carId": "mx5 mx52016",
         "path": "iracing/mx5-mx52016.json"
       },
-      {
-        "carName": "NASCAR Chevrolet Camaro Next Gen",
-        "carId": "nascar-chevrolet-camaro-nextgen",
-        "path": "iracing/nascar-chevrolet-camaro-nextgen.json"
-      },
-      {
-        "carName": "Gen 4 Chevrolet Monte Carlo - 2003",
-        "carId": "nascar-chevrolet-montecarlo-gen4-2003",
-        "path": "iracing/nascar-chevrolet-montecarlo-gen4-2003.json"
-      },
-      {
-        "carName": "NASCAR Ford Mustang Next Gen",
-        "carId": "nascar-ford-mustang-nextgen",
-        "path": "iracing/nascar-ford-mustang-nextgen.json"
-      },
-      {
-        "carName": "Gen 4 Ford Taurus - 2003",
-        "carId": "nascar-ford-taurus-gen4-2003",
-        "path": "iracing/nascar-ford-taurus-gen4-2003.json"
-      },
-      {
-        "carName": "NASCAR O'Reilly Chevrolet Camaro",
-        "carId": "nascar-oreilly-chevrolet-camaro",
-        "path": "iracing/nascar-oreilly-chevrolet-camaro.json"
-      },
-      {
-        "carName": "NASCAR O'Reilly Ford Mustang",
-        "carId": "nascar-oreilly-ford-mustang",
-        "path": "iracing/nascar-oreilly-ford-mustang.json"
-      },
-      {
-        "carName": "NASCAR O'Reilly Toyota Supra",
-        "carId": "nascar-oreilly-toyota-supra",
-        "path": "iracing/nascar-oreilly-toyota-supra.json"
-      },
-      {
-        "carName": "NASCAR Toyota Camry Next Gen",
-        "carId": "nascar-toyota-camry-nextgen",
-        "path": "iracing/nascar-toyota-camry-nextgen.json"
-      },
       {
         "carName": "Porsche 718 GT4",
         "carId": "porsche718gt4",
@@ -1703,6 +1663,46 @@
         "carId": "specracer",
         "path": "iracing/specracer.json"
       },
+      {
+        "carName": "NASCAR Gen 4 Chevrolet Monte Carlo (2003)",
+        "carId": "stockcars\\chevymontecarlo03",
+        "path": "iracing/stockcars-gen4-chevymontecarlo03.json"
+      },
+      {
+        "carName": "NASCAR Gen 4 Ford Taurus (2003)",
+        "carId": "stockcars\\fordtaurus03",
+        "path": "iracing/stockcars-gen4-fordtaurus03.json"
+      },
+      {
+        "carName": "NASCAR Cup Next Gen Chevrolet Camaro ZL1",
+        "carId": "stockcars\\chevroletcamaro2022",
+        "path": "iracing/stockcars-nextgenchevrolet.json"
+      },
+      {
+        "carName": "NASCAR Cup Next Gen Ford Mustang Dark Horse",
+        "carId": "stockcars\\fordmustang2022",
+        "path": "iracing/stockcars-nextgenford.json"
+      },
+      {
+        "carName": "NASCAR Cup Next Gen Toyota Camry",
+        "carId": "stockcars\\toyotacamry2022",
+        "path": "iracing/stockcars-nextgentoyota.json"
+      },
+      {
+        "carName": "NASCAR O'Reilly Chevrolet Camaro",
+        "carId": "stockcars2\\camaro2019",
+        "path": "iracing/stockcars-oreillychevy.json"
+      },
+      {
+        "carName": "NASCAR O'Reilly Ford Mustang",
+        "carId": "stockcars2\\mustang2019",
+        "path": "iracing/stockcars-oreillyford.json"
+      },
+      {
+        "carName": "NASCAR O'Reilly Toyota Supra",
+        "carId": "stockcars2\\supra2019",
+        "path": "iracing/stockcars-oreillytoyota.json"
+      },
       {
         "carName": "Chevrolet Camaro Gen3 Supercar",
         "carId": "supercars chevycamarogen3",