Fixed some button naming