The variable names in the second arg to these should be changed too.