Switch to using display_name