Rename User node
Merge origin/master