Fixed naming conflict