More nomenclature changes