Rename confusing buttons
Uppercased word starts for buttons, renamed in one more function
Merge pull request #588 from coladict/master

Renamed confusing buttons