arc: more symbol rename fixes