Refactor accessor names