Small improvements to handle parameters renaming.