Fixes node name editing

Closes-Bug: #1249364

Change-Id: Ib3708dc6d359b9407f5a942d3f80bbaf7a23e2a2