Fix name collisions