ShipHandler now returns both names