Corrected accidental parameter renames from package refactor