Fix names collisions