Rename a bunch of vehicle related fields so they make a bit more sense