change button names to lowercase
Merge origin/master