Refactor button*Methods to Button*Methods