Fix output display names

Still fixing tests