Refactor confusing names.