Changed button names so we don't use color names