Closes #321.  Added protocol names.