Change to use name instead of display_name