Some internal renames in drawing methods