Small refactoring: badly named function arguments renamed