Personally, I don't have the exact solution you're asking for, but when this happens, I double click on the error first that takes me to the rule, I simply, clear the old name and press F3 to give me the help dropdown to pick the new name.
Although it's not 100% automated, but I actually like this better to give me control which attribute to pick from.
Once you do it a couple of times, then it becomes easy!
