Remove more argument name confusion
Fix doctests