More sane canvas names/use