Finish moving all informal protocols to formal protocols.

Fix improperly-named protocols.