rename a bunch of draw functions