Remove hardcoded names from the GUI