Changing a lot of #defines to use WB as prefix