fixed naming conflicts