Standardize nomenclature a little bit