fix naming conflict check