More renaming of functions and variables + testing