More node renaming