FIX: Paint to draw

This should wrap up the changes required to shift to "draw" name scheme.

@almarklein I made a couple minor changes to the testing scheme while in there, feel free to just look at my last commit to see them.

@lcampagn, you can also have a look at the last commit (the only one I made) to see if you're happy.

Should be ready for review/merge. Tests pass here, we'll see what Travis says.