Variable name consistency

[clux]

If one name variable names are to be used (and to some extent this is kind of mandated by tournament api due to how matches are stored), then they should at least be used consistenly.

• match.p: players
• match.m: match
• id.m: game (at least don't use g=id.m)
• id.s: bracket
• id.r: round

lbr1, wbr2, type things are fine, but in general should be more explicit.