Fixed naming conflict bug