Rename for clarity and reduce function creep