diff --git a/selfdrive/car/fw_versions.py b/selfdrive/car/fw_versions.py
index d063a2da79..34811ebd0d 100755
--- a/selfdrive/car/fw_versions.py
+++ b/selfdrive/car/fw_versions.py
@@ -71,10 +71,10 @@ MAZDA_VERSION_REQUEST = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + \
 MAZDA_VERSION_RESPONSE =  bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER + 0x40]) + \
   p16(uds.DATA_IDENTIFIER_TYPE.VEHICLE_MANUFACTURER_ECU_SOFTWARE_NUMBER)
 
-NISSAN_DIAGNOSTIC_REQUEST = b'\x10\xc0'
+NISSAN_KWP_DIAGNOSTIC_REQUEST = bytes([uds.SERVICE_TYPE.DIAGNOSTIC_SESSION_CONTROL, 0xc0])
 NISSAN_DIAGNOSTIC_RESPONSE = b'\x50\xc0'
 
-NISSAN_VERSION_REQUEST = b'\x21\x83'
+NISSAN_KWP_VERSION_REQUEST = b'\x21\x83'
 NISSAN_VERSION_RESPONSE = b'\x61\x83'
 
 NISSAN_VERSION_REQUEST_STANDARD = bytes([uds.SERVICE_TYPE.READ_DATA_BY_IDENTIFIER]) + \