refactor classes with WB prefix