More renaming of constants