Changed get/set method names