Initial refactor for display_name on entities.