First pass at refactoring method names for clarity.