Refactoring for more consistent naming of methods.