Fix conflicting names
This refs affinitic #5634