finish replacing some parameter names
should rewrite history for this, but w/e, fix 52622a9