Rename params and local vars so not to hide fields