Merge "Fix rename without changing parent nodes"