Standardizes model nomenclature, again.