Thanks Fred. This almost did the trick. Unfortunately, it failed to correctly update enumerator references in BP. Instead those got redirected to NewEnumeratorX.
I also tried using the actual enumerator names and they were still redirected to NewEnumeratorX.
Any ideas?
-David