macros short-vehicle was renamed to vehicle-type-short