Same shapes as games

[kory]

(would also qualify for same names as games, I guess)