Rename some formal parameters