Fix variable shadowing warning
Remove a couple of redundant params
A couple of terminology fixes