Fix possible naming conflict