diff --git a/generator/toyota/lexus_rx_hybrid_2017_pt.dbc b/generator/toyota/lexus_rx_hybrid_2017_pt.dbc
index 46cac115b1bc70..601066dbfa9f8b 100644
--- a/generator/toyota/lexus_rx_hybrid_2017_pt.dbc
+++ b/generator/toyota/lexus_rx_hybrid_2017_pt.dbc
@@ -15,7 +15,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -25,6 +25,6 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
diff --git a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc
index e6a6ad11453b7c..130e619d481381 100644
--- a/generator/toyota/toyota_camry_hybrid_2018_pt.dbc
+++ b/generator/toyota/toyota_camry_hybrid_2018_pt.dbc
@@ -21,7 +21,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 8 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
@@ -29,5 +29,5 @@ CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
 VAL_ 295 GEAR 0 "P" 1 "R" 2 "N" 3 "D" 4 "B";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/generator/toyota/toyota_chr_2018_pt.dbc b/generator/toyota/toyota_chr_2018_pt.dbc
index 0165631f923eaa..8ee5e0e2f5f621 100644
--- a/generator/toyota/toyota_chr_2018_pt.dbc
+++ b/generator/toyota/toyota_chr_2018_pt.dbc
@@ -16,7 +16,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -26,5 +26,5 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 548 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 548 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/generator/toyota/toyota_corolla_2017_pt.dbc b/generator/toyota/toyota_corolla_2017_pt.dbc
index 2d23000477e1f1..15fbc3494f7157 100644
--- a/generator/toyota/toyota_corolla_2017_pt.dbc
+++ b/generator/toyota/toyota_corolla_2017_pt.dbc
@@ -15,7 +15,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -25,5 +25,5 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 548 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 548 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/generator/toyota/toyota_prius_2017_pt.dbc b/generator/toyota/toyota_prius_2017_pt.dbc
index e6a6ad11453b7c..130e619d481381 100644
--- a/generator/toyota/toyota_prius_2017_pt.dbc
+++ b/generator/toyota/toyota_prius_2017_pt.dbc
@@ -21,7 +21,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 8 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
@@ -29,5 +29,5 @@ CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
 VAL_ 295 GEAR 0 "P" 1 "R" 2 "N" 3 "D" 4 "B";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/generator/toyota/toyota_rav4_2017_pt.dbc b/generator/toyota/toyota_rav4_2017_pt.dbc
index ca4f9080ddd683..a598ccb52d5a5c 100644
--- a/generator/toyota/toyota_rav4_2017_pt.dbc
+++ b/generator/toyota/toyota_rav4_2017_pt.dbc
@@ -15,7 +15,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -25,5 +25,5 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 548 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 548 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc
index 46cac115b1bc70..601066dbfa9f8b 100644
--- a/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc
+++ b/generator/toyota/toyota_rav4_hybrid_2017_pt.dbc
@@ -15,7 +15,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -25,6 +25,6 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
diff --git a/lexus_rx_hybrid_2017_pt_generated.dbc b/lexus_rx_hybrid_2017_pt_generated.dbc
index a0f798433bdf4a..9ad275556ca9dc 100644
--- a/lexus_rx_hybrid_2017_pt_generated.dbc
+++ b/lexus_rx_hybrid_2017_pt_generated.dbc
@@ -212,7 +212,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -222,6 +222,6 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
diff --git a/toyota_camry_hybrid_2018_pt_generated.dbc b/toyota_camry_hybrid_2018_pt_generated.dbc
index 8e39b7f31dea57..680a7ebd8fbdff 100644
--- a/toyota_camry_hybrid_2018_pt_generated.dbc
+++ b/toyota_camry_hybrid_2018_pt_generated.dbc
@@ -218,7 +218,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 8 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
@@ -226,5 +226,5 @@ CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
 VAL_ 295 GEAR 0 "P" 1 "R" 2 "N" 3 "D" 4 "B";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/toyota_chr_2018_pt_generated.dbc b/toyota_chr_2018_pt_generated.dbc
index 8b2cc3288e0159..ae5d16da3c2082 100644
--- a/toyota_chr_2018_pt_generated.dbc
+++ b/toyota_chr_2018_pt_generated.dbc
@@ -213,7 +213,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -223,5 +223,5 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 548 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 548 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/toyota_corolla_2017_pt_generated.dbc b/toyota_corolla_2017_pt_generated.dbc
index d025bf2c98fd68..a83f80b2fe1d9c 100644
--- a/toyota_corolla_2017_pt_generated.dbc
+++ b/toyota_corolla_2017_pt_generated.dbc
@@ -212,7 +212,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -222,5 +222,5 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 548 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 548 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/toyota_prius_2017_pt_generated.dbc b/toyota_prius_2017_pt_generated.dbc
index dd78636e04372c..0e92e6678e89bd 100644
--- a/toyota_prius_2017_pt_generated.dbc
+++ b/toyota_prius_2017_pt_generated.dbc
@@ -218,7 +218,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 8 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
@@ -226,5 +226,5 @@ CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
 VAL_ 295 GEAR 0 "P" 1 "R" 2 "N" 3 "D" 4 "B";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/toyota_rav4_2017_pt_generated.dbc b/toyota_rav4_2017_pt_generated.dbc
index e5f7b3be4e8ff8..9382a0e0caf519 100644
--- a/toyota_rav4_2017_pt_generated.dbc
+++ b/toyota_rav4_2017_pt_generated.dbc
@@ -212,7 +212,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -222,5 +222,5 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 548 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 548 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
diff --git a/toyota_rav4_hybrid_2017_pt_generated.dbc b/toyota_rav4_hybrid_2017_pt_generated.dbc
index 816929b5f7cde6..bf6a40cae59cb6 100644
--- a/toyota_rav4_hybrid_2017_pt_generated.dbc
+++ b/toyota_rav4_hybrid_2017_pt_generated.dbc
@@ -212,7 +212,7 @@ BO_ 608 STEER_TORQUE_SENSOR: 8 XXX
  SG_ CHECKSUM : 63|8@0+ (1,0) [0|255] "" XXX
 
 BO_ 610 EPS_STATUS: 5 EPS
- SG_ STATE : 3|4@0+ (1,0) [0|15] "" XXX
+ SG_ IPAS_STATE : 3|4@0+ (1,0) [0|15] "" XXX
  SG_ LKA_STATE : 31|8@0+ (1,0) [0|255] "" XXX
  SG_ CHECKSUM : 39|8@0+ (1,0) [0|255] "" XXX
 
@@ -222,6 +222,6 @@ BO_ 956 GEAR_PACKET: 8 XXX
 CM_ SG_ 550 BRAKE_PRESSURE "seems prop to pedal force";
 CM_ SG_ 550 BRAKE_POSITION "seems proportional to pedal displacement, unclear the max value of 0x1c8";
 CM_ SG_ 581 GAS_PEDAL "it seems slightly filtered";
-VAL_ 610 STATE 5 "override" 3 "enabled" 1 "disabled";
+VAL_ 610 IPAS_STATE 5 "override" 3 "enabled" 1 "disabled";
 VAL_ 610 LKA_STATE 50 "temporary_fault" 10 "active" 2 "standby";
 VAL_ 956 GEAR 0 "D" 1 "S" 8 "N" 16 "R" 32 "P";