Refactor - rename for clarity.