Finish moving all informal protocols to formal protocols.
Fix improperly-named protocols.
Merge pull request #335 from pornel/master

Finish moving all informal protocols to formal protocols.