Fixes per the code review: removed the WAB_* static names