fixed naming conflict