diff --git a/selfdrive/car/ecu_addrs.py b/selfdrive/car/ecu_addrs.py
index bbe508997..25938f0d3 100755
--- a/selfdrive/car/ecu_addrs.py
+++ b/selfdrive/car/ecu_addrs.py
@@ -1,16 +1,15 @@
 #!/usr/bin/env python3
 import capnp
 import time
-from typing import Optional, Set, Tuple
+from typing import Optional, Set
 
 import cereal.messaging as messaging
 from panda.python.uds import SERVICE_TYPE
 from selfdrive.car import make_can_msg
+from selfdrive.car.fw_query_definitions import EcuAddrBusType
 from selfdrive.boardd.boardd import can_list_to_can_capnp
 from system.swaglog import cloudlog
 
-EcuAddrBusType = Tuple[int, Optional[int], int]
-
 
 def make_tester_present_msg(addr, bus, subaddr=None):
   dat = [0x02, SERVICE_TYPE.TESTER_PRESENT, 0x0]
diff --git a/selfdrive/car/fw_query_definitions.py b/selfdrive/car/fw_query_definitions.py
index f9f8e30a6..1caedcd32 100755
--- a/selfdrive/car/fw_query_definitions.py
+++ b/selfdrive/car/fw_query_definitions.py
@@ -7,6 +7,9 @@ from typing import Callable, Dict, List, Optional, Set, Tuple
 
 import panda.python.uds as uds
 
+AddrType = Tuple[int, Optional[int]]
+EcuAddrBusType = Tuple[int, Optional[int], int]
+
 
 def p16(val):
   return struct.pack("!H", val)
@@ -76,7 +79,7 @@ class FwQueryConfig:
   extra_ecus: List[Tuple[capnp.lib.capnp._EnumModule, int, Optional[int]]] = field(default_factory=list)
   # Function a brand can implement to provide better fuzzy matching. Takes in FW versions,
   # returns set of candidates. Only will match if one candidate is returned
-  match_fw_to_car_fuzzy: Optional[Callable[[Dict[Tuple[int, Optional[int]], Set[bytes]]], Set[str]]] = None
+  match_fw_to_car_fuzzy: Optional[Callable[[Dict[AddrType, Set[bytes]]], Set[str]]] = None
 
   def __post_init__(self):
     for i in range(len(self.requests)):
diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py
index 038c2e086..38ced9747 100755
--- a/selfdrive/car/fw_versions.py
+++ b/selfdrive/car/fw_versions.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 from collections import defaultdict
-from typing import Any, DefaultDict, Dict, List, Optional, Set, Tuple
+from typing import Any, DefaultDict, Dict, List, Optional, Set
 from tqdm import tqdm
 import capnp
 
 import panda.python.uds as uds
 from cereal import car
 from common.params import Params
-from selfdrive.car.ecu_addrs import EcuAddrBusType, get_ecu_addrs
+from selfdrive.car.ecu_addrs import get_ecu_addrs
+from selfdrive.car.fw_query_definitions import AddrType, EcuAddrBusType
 from selfdrive.car.interfaces import get_interface_attr
 from selfdrive.car.fingerprints import FW_VERSIONS
 from selfdrive.car.isotp_parallel_query import IsoTpParallelQuery
@@ -35,8 +36,8 @@ def is_brand(brand: str, filter_brand: Optional[str]) -> bool:
 
 
 def build_fw_dict(fw_versions: List[capnp.lib.capnp._DynamicStructBuilder],
-                  filter_brand: Optional[str] = None) -> Dict[Tuple[int, Optional[int]], Set[bytes]]:
-  fw_versions_dict = defaultdict(set)
+                  filter_brand: Optional[str] = None) -> Dict[AddrType, Set[bytes]]:
+  fw_versions_dict: DefaultDict[AddrType, Set[bytes]] = defaultdict(set)
   for fw in fw_versions:
     if is_brand(fw.brand, filter_brand) and not fw.logging:
       sub_addr = fw.subAddress if fw.subAddress != 0 else None
@@ -44,8 +45,8 @@ def build_fw_dict(fw_versions: List[capnp.lib.capnp._DynamicStructBuilder],
   return dict(fw_versions_dict)
 
 
-def get_brand_addrs() -> Dict[str, Set[Tuple[int, Optional[int]]]]:
-  brand_addrs: DefaultDict[str, Set[Tuple[int, Optional[int]]]] = defaultdict(set)
+def get_brand_addrs() -> Dict[str, Set[AddrType]]:
+  brand_addrs: DefaultDict[str, Set[AddrType]] = defaultdict(set)
   for brand, cars in VERSIONS.items():
     # Add ecus in database + extra ecus to match against
     brand_addrs[brand] |= {(addr, sub_addr) for _, addr, sub_addr in FW_QUERY_CONFIGS[brand].extra_ecus}