Refactored naming to better reflect functionality