Rename parameters per review comments