Refactor make-friendly-display-name.