Improve form button helper naming
Merge origin/master