Remove "proto" suffix

run_benchmarks

@@ -56,8 +56,8 @@ benchmarks = [{
     'server_address': tcp_address,
     'client': tcp_client,
 }, {
-    'name': 'tcpecho-curio-socket',
-    'title': 'TCP echo server (curio/socket)',
+    'name': 'tcpecho-curio',
+    'title': 'TCP echo server (curio)',
     'server': python + ['/usr/src/servers/curioecho.py'],
     'server_address': tcp_address,
     'client': tcp_client,
@@ -80,67 +80,67 @@ benchmarks = [{
     'server_address': tcp_address,
     'client': tcp_client,
 }, {
-    'name': 'tcpecho-asyncio-streams',
-    'title': 'TCP echo server (asyncio/streams)',
+    'name': 'tcpecho-asyncio',
+    'title': 'TCP echo server (asyncio)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=0.0.0.0:25000',
-                        '--streams'],
+                        '--proto'],
     'server_address': tcp_address,
     'client': tcp_client,
 }, {
-    'name': 'tcpecho-asyncio-proto',
-    'title': 'TCP echo server (asyncio/proto)',
+    'name': 'tcpecho-asyncio-streams',
+    'title': 'TCP echo server (asyncio/streams)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=0.0.0.0:25000',
-                        '--proto'],
+                        '--streams'],
     'server_address': tcp_address,
     'client': tcp_client,
 }, {
-    'name': 'unixecho-asyncio-streams',
-    'title': 'Unix socket echo server (asyncio/streams)',
+    'name': 'unixecho-asyncio',
+    'title': 'Unix socket echo server (asyncio)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=file:/tmp/sockets/server.sock',
-                        '--streams'],
+                        '--proto'],
     'server_address': unix_address,
     'client': unix_client,
 }, {
-    'name': 'unixecho-asyncio-proto',
-    'title': 'Unix socket echo server (asyncio/proto)',
+    'name': 'unixecho-asyncio-streams',
+    'title': 'Unix socket echo server (asyncio/streams)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=file:/tmp/sockets/server.sock',
-                        '--proto'],
+                        '--streams'],
     'server_address': unix_address,
     'client': unix_client,
 }, {
-    'name': 'tcpecho-uvloop-streams',
-    'title': 'TCP echo server (uvloop/streams)',
+    'name': 'tcpecho-uvloop',
+    'title': 'TCP echo server (uvloop)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=0.0.0.0:25000',
-                        '--streams', '--uvloop'],
+                        '--proto', '--uvloop'],
     'server_address': tcp_address,
     'client': tcp_client,
 }, {
-    'name': 'tcpecho-uvloop-proto',
-    'title': 'TCP echo server (uvloop/proto)',
+    'name': 'tcpecho-uvloop-streams',
+    'title': 'TCP echo server (uvloop/streams)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=0.0.0.0:25000',
-                        '--proto', '--uvloop'],
+                        '--streams', '--uvloop'],
     'server_address': tcp_address,
     'client': tcp_client,
 }, {
-    'name': 'unixecho-uvloop-streams',
-    'title': 'Unix socket echo server (uvloop/streams)',
+    'name': 'unixecho-uvloop',
+    'title': 'Unix socket echo server (uvloop)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=file:/tmp/sockets/server.sock',
-                        '--streams', '--uvloop'],
+                        '--proto', '--uvloop'],
     'server_address': unix_address,
     'client': unix_client,
 }, {
-    'name': 'unixecho-uvloop-proto',
-    'title': 'Unix socket echo server (uvloop/proto)',
+    'name': 'unixecho-uvloop-streams',
+    'title': 'Unix socket echo server (uvloop/streams)',
     'server': python + ['/usr/src/servers/asyncioecho.py',
                         '--addr=file:/tmp/sockets/server.sock',
-                        '--proto', '--uvloop'],
+                        '--streams', '--uvloop'],
     'server_address': unix_address,
     'client': unix_client,
 }]