Minor refactor in method names