fixed field names to agree with ship and ao