fix naming conflict