Rename some parameters
Fix typo