Refactor WB prefix in classes