Moved display names to model objects

Replaced conditional in the presenter with polymorphism