Naming conflict fix