Final version of renames of numeral def's