Fix name errors introduced by move to enumerator.