Changed the names to make the functionality clearer