Some basic refactoring - rename some methods