fixed names from buttons