solve naming conflict