Refactor param names