Cleaning up nomenclature