fixed named conflicts