Renamed name fields to be specific to each table, added Equip to Ship form