rename struct members to avoid a name collision on BSD

41 jobs for !1406 with 842-broken-build in 15 minutes and 31 seconds (queued for 4 seconds)
detached