Update for recent bitset
Remove Bson prefix everywhere