Button refactoring: rename properties