Changed buttons to be starting from Upper case