Add names overrides