rename draw funcs

more consistent now