More renaming of private variables.