90bed18415
Also: - rename `display_name` to `computed_display_name` in several places, and reflect that change into a few callers - simplify slightly the `computed_display_name()` method