Solved a naming conflict