Fixed nameing conflict