Add helpers to extract human-readable names of entity and source