Change all the button names
Merge pull request #63 from kotct/fix-button-names

Fix #38