Refactor out displayName in City.scala.