Fixed the naming conflict