Update to new naming scheme in mware/gfx.c.