Fix to errors with renaming nodes introduced in 0.0.3.5