More renaming of methods
More refactoring