refactored some name of arguments