Correct scenarios to use renamed nodes