Fixing a few places where we should now be using agent display names