Fixed nodeName automatic update when name already taken.
Merge branch 'feature/fix' into develop