Giant re-naming: remove all meaningless legacy “bm” prefixes