Fixing display_name behavior