resolve some name conflicts