- cleanup protocol names
- cleanup autoconf