Fix up namespace collision.