Node renaming fix

Closes-Bug:#1318566

Change-Id: Ife7932765aa954bd2c8f913e716b1f62e75df906
Merge "Node renaming fix"