replace ProtocolType with String
Merge pull request #1261 from andytaylor/master

replace ProtocolType with String