diff --git a/selfdrive/car/sunnypilot_carname.json b/selfdrive/car/sunnypilot_carname.json
index 9c1c9593d7..4405412725 100644
--- a/selfdrive/car/sunnypilot_carname.json
+++ b/selfdrive/car/sunnypilot_carname.json
@@ -12,6 +12,7 @@
   "Buick LaCrosse 2017-19": "BUICK LACROSSE 2017",
   "Cadillac Escalade 2017": "CADILLAC ESCALADE 2017",
   "Cadillac Escalade ESV 2016": "CADILLAC ESCALADE ESV 2016",
+  "Cadillac Escalade ESV 2019": "CADILLAC ESCALADE ESV 2019",
   "Chevrolet Bolt EUV 2022-23": "CHEVROLET BOLT EUV 2022",
   "Chevrolet Bolt EV 2022-23": "CHEVROLET BOLT EUV 2022",
   "Chevrolet Silverado 1500 2020-21": "CHEVROLET SILVERADO 1500 2020",
@@ -68,13 +69,14 @@
   "Hyundai Azera 2022": "HYUNDAI AZERA 6TH GEN",
   "Hyundai Azera Hybrid 2020": "HYUNDAI AZERA HYBRID 6TH GEN",
   "Hyundai Custin 2023": "HYUNDAI CUSTIN 1ST GEN",
-  "Hyundai Elantra 2017-19": "HYUNDAI ELANTRA 2017",
+  "Hyundai Elantra 2017-18": "HYUNDAI ELANTRA 2017",
+  "Hyundai Elantra 2019": "HYUNDAI ELANTRA 2017",
   "Hyundai Elantra 2021-23": "HYUNDAI ELANTRA 2021",
-  "Hyundai Elantra GT 2017-19": "HYUNDAI ELANTRA 2017",
+  "Hyundai Elantra GT 2017-19": "HYUNDAI I30 N LINE 2019 & GT 2018 DCT",
   "Hyundai Elantra Hybrid 2021-23": "HYUNDAI ELANTRA HYBRID 2021",
   "Hyundai Elantra Non-SCC 2022": "HYUNDAI ELANTRA SE 2022 NON-SCC",
   "Hyundai Genesis 2015-16": "HYUNDAI GENESIS 2015-2016",
-  "Hyundai i30 2017-19": "HYUNDAI ELANTRA 2017",
+  "Hyundai i30 2017-19": "HYUNDAI I30 N LINE 2019 & GT 2018 DCT",
   "Hyundai Ioniq 5 (Southeast Asia only) 2022-23": "HYUNDAI IONIQ 5 2022",
   "Hyundai Ioniq 5 (with HDA II) 2022-23": "HYUNDAI IONIQ 5 2022",
   "Hyundai Ioniq 5 (without HDA II) 2022-23": "HYUNDAI IONIQ 5 2022",
@@ -137,7 +139,7 @@
   "Kia Sorento 2018": "KIA SORENTO GT LINE 2018",
   "Kia Sorento 2019": "KIA SORENTO GT LINE 2018",
   "Kia Sorento 2021-23": "KIA SORENTO 4TH GEN",
-  "Kia Sorento Hybrid 2023": "KIA SORENTO HYBRID 4TH GEN",
+  "Kia Sorento Hybrid 2021-23": "KIA SORENTO HYBRID 4TH GEN",
   "Kia Sorento Plug-in Hybrid 2022-23": "KIA SORENTO PLUG-IN HYBRID 4TH GEN",
   "Kia Sportage 2023": "KIA SPORTAGE 5TH GEN",
   "Kia Sportage Hybrid 2023": "KIA SPORTAGE HYBRID 5TH GEN",
@@ -200,21 +202,21 @@
   "Škoda Scala 2020-23": "SKODA SCALA 1ST GEN",
   "Škoda Superb 2015-22": "SKODA SUPERB 3RD GEN",
   "Toyota Alphard 2019-20": "TOYOTA ALPHARD 2020",
-  "Toyota Alphard Hybrid 2021": "TOYOTA ALPHARD HYBRID 2021",
+  "Toyota Alphard Hybrid 2021": "TOYOTA ALPHARD 2020",
   "Toyota Avalon 2016": "TOYOTA AVALON 2016",
   "Toyota Avalon 2017-18": "TOYOTA AVALON 2016",
   "Toyota Avalon 2019-21": "TOYOTA AVALON 2019",
   "Toyota Avalon 2022": "TOYOTA AVALON 2022",
-  "Toyota Avalon Hybrid 2019-21": "TOYOTA AVALON HYBRID 2019",
-  "Toyota Avalon Hybrid 2022": "TOYOTA AVALON HYBRID 2022",
+  "Toyota Avalon Hybrid 2019-21": "TOYOTA AVALON 2019",
+  "Toyota Avalon Hybrid 2022": "TOYOTA AVALON 2022",
   "Toyota C-HR 2017-20": "TOYOTA C-HR 2018",
   "Toyota C-HR 2021": "TOYOTA C-HR 2021",
   "Toyota C-HR Hybrid 2017-20": "TOYOTA C-HR 2018",
-  "Toyota C-HR Hybrid 2021-22": "TOYOTA C-HR HYBRID 2022",
+  "Toyota C-HR Hybrid 2021-22": "TOYOTA C-HR 2021",
   "Toyota Camry 2018-20": "TOYOTA CAMRY 2018",
   "Toyota Camry 2021-23": "TOYOTA CAMRY 2021",
-  "Toyota Camry Hybrid 2018-20": "TOYOTA CAMRY HYBRID 2018",
-  "Toyota Camry Hybrid 2021-24": "TOYOTA CAMRY HYBRID 2021",
+  "Toyota Camry Hybrid 2018-20": "TOYOTA CAMRY 2018",
+  "Toyota Camry Hybrid 2021-24": "TOYOTA CAMRY 2021",
   "Toyota Corolla 2017-19": "TOYOTA COROLLA 2017",
   "Toyota Corolla 2020-22": "TOYOTA COROLLA TSS2 2019",
   "Toyota Corolla Cross (Non-US only) 2020-23": "TOYOTA COROLLA TSS2 2019",
@@ -225,7 +227,7 @@
   "Toyota Highlander 2017-19": "TOYOTA HIGHLANDER 2017",
   "Toyota Highlander 2020-23": "TOYOTA HIGHLANDER 2020",
   "Toyota Highlander Hybrid 2017-19": "TOYOTA HIGHLANDER HYBRID 2018",
-  "Toyota Highlander Hybrid 2020-23": "TOYOTA HIGHLANDER HYBRID 2020",
+  "Toyota Highlander Hybrid 2020-23": "TOYOTA HIGHLANDER 2020",
   "Toyota Mirai 2021": "TOYOTA MIRAI 2021",
   "Toyota Prius 2016": "TOYOTA PRIUS 2017",
   "Toyota Prius 2017-20": "TOYOTA PRIUS 2017",
@@ -240,7 +242,7 @@
   "Toyota RAV4 Hybrid 2016": "TOYOTA RAV4 HYBRID 2017",
   "Toyota RAV4 Hybrid 2017-18": "TOYOTA RAV4 HYBRID 2017",
   "Toyota RAV4 Hybrid 2019-21": "TOYOTA RAV4 2019",
-  "Toyota RAV4 Hybrid 2022": "TOYOTA RAV4 HYBRID 2022",
+  "Toyota RAV4 Hybrid 2022": "TOYOTA RAV4 2022",
   "Toyota Sienna 2018-20": "TOYOTA SIENNA 2018",
   "Volkswagen Arteon 2018-23": "VOLKSWAGEN ARTEON 1ST GEN",
   "Volkswagen Arteon eHybrid 2020-23": "VOLKSWAGEN ARTEON 1ST GEN",