Fixed namespace collisions.