Add name overrides