adapt to wsapi designation service changes

(and some slight refactoring & renaming)