Corrected a naming conflict