Remove all traces of Protocol/WCS
Update terminology