Follow fuzzy->bitap renaming