Fixes to name conventions in Vehicles