Added automatic node renaming