Add name overrides to fix upstream problems