minor changes (renaming parameters)