Refactor public method names