tip tweak, always use cf.Name()
[finishes #63943986]
temporary band-aid for flakey test