Is there strong reason for renaming variables? IMHO it is adding more noise to patch