Fixed another naming conflict