Update and rename BoF to Descriptor/BoF