refactor some param names