Rename vars
Merge branch 'fix-typo'