Change namespace to remove BC
Update doc