afb-stub-ws: Improve naming