Minor refactoring of method names