for the "VAZ 2101 Zhiguli", cannot we list them as "VAZ Zhiguli [2101]" (what we currently do for some) to always keep the model number in chassis code, no matter which actual make/model is used?
OK it is not exactly how the model was called, but we already do that for other cars, like Australian ones where we put the 2-letter code at the end (as chassis code) instead of putting it between make and model like what is usually done.