renaming/refactoring of a lot of methods