Change name of data type and tweak ShipState