#42 Rework renaming variables.