Gh381 rename branch

remove oldName, get it from node when necessary