More consistent and correct nomenclature.