Rename vars
Merge origin/master