remove naming conflict