Cleaned up a lot of stuff

frameworks/C++/cpoll_cppsp/benchmark_config.json

@@ -7,18 +7,19 @@
       "plaintext_url": "/plaintext",
       "port": 16969,
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "None",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-cppsp",
       "notes": "",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     },
     "raw": {
       "setup_file": "setup",
@@ -32,14 +33,15 @@
       "database": "MySQL",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-cppsp-raw",
       "notes": "",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     },
     "postgres-raw": {
       "setup_file": "setup",
@@ -51,14 +53,15 @@
       "database": "Postgres",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-cppsp-raw",
       "notes": "",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     },
     "postgres-raw-threadpool": {
       "setup_file": "setup",
@@ -70,14 +73,15 @@
       "database": "Postgres",
       "framework": "cpoll-cppsp",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Raw",
-      "platform": "CPoll",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "cpoll-pool",
       "notes": "Threadpool",
-      "versus": ""
+      "versus": "cpoll_cppsp"
     }
   }]
 }

frameworks/C++/ffead-cpp/benchmark_config.json

@@ -11,18 +11,19 @@
       "update_url": "/te-benchmark/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Framework",
       "database": "MongoDB",
       "framework": "ffead-cpp",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Full",
-      "platform": "ffead-cpp",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ffead-cpp",
       "notes": "",
-      "versus": ""
+      "versus": "ffead-cpp"
     }
   }]
 }

frameworks/C++/poco/benchmark_config.json

@@ -8,16 +8,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "none",
-      "framework": "POCO",
+      "framework": "None",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Raw",
       "platform": "POCO",
-      "webserver": "poco",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "POCO",
       "notes": "",
-      "versus": ""
+      "versus": "poco"
     }
   }]
 }

frameworks/C++/silicon/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "MySQL",
       "framework": "silicon",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Full",
-      "platform": "Silicon",
+      "platform": "None",
       "webserver": "microhttpd",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silicon-tpc-mysql",
       "notes": "",
-      "versus": ""
+      "versus": "silicon"
     },
     "epoll-mysql": {
       "setup_file": "setup_mhd_epoll_mysql",
@@ -38,14 +39,15 @@
       "database": "MySQL",
       "framework": "silicon",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Full",
-      "platform": "Silicon",
+      "platform": "None",
       "webserver": "microhttpd",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silicon-epoll-mysql",
       "notes": "",
-      "versus": ""
+      "versus": "silicon"
     },
     "lwan-mysql": {
       "setup_file": "setup_lwan_mysql",
@@ -61,14 +63,15 @@
       "database": "MySQL",
       "framework": "silicon",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Full",
-      "platform": "Silicon",
+      "platform": "None",
       "webserver": "Lwan",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "silicon-lwan-mysql",
       "notes": "",
-      "versus": ""
+      "versus": "silicon"
     }
     
   }]

frameworks/C++/treefrog/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "MySQL",
       "framework": "treefrog",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Micro",
-      "platform": "Treefrog",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "treefrog-hybrid",
       "notes": "",
-      "versus": ""
+      "versus": "treefrog"
     },
     "thread": {
       "setup_file": "setup-thread",
@@ -38,14 +39,15 @@
       "database": "MySQL",
       "framework": "treefrog",
       "language": "C++",
+      "flavor": "C++14",
       "orm": "Micro",
-      "platform": "Treefrog",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "treefrog-thread",
       "notes": "",
-      "versus": ""
+      "versus": "treefrog"
     }
   }]
 }

frameworks/C++/wt/benchmark_config.json

@@ -15,13 +15,15 @@
      	"database": "MySQL",
      	"framework": "wt",
      	"language": "C++",
+          "flavor": "C++14",
      	"orm": "Full",
-     	"platform": "Wt",
+     	"platform": "None",
      	"webserver": "None",
      	"os": "Linux",
      	"database_os": "Linux",
      	"display_name": "wt",
-     	"notes": ""
+     	"notes": "",
+          "versus": "wt"
      },
      "postgres": {
      	"setup_file": "setup_postgres",
@@ -35,13 +37,15 @@
      	"database": "Postgres",
      	"framework": "wt",
      	"language": "C++",
+          "flavor": "C++14",
      	"orm": "Full",
-     	"platform": "Wt",
+     	"platform": "None",
      	"webserver": "None",
      	"os": "Linux",
      	"database_os": "Linux",
      	"display_name": "wt-postgres",
-     	"notes": ""
+     	"notes": "",
+          "versus": "wt"
      }
   }]
 }

frameworks/C/duda/benchmark_config.json

@@ -8,17 +8,18 @@
       "port": 2001,
       "approach": "Realistic",
       "classification": "Platform",
-      "database": "none",
-      "framework": "Duda",
+      "database": "None",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
-      "platform": "Duda I/O",
+      "platform": "duda",
       "webserver": "Monkey",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Duda I/O",
       "notes": "",
-      "versus": ""
+      "versus": "duda"
     }
   }]
 }

frameworks/C/haywire/benchmark_config.json

@@ -6,17 +6,18 @@
       "plaintext_url": "/plaintext",
       "port": 8000,
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "None",
-      "framework": "haywire",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
       "platform": "haywire",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "notes": "",
-      "versus": ""
+      "versus": "haywire"
     }
   }]
 }

frameworks/C/libreactor/benchmark_config.json

@@ -9,15 +9,16 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "libreactor",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
       "platform": "libreactor",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "notes": "",
-      "versus": ""
+      "versus": "libreactor"
     }
   }]
 }

frameworks/C/lwan/benchmark_config.json

@@ -9,16 +9,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "lwan",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
       "platform": "Lwan",
-      "webserver": "Lwan",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Lwan",
       "notes": "",
-      "versus": ""
+      "versus": "lwan"
     },
     "sqlite": {
       "setup_file": "setup",
@@ -29,16 +30,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "SQLite",
-      "framework": "lwan",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
       "platform": "Lwan",
-      "webserver": "Lwan",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Lwan",
       "notes": "",
-      "versus": ""
+      "versus": "lwan"
     },
     "mysql": {
       "setup_file": "setup-mysql",
@@ -49,16 +51,17 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "lwan",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
       "platform": "Lwan",
-      "webserver": "Lwan",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Lwan",
       "notes": "",
-      "versus": ""
+      "versus": "lwan"
     }
   }]
 }

frameworks/C/onion/benchmark_config.json

@@ -8,8 +8,9 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "None",
-      "framework": "onion",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
       "platform": "Onion",
       "webserver": "None",
@@ -17,7 +18,7 @@
       "database_os": "Linux",
       "display_name": "onion",
       "notes": "",
-      "versus": ""
+      "versus": "onion"
     },
     "raw": {
       "setup_file": "setup",
@@ -28,8 +29,9 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "onion",
+      "framework": "None",
       "language": "C",
+      "flavor": "C11",
       "orm": "Raw",
       "platform": "Onion",
       "webserver": "None",
@@ -37,7 +39,7 @@
       "database_os": "Linux",
       "display_name": "onion",
       "notes": "",
-      "versus": ""
+      "versus": "onion"
     }
   }]
 }

frameworks/CSharp/HttpListener/benchmark_config.json

@@ -6,19 +6,20 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
       "notes": "",
-      "versus": ""
+      "versus": "HttpListener"
     },
     "mysql-raw": {
       "setup_file": "setup",
@@ -27,14 +28,15 @@
       "fortune_url": "/fortunes?provider=mysql",
       "update_url": "/updates?provider=mysql&queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
@@ -48,14 +50,14 @@
       "fortune_url": "/fortunes?provider=postgresql",
       "update_url": "/updates?provider=postgresql&queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
@@ -69,14 +71,15 @@
       "fortune_url": "/mongodbfortunes",
       "update_url": "/mongodbupdates?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MongoDB",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "http-listener",
@@ -90,14 +93,15 @@
       "fortune_url": "/fortunes?provider=sqlserver",
       "update_url": "/updates?provider=sqlserver&queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "SQLServer",
-      "framework": "http-listener",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
-      "webserver": "HTTP.sys",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
       "database_os": "Windows",
       "display_name": "http-listener",

frameworks/CSharp/aspnet-stripped/benchmark_config.json

@@ -9,16 +9,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped",
+      "display_name": "asp.net-stripped",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     },
     "mysql-raw": {
       "setup_file": "setup_iis",
@@ -30,16 +31,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     },
     "postgresql-raw": {
       "setup_file": "setup_iis",
@@ -51,16 +53,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "asnet-stripped"
     },
     "mongodb-raw": {
       "setup_file": "setup_iis",
@@ -72,16 +75,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "MongoDB",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     },
     "sqlserver-raw": {
       "setup_file": "setup_iis",
@@ -93,16 +97,17 @@
       "approach": "Stripped",
       "classification": "Fullstack",
       "database": "SQLServer",
-      "framework": "aspnet",
+      "framework": "ASP.NET",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
-      "display_name": "aspnet-stripped-raw",
+      "display_name": "asp.net-stripped-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-stripped"
     }
   }]
 }

frameworks/CSharp/aspnet/benchmark_config.json

@@ -9,52 +9,55 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet",
+      "display_name": "asp.net",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "jsonnet": {
       "setup_file": "setup_iis",
       "json_url": "/json/jsonnet",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-jsonnet",
+      "display_name": "jsonnet",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "servicestack": {
       "setup_file": "setup_iis",
       "json_url": "/json/servicestack",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-svcstk",
+      "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mysql-raw": {
       "setup_file": "setup_iis",
@@ -66,16 +69,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "asp.net-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "postgresql-raw": {
       "setup_file": "setup_iis",
@@ -87,16 +91,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "asp.net-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mongodb-raw": {
       "setup_file": "setup_iis",
@@ -108,16 +113,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MongoDB",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "asp.net-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "sqlserver-raw": {
       "setup_file": "setup_iis",
@@ -129,16 +135,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "SQLServer",
-      "framework": "aspnet-mvc",
+      "framework": "asp.net-mvc",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
-      "display_name": "aspnet-mvc-raw",
+      "display_name": "aspnet-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mysql-entityframework": {
       "setup_file": "setup_iis",
@@ -150,16 +157,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc",
+      "display_name": "EntityFramework",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "postgresql-entityframework": {
       "setup_file": "setup_iis",
@@ -171,16 +179,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc",
+      "display_name": "EntityFramework",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "sqlserver-entityframework": {
       "setup_file": "setup_iis",
@@ -192,16 +201,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "SQLServer",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
-      "display_name": "aspnet-mvc",
+      "display_name": "EntityFramework",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono": {
       "setup_file": "setup_nginx",
@@ -209,54 +219,57 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "None",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono",
+      "display_name": "ASP.NET",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-mono"
     },
     "mono-jsonnet": {
       "setup_file": "setup_nginx",
       "json_url": "/json/jsonnet",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "JSONNet",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-jsonnet-mono",
+      "display_name": "JSONNet",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-mono"
     },
     "mono-servicestack": {
       "setup_file": "setup_nginx",
       "json_url": "/json/servicestack",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
-      "framework": "aspnet",
+      "framework": "ServiceStack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-svcstk-mono",
+      "display_name": "ServiceStack",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet-mono"
     },
     "mono-mysql-raw": {
       "setup_file": "setup_nginx",
@@ -268,18 +281,19 @@
       "update_url": "/ado/mysql/update?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono-raw",
+      "display_name": "ASP.NET-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-postgresql-raw": {
       "setup_file": "setup_nginx",
@@ -289,18 +303,19 @@
       "update_url": "/ado/postgresql/update?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono-raw",
+      "display_name": "ASP.NET-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-mongodb-raw": {
       "setup_file": "setup_nginx",
@@ -310,18 +325,19 @@
       "update_url": "/mongodb/update?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Fullstack",
+      "classification": "Platform",
       "database": "MongoDB",
-      "framework": "aspnet-mvc",
+      "framework": "None",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono-raw",
+      "display_name": "aspnet-raw",
       "notes": "",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-mysql-entityframework": {
       "setup_file": "setup_nginx",
@@ -333,16 +349,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Full",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono",
+      "display_name": "EntityFramework",
       "notes": "Entity framework",
-      "versus": ""
+      "versus": "aspnet"
     },
     "mono-postgresql-entityframework": {
       "setup_file": "setup_nginx",
@@ -354,16 +371,17 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "Postgres",
-      "framework": "aspnet-mvc",
+      "framework": "EntityFramework",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Full",
-      "platform": "Mono",
+      "platform": "ASP.NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "aspnet-mvc-mono",
+      "display_name": "EntityFramework",
       "notes": "Entity framework",
-      "versus": ""
+      "versus": "aspnet"
     }
   }]
 }

frameworks/CSharp/evhttp-sharp/benchmark_config.json

@@ -11,14 +11,15 @@
       "database": "None",
       "framework": "evhttp-sharp",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "evhttp-sharp",
       "notes": "",
-      "versus": ""
+      "versus": "evhttp-sharp"
     }
   }]
 }

frameworks/CSharp/nancy/benchmark_config.json

@@ -13,14 +13,15 @@
       "database": "MySQL",
       "framework": "nancy",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": ".NET",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "nancy",
       "notes": "",
-      "versus": ""
+      "versus": "nancy"
     },
     "mono": {
       "setup_file": "setup_nginx",
@@ -34,14 +35,15 @@
       "database": "MySQL",
       "framework": "nancy",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": ".NET",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "nancy",
       "notes": "",
-      "versus": ""
+      "versus": "nancy"
     }
 
   }]

frameworks/CSharp/revenj/benchmark_config.json

@@ -1,5 +1,5 @@
 {
-  "framework": "Revenj.NET",
+  "framework": "Revenj",
   "tests": [{
     "windows": {
       "setup_file": "setup",
@@ -10,18 +10,19 @@
       "update_url": "/bench/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "database_os": "Linux",
-      "framework": "Revenj.NET",
+      "framework": "Revenj",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Full",
-      "platform": ".NET",
-      "webserver": "Revenj.NET",
+      "platform": "None",
+      "webserver": "None",
       "os": "Windows",
-      "display_name": "Revenj.NET",
+      "display_name": "Revenj",
       "notes": "",
-      "versus": ""
+      "versus": "Revenj"
     },
     "default": {
       "setup_file": "setup",
@@ -32,18 +33,19 @@
       "update_url": "/bench/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "database_os": "Linux",
-      "framework": "Revenj.NET",
+      "framework": "Revenj",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Full",
-      "platform": "Mono",
-      "webserver": "Revenj.NET",
+      "platform": "None",
+      "webserver": "None",
       "os": "Linux",
-      "display_name": "Revenj.NET",
+      "display_name": "Revenj",
       "notes": "",
-      "versus": ""
+      "versus": "Revenj"
     }
   }]
 }

frameworks/CSharp/servicestack/benchmark_config.json

@@ -7,18 +7,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-sqlserver": {
       "setup_file": "setup_iis",
@@ -28,18 +29,19 @@
       "update_url": "/sqlserver/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "SQLServer",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Windows",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-mysql": {
       "setup_file": "setup_iis",
@@ -49,18 +51,19 @@
       "update_url": "/mysql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MySQL",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-postgresql": {
       "setup_file": "setup_iis",
@@ -70,18 +73,19 @@
       "update_url": "/postgresql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "iis-mongodb": {
       "setup_file": "setup_iis",
@@ -92,18 +96,19 @@
       "update_url": "/mongodb/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MongoDB",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Microsoft",
       "orm": "Raw",
-      "platform": "NET",
+      "platform": "None",
       "webserver": "IIS",
       "os": "Windows",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-default": {
       "setup_file": "setup_nginx",
@@ -111,18 +116,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-sqlserver": {
       "setup_file": "setup_nginx",
@@ -132,12 +138,13 @@
       "update_url": "/sqlserver/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "SQLServer",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Windows",
@@ -153,18 +160,19 @@
       "update_url": "/mysql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MySQL",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-postgresql": {
       "setup_file": "setup_nginx",
@@ -174,18 +182,19 @@
       "update_url": "/postgresql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "nginx-mongodb": {
       "setup_file": "setup_nginx",
@@ -195,18 +204,19 @@
       "update_url": "/mongodb/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MongoDB",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-default": {
       "setup_file": "setup_xsp",
@@ -214,18 +224,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "None",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     }, 
     "xsp-sqlserver": {
       "setup_file": "setup_xsp",
@@ -235,18 +246,19 @@
       "update_url": "/sqlserver/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "SQLServer",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Windows",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-mysql": {
       "setup_file": "setup_xsp",
@@ -256,18 +268,18 @@
       "update_url": "/mysql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MySQL",
       "framework": "servicestack",
       "language": "C#",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-postgresql": {
       "setup_file": "setup_xsp",
@@ -277,18 +289,19 @@
       "update_url": "/postgresql/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "Postgres",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     },
     "xsp-mongodb": {
       "setup_file": "setup_xsp",
@@ -298,18 +311,19 @@
       "update_url": "/mongodb/updates/",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Fullstack",
       "database": "MongoDB",
       "framework": "servicestack",
       "language": "C#",
+      "flavor": "Mono",
       "orm": "Raw",
-      "platform": "Mono",
+      "platform": "None",
       "webserver": "XSP",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "servicestack",
       "notes": "",
-      "versus": ""
+      "versus": "servicestack"
     }
   }]
 }

frameworks/Clojure/aleph/benchmark_config.json

@@ -7,10 +7,11 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "None",
       "framework": "aleph",
       "language": "Clojure",
+      "flavor": "Java8",
       "orm": "Raw",
       "platform": "Netty",
       "webserver": "None",

frameworks/Clojure/compojure/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "framework": "compojure",
       "language": "Clojure",
+      "flavor": "Java8",
       "orm": "Micro",
       "platform": "Servlet",
       "webserver": "Resin",
@@ -36,6 +37,7 @@
       "database": "MySQL",
       "framework": "compojure",
       "language": "Clojure",
+      "flavor": "Java8",
       "orm": "Raw",
       "platform": "Servlet",
       "webserver": "Resin",

frameworks/Clojure/http-kit/benchmark_config.json

@@ -13,8 +13,9 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "http-kit",
+      "framework": "None",
       "language": "Clojure",
+      "flavor": "Java8",
       "orm": "Micro",
       "platform": "http-kit",
       "webserver": "None",
@@ -22,7 +23,7 @@
       "database_os": "Linux",
       "display_name": "http-kit",
       "notes": "",
-      "versus": ""
+      "versus": "http-kit"
     },
     "raw": {
       "setup_file": "setup",
@@ -34,8 +35,9 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "http-kit",
+      "framework": "None",
       "language": "Clojure",
+      "flavor": "Java8",
       "orm": "Raw",
       "platform": "http-kit",
       "webserver": "None",
@@ -43,7 +45,7 @@
       "database_os": "Linux",
       "display_name": "http-kit",
       "notes": "",
-      "versus": ""
+      "versus": "http-kit"
     }
   }]
 }

frameworks/Clojure/luminus/benchmark_config.json

@@ -11,18 +11,19 @@
       "update_url": "/updates/",
       "port": 3000,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "Postgres",
       "framework": "luminus",
       "language": "Clojure",
+      "flavor": "Java8",
       "orm": "Raw",
-      "platform": "Immutant",
+      "platform": "Undertow",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "luminus",
       "notes": "",
-      "versus": "servlet"
+      "versus": "undertow"
     }
   }]
 }

frameworks/Clojure/pedestal/benchmark_config.json

@@ -16,12 +16,13 @@
       "orm": "micro",
       "framework": "pedestal",
       "language": "Clojure",
-      "platform": "Servlet",
-      "webserver": "Jetty",
+      "flavor": "Java8",
+      "platform": "Undertow",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "pedestal",
-      "notes": "servlet"
+      "notes": "undertow"
     }
   }]
 }

frameworks/Crystal/crystal-raw/benchmark_config.json → frameworks/Crystal/crystal/benchmark_config.json

@@ -7,18 +7,19 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Micro",
+      "classification": "Platform",
       "database": "Postgres",
-      "framework": "crystal",
+      "framework": "None",
       "language": "Crystal",
+      "flavor": "Crystal12",
       "orm": "Raw",
-      "platform": "Crystal",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Crystal",
       "notes": "",
-      "versus": "ruby"
+      "versus": "crystal"
     }
   }]
 }

frameworks/Crystal/kemal/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "Redis",
       "framework": "kemal",
       "language": "Crystal",
+      "flavor": "Crystal12",
       "orm": "micro",
-      "platform": "Crystal",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Kemal",
       "notes": "",
-      "versus": "ruby"
+      "versus": "crystal"
     },
     "postgres": {
       "setup_file": "setup-postgres",
@@ -38,14 +39,15 @@
       "database": "Postgres",
       "framework": "kemal",
       "language": "Crystal",
+      "flavor": "Crystal12",
       "orm": "micro",
-      "platform": "Crystal",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Kemal",
       "notes": "",
-      "versus": "ruby"
+      "versus": "crystal"
     }
   }]
 }

frameworks/Crystal/moonshine/benchmark_config.json

@@ -15,14 +15,15 @@
       "database": "Postgres",
       "framework": "moonshine",
       "language": "Crystal",
+      "flavor": "Crystal12",
       "orm": "micro",
-      "platform": "Crystal",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "Moonshine",
       "notes": "",
-      "versus": "ruby"
+      "versus": "crystal"
     }
   }]
 }

frameworks/D/vibed/benchmark_config.json

@@ -11,12 +11,13 @@
       "update_url": "/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MongoDB",
-      "framework": "vibed",
+      "framework": "vibe.d",
       "language": "D",
+      "flavor": "DLang2",
       "orm": "Micro",
-      "platform": "D",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Dart/dart-raw/benchmark_config.json

@@ -10,13 +10,14 @@
       "update_url": "/updates?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "dart",
+      "framework": "None",
       "language": "Dart",
+      "flavor": "Dart1",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Dart/redstone/benchmark_config.json

@@ -15,12 +15,13 @@
       "database": "Postgres",
       "framework": "redstone",
       "language": "Dart",
+      "flavor": "Dart1",
       "orm": "Micro",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "redstone-postgresql",
+      "display_name": "redstone",
       "notes": "",
       "versus": "dart"
     },
@@ -36,12 +37,13 @@
       "database": "MongoDB",
       "framework": "redstone",
       "language": "Dart",
+      "flavor": "Dart1",
       "orm": "Micro",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "redstone-mongodb",
+      "display_name": "redstone",
       "notes": "",
       "versus": "dart"
     }

frameworks/Dart/start/benchmark_config.json

@@ -15,8 +15,9 @@
       "database": "Postgres",
       "framework": "start",
       "language": "Dart",
+      "flavor": "Dart1",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,8 +37,9 @@
       "database": "MongoDB",
       "framework": "start",
       "language": "Dart",
+      "flavor": "Dart1",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Dart/stream/benchmark_config.json

@@ -15,8 +15,9 @@
       "database": "Postgres",
       "framework": "stream",
       "language": "Dart",
+      "flavor": "Dart1",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",
@@ -36,8 +37,9 @@
       "database": "MongoDB",
       "framework": "stream",
       "language": "Dart",
+      "flavor": "Dart1",
       "orm": "Raw",
-      "platform": "Dart",
+      "platform": "None",
       "webserver": "nginx",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Elixir/cowboy/benchmark_config.json

@@ -6,17 +6,18 @@
             "json_url": "/json",
             "plaintext_url": "/plaintext",
             "port": 8080,
-            "approach": "Realistic",
+            "approach": "Stripped",
             "classification": "Platform",
             "database": "None",
-            "framework": "cowboy",
-            "language": "elixir",
+            "framework": "None",
+            "language": "Elixir",
+            "flavor": "Elixir1",
             "orm": "raw",
-            "platform": "Erlang/OTP",
-            "webserver": "cowboy",
+            "platform": "None",
+            "webserver": "None",
             "os": "Linux",
             "database_os": "Linux",
-            "display_name": "elixir-cowboy",
+            "display_name": "Cowboy",
             "notes": "",
             "versus": ""
         }

frameworks/Elixir/phoenix/benchmark_config.json

@@ -14,10 +14,11 @@
             "classification": "Micro",
             "database": "Postgres",
             "framework": "Phoenix",
-            "language": "elixir",
+            "language": "Elixir",
+            "flavor": "Elixir1",
             "orm": "full",
-            "platform": "Erlang/OTP",
-            "webserver": "cowboy",
+            "platform": "Cowboy",
+            "webserver": "None",
             "os": "Linux",
             "database_os": "Linux",
             "display_name": "Phoenix",

frameworks/Erlang/chicagoboss/benchmark_config.json

@@ -9,11 +9,12 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "chicagoboss",
+      "framework": "ChicagoBoss",
       "language": "Erlang",
+      "flavor": "Erlang18",
       "orm": "raw",
-      "platform": "cowboy",
-      "webserver": "cowboy",
+      "platform": "Cowboy",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ChicagoBoss",

frameworks/Erlang/cowboy/benchmark_config.json

@@ -8,17 +8,18 @@
       "db_url": "/db",
       "query_url": "/query?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "cowboy",
+      "framework": "None",
       "language": "Erlang",
+      "flavor": "Erlang18",
       "orm": "Raw",
-      "platform": "Cowboy",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "cowboy",
+      "display_name": "Cowboy",
       "notes": "",
       "versus": ""
   }}]

frameworks/Erlang/elli/benchmark_config.json

@@ -7,13 +7,14 @@
       "json_url": "/json",
       "db_url": "/db",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "elli",
+      "framework": "None",
       "language": "Erlang",
+      "flavor": "Erlang18",
       "orm": "Raw",
-      "platform": "elli",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Erlang/misultin/benchmark_config.json

@@ -6,13 +6,14 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "Misultin",
+      "framework": "None",
       "language": "Erlang",
+      "flavor": "Erlang18",
       "orm": "Raw",
-      "platform": "Erlang",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Erlang/mochiweb/benchmark_config.json

@@ -6,13 +6,14 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "Mochiweb",
+      "framework": "None",
       "language": "Erlang",
+      "flavor": "Erlang18",
       "orm": "Raw",
-      "platform": "Erlang",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/beego/benchmark_config.json

@@ -12,8 +12,9 @@
       "database": "MySQL",
       "framework": "beego",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Micro",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/echo/benchmark_config.json

@@ -11,16 +11,17 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MySQL",
-      "framework": "ECHO",
+      "framework": "Echo",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "ECHO",
+      "display_name": "Echo",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/falcore/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "falcore",
+      "framework": "Falcore",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "falcore",
+      "display_name": "Falcore",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/fasthttp-mysql/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "fasthttp",
+      "framework": "None",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "fasthttp-mysql",
+      "display_name": "fasthttp",
       "notes": "",
       "versus": "go"
     },
@@ -36,14 +37,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "fasthttp",
+      "framework": "None",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "fasthttp-mysql-prefork",
+      "display_name": "fasthttp-prefork",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/fasthttp-postgresql/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "fasthttp",
+      "framework": "None",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "fasthttp-postgresql",
+      "display_name": "fasthttp",
       "notes": "",
       "versus": "go"
     },

frameworks/Go/gin/benchmark_config.json

@@ -11,12 +11,13 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MySQL",
       "framework": "gin",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/go-std-mongodb/benchmark_config.json

@@ -10,17 +10,18 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MongoDB",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-std-mongodb",
+      "display_name": "Go",
       "notes": "mongodb implementation for go net/http",
       "versus": "go"
     }

frameworks/Go/go-std-mysql/benchmark_config.json

@@ -10,17 +10,18 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
       "framework": "go",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-std-mysql",
+      "display_name": "Go",
       "notes": "",
       "versus": "go"
     },
@@ -31,17 +32,18 @@
       "fortune_url": "/fortuneInterpolate",
       "update_url": "/updateInterpolate?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-std-mysql-interpolate",
+      "display_name": "Go-interpolate",
       "notes": "",
       "versus": "go"
     },
@@ -54,17 +56,18 @@
       "update_url": "/update?queries=",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "MySQL",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-std-prefork-mysql",
+      "display_name": "Go-prefork",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/go-std-postgresql/benchmark_config.json

@@ -8,17 +8,18 @@
       "fortune_url": "/fortune",
       "update_url": "/update?queries=",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "Postgres",
-      "framework": "go",
+      "framework": "None",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "go-std-postgresql",
+      "display_name": "Go",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/goji/benchmark_config.json

@@ -11,12 +11,13 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MySQL",
       "framework": "Goji",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/kami/benchmark_config.json

@@ -11,12 +11,13 @@
       "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "MySQL",
       "framework": "kami",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Go/revel-jet/benchmark_config.json

@@ -11,14 +11,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "revel",
+      "framework": "Revel",
       "language": "Go",
-      "orm": "Raw",
-      "platform": "Go",
+      "flavor": "Go1",
+      "orm": "Micro",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "revel-jet",
+      "display_name": "Revel-jet",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/revel-qbs/benchmark_config.json

@@ -11,14 +11,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "revel",
+      "framework": "Revel",
       "language": "Go",
-      "orm": "Raw",
-      "platform": "Go",
+      "flavor": "Go1",
+      "orm": "Micro",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "revel-qbs",
+      "display_name": "Revel-qbs",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/revel/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "revel",
+      "framework": "Revel",
       "language": "Go",
+      "flavor": "Go1",
       "orm": "Raw",
-      "platform": "Go",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "revel",
+      "display_name": "Revel",
       "notes": "",
       "versus": "go"
     }

frameworks/Go/webgo/benchmark_config.json

@@ -8,14 +8,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
-      "framework": "webgo",
+      "framework": "Webgo",
       "language": "Go",
-      "orm": "Full",
-      "platform": "Go",
+      "flavor": "Go1",
+      "orm": "Raw",
+      "platform": "None",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "webgo",
+      "display_name": "Webgo",
       "notes": "",
       "versus": "go"
     }

frameworks/Groovy/grails/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "grails",
+      "framework": "Grails",
       "language": "Groovy",
+      "flavor": "Groovy2",
       "orm": "Full",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "grails",
+      "display_name": "Grails",
       "notes": "",
       "versus": "servlet"
     }

frameworks/Haskell/snap/benchmark_config.json

@@ -11,14 +11,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "snap",
+      "framework": "Snap",
       "language": "Haskell",
+      "flavor": "GHC78",
       "orm": "Full",
       "platform": "Snap",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "snap",
+      "display_name": "Snap",
       "notes": "",
       "versus": ""
     }

frameworks/Haskell/spock/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "Postgres",
-      "framework": "spock",
+      "framework": "Spock",
       "language": "Haskell",
+      "flavor": "GHC710",
       "orm": "Raw",
       "platform": "Wai",
       "webserver": "Warp",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "spock",
+      "display_name": "Spock",
       "notes": "",
       "versus": ""
     }

frameworks/Haskell/wai/benchmark_config.json

@@ -6,13 +6,14 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8000,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "wai",
+      "framework": "None",
       "language": "Haskell",
+      "flavor": "GHC78",
       "orm": "Full",
-      "platform": "Wai",
+      "platform": "None",
       "webserver": "Warp",
       "os": "Linux",
       "database_os": "Linux",

frameworks/Haskell/yesod/benchmark_config.json

@@ -15,6 +15,7 @@
       "database": "MySQL",
       "framework": "yesod",
       "language": "Haskell",
+      "flavor": "GHC710",
       "orm": "Raw",
       "platform": "Wai",
       "webserver": "Warp",
@@ -34,6 +35,7 @@
       "database": "MongoDB",
       "framework": "yesod",
       "language": "Haskell",
+      "flavor": "GHC710",
       "orm": "Raw",
       "platform": "Wai",
       "webserver": "Warp",

frameworks/Java/activeweb/benchmark_config.json

@@ -13,11 +13,12 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "activeweb",
+      "framework": "ActiveWeb",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Micro",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ActiveWeb",
@@ -34,11 +35,12 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "activeweb",
+      "framework": "ActiveWeb",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Micro",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "ActiveWeb",

frameworks/Java/baratine/benchmark_config.json

@@ -6,17 +6,17 @@
       "json_url": "/json",
       "plaintext_url": "/plaintext",
       "port": 8080,
-      "approach": "Realistic",
+      "approach": "Stripped",
       "classification": "Platform",
       "database": "None",
-      "framework": "baratine",
+      "framework": "None",
       "language": "Java",
       "orm": "Raw",
-      "platform": "Baratine",
-      "webserver": "Baratine",
+      "platform": "None",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "baratine",
+      "display_name": "Baratine",
       "notes": "",
       "versus": "baratine"
     }

frameworks/Java/bayou/benchmark_config.json

@@ -6,13 +6,14 @@
             "json_url": "/json",
             "plaintext_url": "/plaintext",
             "port": 8080,
-            "approach": "Realistic",
+            "approach": "Stripped",
             "classification": "Platform",
             "database": "None",
-            "framework": "bayou.io",
+            "framework": "None",
             "language": "Java",
+            "flavor": "Java8",
             "orm": "Raw",
-            "platform": "bayou.io",
+            "platform": "None",
             "webserver": "None",
             "os": "Linux",
             "database_os": "Linux",

frameworks/Java/beyondj/benchmark_config.json

@@ -13,8 +13,9 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "beyondj",
+      "framework": "BeyondJ",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Full",
       "platform": "Servlet",
       "webserver": "None",

frameworks/Java/comsat-servlet/benchmark_config.json

@@ -10,14 +10,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "None",
-        "framework": "comsat-servlet",
+        "framework": "None",
         "language": "Java",
+        "flavor": "Java8",
         "orm": "Raw",
-        "platform": "Comsat Servlet",
-        "webserver": "Undertow",
+        "platform": "Servlet",
+        "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "comsat-servlet-undertow",
+        "display_name": "Comsat",
         "notes": "Comsat servlet on embedded Undertow",
         "versus": ""
       }

frameworks/Java/comsat-webactors/benchmark_config.json

@@ -10,14 +10,15 @@
         "approach": "Realistic",
         "classification": "Platform",
         "database": "None",
-        "framework": "comsat-webactors",
+        "framework": "None",
         "language": "Java",
+        "flavor": "Java8",
         "orm": "Raw",
-        "platform": "Comsat Web Actors",
-        "webserver": "Undertow",
+        "platform": "WebActors",
+        "webserver": "None",
         "os": "Linux",
         "database_os": "Linux",
-        "display_name": "comsat-actors-netty",
+        "display_name": "Comsat",
         "notes": "Comsat Web Actors run as Netty handler",
         "versus": ""
       }

frameworks/Java/curacao/benchmark_config.json

@@ -7,16 +7,17 @@
       "plaintext_url": "/curacao/plaintext",
       "port": 8080,
       "approach": "Realistic",
-      "classification": "Platform",
+      "classification": "Micro",
       "database": "None",
-      "framework": "curacao",
+      "framework": "Curacao",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "platform": "Servlet",
-      "webserver": "Resin",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "curacao",
+      "display_name": "Curacao",
       "notes": "",
       "versus": "servlet"
     }

frameworks/Java/dropwizard/benchmark_config.json

@@ -13,14 +13,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "MySQL",
-      "framework": "dropwizard",
+      "framework": "Dropwizard",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Full",
-      "platform": "Jetty",
-      "webserver": "Jetty",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "dropwizard",
+      "display_name": "Dropwizard",
       "notes": "dropwizard mysql using hibernate",
       "versus": "servlet"
     },
@@ -36,12 +37,13 @@
       "database": "MongoDB",
       "framework": "dropwizard",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Full",
-      "platform": "Jetty",
-      "webserver": "Jetty",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "dropwizard",
+      "display_name": "Dropwizard",
       "notes": "dropwizard mongodb using mongojack",
       "versus": ""
     },
@@ -57,9 +59,10 @@
       "database": "Postgres",
       "framework": "dropwizard",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Full",
-      "platform": "Jetty",
-      "webserver": "Jetty",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
       "display_name": "dropwizard",

frameworks/Java/gemini/benchmark_config.json

@@ -9,14 +9,15 @@
       "approach": "Realistic",
       "classification": "Fullstack",
       "database": "None",
-      "framework": "gemini",
+      "framework": "Gemini",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Micro",
       "platform": "Servlet",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "gemini",
+      "display_name": "Gemini",
       "notes": "",
       "versus": "servlet"
     },
@@ -32,12 +33,13 @@
       "database": "MySQL",
       "framework": "gemini",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Micro",
       "platform": "Servlet",
       "webserver": "Resin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "gemini-mysql",
+      "display_name": "Gemini",
       "notes": "",
       "versus": "servlet"
     },
@@ -53,12 +55,13 @@
       "database": "Postgres",
       "framework": "gemini",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Micro",
       "platform": "Servlet",
       "webserver": "Resin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "gemini-postgres",
+      "display_name": "Gemini",
       "notes": "",
       "versus": "servlet"
     }   

frameworks/Java/grizzly-bm/benchmark_config.json

@@ -9,14 +9,15 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "None",
-      "framework": "grizzly",
+      "framework": "Grizzly",
       "language": "Java",
+      "flavor": "Java8",
       "orm": "Raw",
       "platform": "Servlet",
-      "webserver": "Grizzly",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "grizzly",
+      "display_name": "Grizzly",
       "notes": "",
       "versus": ""
     }

frameworks/Java/grizzly-jersey/benchmark_config.json

@@ -11,16 +11,16 @@
       "approach": "Realistic",
       "classification": "Micro",
       "database": "MySQL",
-      "framework": "grizzly-jersey",
+      "framework": "Grizzly",
       "language": "Java",
       "orm": "Full",
-      "platform": "Servlet",
-      "webserver": "Grizzly",
+      "platform": "JAX-RS",
+      "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "grizzly-jersey",
+      "display_name": "Grizzly",
       "notes": "",
-      "versus": "grizzly"
+      "versus": ""
     }
   }]
 }