[BF] Weed out mis-spellings causing issues