I think you should use display_name_with_default.