fix weird naming conflicts