Set defaults tests, clean up Ruby display names

Squashed commit of the following:

commit 98c683a788069477fd71be2ce98d080d46927098
Author: Brittany Mazza <[email protected]>
Date:   Tue Mar 3 11:49:17 2015 -0800

    Set default tests

commit 271d3f3fb4adf9970e0f3f9263328ffbb352f8ea
Author: Brittany Mazza <[email protected]>
Date:   Tue Mar 3 10:13:58 2015 -0800

    Add back missing e in java-ebean-hikaricp test name

commit 9eea7b2fad072f84da54cb3e053bc7262d273f5f
Author: Brittany Mazza <[email protected]>
Date:   Mon Mar 2 16:09:24 2015 -0800

    keep default in name for consistency

commit d6923a222c6ab5af642d5571aa0fabb33e76c70b
Author: Brittany Mazza <[email protected]>
Date:   Mon Mar 2 16:07:55 2015 -0800

    Define a default test

commit fc6254b11c4aeac7c2cabe824b5130a516eff0a4
Author: Brittany Mazza <[email protected]>
Date:   Mon Mar 2 15:40:43 2015 -0800

    Set a default test and match test names for ruby frameworks

commit 2bdc6ea54d968a42acff988c938b387d32de64de
Author: Brittany Mazza <[email protected]>
Date:   Mon Mar 2 15:29:56 2015 -0800

    Make java default play2 test

commit 49861c7864e2976b18e43b8fccf3390f6df91f95
Author: Brittany Mazza <[email protected]>
Date:   Mon Mar 2 15:10:38 2015 -0800

    Update default display name to specify webserver

commit 9f762bd2620681a315408adda490c36d16c29c26
Author: Brittany Mazza <[email protected]>
Date:   Mon Mar 2 15:06:58 2015 -0800

    Clean up test names, spcify default name

commit 6371f2359f02d1274a1be4749c49d49334eb0192
Author: Brittany Mazza <[email protected]>
Date:   Mon Mar 2 15:05:22 2015 -0800

    Clean up test names, spcify default name

frameworks/CSharp/servicestack/benchmark_config

@@ -1,7 +1,7 @@
 {
   "framework": "servicestack",
   "tests": [{
-    "iis-default": {
+    "default": {
       "setup_file": "setup_iis",
       "json_url": "/json",
       "plaintext_url": "/plaintext",

frameworks/Dart/dart-redstone/benchmark_config

@@ -1,7 +1,7 @@
 {
   "framework": "redstone",
   "tests": [{
-    "postgresql": {
+    "default": {
       "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/pg/db",

frameworks/Dart/dart-start/benchmark_config

@@ -1,7 +1,7 @@
 {
   "framework": "start",
   "tests": [{
-    "postgresql-raw": {
+    "default": { 
       "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",

frameworks/Dart/dart-stream/benchmark_config

@@ -1,7 +1,7 @@
 {
   "framework": "stream",
   "tests": [{
-    "postgresql-raw": {
+    "default": {
       "setup_file": "setup",
       "json_url": "/json",
       "db_url": "/db",

frameworks/Java/play2-java/benchmark_config

@@ -2,7 +2,7 @@
   "framework": "play2", 
   "tests": [
     {
-      "java": {
+      "default": {
         "display_name": "play2-java", 
         "setup_file": "setup_java", 
         "framework": "play2", 

frameworks/Java/wildfly-ee7/benchmark_config

@@ -1,7 +1,7 @@
 {
   "framework": "wildfly-ee7",
   "tests": [{
-    "mysql" : {
+    "default" : {
       "setup_file": "setup",
       "json_url": "/wildfly-ee7/rest/json",
       "plaintext_url": "/wildfly-ee7/rest/plaintext",

frameworks/PHP/php-yaf/benchmark_config

@@ -1,7 +1,7 @@
 {
   "framework": "yaf",
   "tests": [{
-    "raw": {
+    "default": {
       "setup_file": "setup",
       "json_url": "/bench/raw/json",
       "db_url": "/bench/raw/db",

frameworks/Python/pyramid/benchmark_config

@@ -1,8 +1,8 @@
 {
   "framework": "pyramid",
   "tests": [{
-    "py2": {
-      "setup_file": "setup_py2",
+    "default": {
+      "setup_file": "setup_py3",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -20,12 +20,12 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "pyramid-py2",
+      "display_name": "pyramid-py3",
       "notes": "",
       "versus": "wsgi"
     },
-    "py3": {
-      "setup_file": "setup_py3",
+    "py2": {
+      "setup_file": "setup_py2",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -43,7 +43,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "pyramid-py3",
+      "display_name": "pyramid-py2",
       "notes": "",
       "versus": "wsgi"
     }

frameworks/Ruby/grape/benchmark_config

@@ -1,8 +1,8 @@
 {
   "framework": "grape",
   "tests": [{
-    "jruby-puma": {
-      "setup_file": "run_jruby_puma",
+    "default": {
+      "setup_file": "run_mri_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/query?queries=", 
@@ -15,16 +15,16 @@
       "framework": "grape",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "JRuby",
+      "platform": "Rack",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "puma-jruby-grape",
+      "display_name": "grape-puma-mri",
       "notes": "",
-      "versus": "rack-puma-jruby"
-    },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
+      "versus": "rack-puma"
+    }, 
+    "puma-jruby": {
+      "setup_file": "run_jruby_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/query?queries=", 
@@ -37,16 +37,16 @@
       "framework": "grape",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rubinius",
+      "platform": "JRuby",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "puma-rbx-grape",
+      "display_name": "grape-puma-jruby",
       "notes": "",
-      "versus": "rack-puma-rbx"
+      "versus": "rack-puma-jruby"
     },
-    "ruby-puma": {
-      "setup_file": "run_mri_puma",
+    "puma-rbx": {
+      "setup_file": "run_rbx_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/query?queries=", 
@@ -59,14 +59,14 @@
       "framework": "grape",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rack",
+      "platform": "Rubinius",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "puma-mri-grape",
+      "display_name": "grape-puma-rbx",
       "notes": "",
-      "versus": "rack-puma"
-    },  
+      "versus": "rack-puma-rbx"
+    }, 
     "thin": {
       "setup_file": "run_thin",
       "json_url": "/json",
@@ -85,11 +85,11 @@
       "webserver": "Thin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "thin-grape",
+      "display_name": "grape-thin",
       "notes": "",
       "versus": "rack-thin"
     },  
-    "torqbox": {
+    "torqbox-jruby": {
       "setup_file": "run_torqbox",
       "json_url": "/json",
       "db_url": "/db", 
@@ -107,11 +107,11 @@
       "webserver": "TorqBox",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "torqbox-grape",
+      "display_name": "grape-torqbox-jruby",
       "notes": "",
       "versus": "rack-torqbox"
     },  
-    "trinidad": {
+    "trinidad-jruby": {
       "setup_file": "run_trinidad",
       "json_url": "/json",
       "db_url": "/db", 
@@ -129,7 +129,7 @@
       "webserver": "Trinidad",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "trinidad-grape",
+      "display_name": "grape-trinidad-jruby",
       "notes": "",
       "versus": "rack-trinidad"
     },  
@@ -151,7 +151,7 @@
       "webserver": "Unicorn",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "unicorn-grape",
+      "display_name": "grape-unicorn",
       "notes": "",
       "versus": "rack-unicorn"
     } 

frameworks/Ruby/padrino/benchmark_config

@@ -1,8 +1,8 @@
 {
   "framework": "padrino",
   "tests": [{
-    "jruby-puma": {
-      "setup_file": "run_jruby_puma",
+    "default": {
+      "setup_file": "run_mri_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -16,16 +16,16 @@
       "framework": "padrino",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "JRuby",
+      "platform": "Rack",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "jruby-padrino",
+      "display_name": "padrino-puma-mri",
       "notes": "",
-      "versus": "rack-jruby"
+      "versus": "rack-puma"
     },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
+    "puma-jruby": {
+      "setup_file": "run_jruby_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -39,16 +39,16 @@
       "framework": "padrino",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rubinius",
+      "platform": "JRuby",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rbx-padrino",
+      "display_name": "padrino-jruby",
       "notes": "",
-      "versus": "rack-rbx"
+      "versus": "rack-jruby"
     },
-    "torqbox": {
-      "setup_file": "run_torqbox",
+    "puma-rbx": {
+      "setup_file": "run_rbx_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -62,16 +62,16 @@
       "framework": "padrino",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "JRuby",
-      "webserver": "TorqBox",
+      "platform": "Rubinius",
+      "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "torqbox-padrino",
+      "display_name": "padrino-rbx",
       "notes": "",
-      "versus": "rack-torqbox"
+      "versus": "rack-rbx"
     },
-    "trinidad": {
-      "setup_file": "run_trinidad",
+    "torqbox-jruby": {
+      "setup_file": "run_torqbox",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -86,15 +86,15 @@
       "language": "Ruby",
       "orm": "Full",
       "platform": "JRuby",
-      "webserver": "Trinidad",
+      "webserver": "TorqBox",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "trinidad-padrino",
+      "display_name": "padrino-torqbox-jruby",
       "notes": "",
-      "versus": "rack-trinidad"
+      "versus": "rack-torqbox"
     },
-    "ruby-puma": {
-      "setup_file": "run_mri_puma",
+    "trinidad-jruby": {
+      "setup_file": "run_trinidad",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -108,13 +108,13 @@
       "framework": "padrino",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rack",
-      "webserver": "Puma",
+      "platform": "JRuby",
+      "webserver": "Trinidad",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "puma-padrino",
+      "display_name": "padrino-trinidad-jruby",
       "notes": "",
-      "versus": "rack-puma"
+      "versus": "rack-trinidad"
     },
     "thin": {
       "setup_file": "run_thin",
@@ -135,7 +135,7 @@
       "webserver": "Thin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "thin-padrino",
+      "display_name": "padrino-thin",
       "notes": "",
       "versus": "rack-thin"
     },
@@ -158,7 +158,7 @@
       "webserver": "Unicorn",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "unicorn-padrino",
+      "display_name": "padrino-unicorn",
       "notes": "",
       "versus": "rack-unicorn"
     }

frameworks/Ruby/rack/benchmark_config

@@ -1,8 +1,8 @@
 {
   "framework": "rack",
   "tests": [{
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
+    "default": {
+      "setup_file": "run_mri_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -15,15 +15,15 @@
       "framework": "rack",
       "language": "Ruby",
       "orm": "Raw",
-      "platform": "JRuby",
+      "platform": "Rack",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rack",
+      "display_name": "rack-puma-mri",
       "notes": ""
     },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
+    "puma-jruby": {
+      "setup_file": "run_jruby_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -36,15 +36,15 @@
       "framework": "rack",
       "language": "Ruby",
       "orm": "Raw",
-      "platform": "Rubinius",
+      "platform": "JRuby",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rack-rbx",
+      "display_name": "rack-puma-jruby",
       "notes": ""
     },
-    "puma": {
-      "setup_file": "run_mri_puma",
+    "puma-rbx": {
+      "setup_file": "run_rbx_puma",
       "json_url": "/json",
       "db_url": "/db", 
       "query_url": "/queries?queries=", 
@@ -57,11 +57,11 @@
       "framework": "rack",
       "language": "Ruby",
       "orm": "Raw",
-      "platform": "Rack",
+      "platform": "Rubinius",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rack",
+      "display_name": "rack-puma-rbx",
       "notes": ""
     },
     "thin": {
@@ -82,10 +82,10 @@
       "webserver": "Thin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rack",
+      "display_name": "rack-thin",
       "notes": ""
     },
-    "torqbox": {
+    "torqbox-jruby": {
       "setup_file": "run_torqbox",
       "json_url": "/json",
       "db_url": "/db", 
@@ -103,10 +103,10 @@
       "webserver": "TorqBox",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rack",
+      "display_name": "rack-torqbox-jruby",
       "notes": ""
     },
-    "trinidad": {
+    "trinidad-jruby": {
       "setup_file": "run_trinidad",
       "json_url": "/json",
       "db_url": "/db", 
@@ -124,7 +124,7 @@
       "webserver": "Trinidad",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rack",
+      "display_name": "rack-trinidad-jruby",
       "notes": ""
     },
     "unicorn": {
@@ -145,7 +145,7 @@
       "webserver": "Unicorn",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rack",
+      "display_name": "rack-unicorn",
       "notes": ""
     }
   }]

frameworks/Ruby/rails-stripped/benchmark_config

@@ -1,7 +1,7 @@
 {
   "framework": "rails-stripped",
   "tests": [{
-    "ruby": {
+    "default": {
       "setup_file": "setup_ruby",
       "json_url": "/hello_world/json",
       "db_url": "/hello_world/db",
@@ -17,7 +17,7 @@
       "webserver": "Unicorn",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rails",
+      "display_name": "rails-ruby",
       "notes": "",
       "versus": "rack-unicorn"
     },
@@ -37,7 +37,7 @@
       "webserver": "TorqBox",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "rails",
+      "display_name": "rails-jruby",
       "notes": "",
       "versus": "rack-torqbox"
     }

frameworks/Ruby/rails/benchmark_config

@@ -1,8 +1,8 @@
 {
   "framework": "rails",
   "tests": [{
-    "jruby-puma": {
-      "setup_file": "run_jruby_puma",
+    "default": {
+      "setup_file": "run_mri_puma",
       "json_url": "/hello_world/json",
       "db_url": "/hello_world/db",
       "query_url": "/hello_world/query?queries=",
@@ -16,16 +16,16 @@
       "framework": "rails",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "JRuby",
+      "platform": "Rack",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "puma-jruby-rails",
+      "display_name": "rails-puma-mri",
       "notes": "",
-      "versus": "rack-puma-jruby"
+      "versus": "rack-puma"
     },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
+    "puma-jruby": {
+      "setup_file": "run_jruby_puma",
       "json_url": "/hello_world/json",
       "db_url": "/hello_world/db",
       "query_url": "/hello_world/query?queries=",
@@ -39,16 +39,16 @@
       "framework": "rails",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rubinius",
+      "platform": "JRuby",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "puma-rbx-rails",
+      "display_name": "rails-puma-jruby",
       "notes": "",
-      "versus": "rack-puma-rbx"
+      "versus": "rack-puma-jruby"
     },
-    "ruby-puma": {
-      "setup_file": "run_mri_puma",
+    "puma-rbx": {
+      "setup_file": "run_rbx_puma",
       "json_url": "/hello_world/json",
       "db_url": "/hello_world/db",
       "query_url": "/hello_world/query?queries=",
@@ -62,13 +62,13 @@
       "framework": "rails",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rack",
+      "platform": "Rubinius",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "puma-mri-rails",
+      "display_name": "rails-puma-rbx",
       "notes": "",
-      "versus": "rack-puma"
+      "versus": "rack-puma-rbx"
     },
     "thin": {
       "setup_file": "run_thin",
@@ -89,11 +89,11 @@
       "webserver": "Thin",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "thin-rails",
+      "display_name": "rails-thin",
       "notes": "",
       "versus": "rack-thin"
     },
-    "torqbox": {
+    "torqbox-jruby": {
       "setup_file": "run_torqbox",
       "json_url": "/hello_world/json",
       "db_url": "/hello_world/db",
@@ -112,11 +112,11 @@
       "webserver": "TorqBox",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "torqbox-rails",
+      "display_name": "rails-torqbox-jruby",
       "notes": "",
-      "versus": "rack-torqbox"
+      "versus": "rack-torqbox-jruby"
     },
-    "trinidad": {
+    "trinidad-jruby": {
       "setup_file": "run_trinidad",
       "json_url": "/hello_world/json",
       "db_url": "/hello_world/db",
@@ -135,9 +135,9 @@
       "webserver": "Trinidad",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "trinidad-rails",
+      "display_name": "rails-trinidad-jruby",
       "notes": "",
-      "versus": "rack-trinidad"
+      "versus": "rack-trinidad-jruby"
     },
     "unicorn": {
       "setup_file": "run_unicorn",
@@ -158,7 +158,7 @@
       "webserver": "Unicorn",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "unicorn-rails",
+      "display_name": "rails-unicorn",
       "notes": "",
       "versus": "rack-unicorn"
     }

frameworks/Ruby/sinatra/benchmark_config

@@ -1,8 +1,8 @@
 {
   "framework": "sinatra",
   "tests": [{
-    "puma-jruby": {
-      "setup_file": "run_jruby_puma",
+    "default": {
+      "setup_file": "run_mri_puma",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -16,16 +16,16 @@
       "framework": "sinatra",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "JRuby",
+      "platform": "Rack",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "sinatra-jruby-puma",
+      "display_name": "sinatra-puma-mri",
       "notes": "",
-      "versus": "rack-jruby-puma"
+      "versus": "rack-puma"
     },
-    "puma-rbx": {
-      "setup_file": "run_rbx_puma",
+    "puma-jruby": {
+      "setup_file": "run_jruby_puma",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -39,16 +39,16 @@
       "framework": "sinatra",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rubinius",
+      "platform": "JRuby",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "sinatra-rbx-puma",
+      "display_name": "sinatra-puma-jruby",
       "notes": "",
-      "versus": "rack-rbx-puma"
+      "versus": "rack-puma-jruby"
     },
-    "puma": {
-      "setup_file": "run_mri_puma",
+    "puma-rbx": {
+      "setup_file": "run_rbx_puma",
       "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
@@ -62,13 +62,13 @@
       "framework": "sinatra",
       "language": "Ruby",
       "orm": "Full",
-      "platform": "Rack",
+      "platform": "Rubinius",
       "webserver": "Puma",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "sinatra-puma",
+      "display_name": "sinatra-puma-rbx",
       "notes": "",
-      "versus": "rack-puma"
+      "versus": "rack-puma-rbx"
     },
     "thin": {
       "setup_file": "run_thin",
@@ -93,7 +93,7 @@
       "notes": "",
       "versus": "rack-thin"
     },
-    "torqbox": {
+    "torqbox-jruby": {
       "setup_file": "run_torqbox",
       "json_url": "/json",
       "db_url": "/db",
@@ -112,11 +112,11 @@
       "webserver": "TorqBox",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "sinatra-torqbox",
+      "display_name": "sinatra-torqbox-jruby",
       "notes": "",
-      "versus": "rack-torqbox"
+      "versus": "rack-torqbox-jruby"
     },
-    "trinidad": {
+    "trinidad-jruby": {
       "setup_file": "run_trinidad",
       "json_url": "/json",
       "db_url": "/db",
@@ -135,9 +135,9 @@
       "webserver": "Trinidad",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "sinatra-trinidad",
+      "display_name": "sinatra-trinidad-jruby",
       "notes": "",
-      "versus": "rack-trinidad"
+      "versus": "rack-trinidad-jruby"
     },
     "unicorn": {
       "setup_file": "run_unicorn",

frameworks/Scala/play2-scala/benchmark_config

@@ -1,8 +1,8 @@
 {
-  "framework": "play2", 
+  "framework": "play2-scala", 
   "tests": [
     {
-      "scala": {
+      "default": {
         "display_name": "play2-scala", 
         "setup_file": "setup_scala", 
         "framework": "play2", 
@@ -20,7 +20,7 @@
         "port": "9000", 
         "json_url": "/json"
       }, 
-      "scala-anorm-linux": {
+      "anorm-linux": {
         "display_name": "play2-scala-anorm-linux", 
         "setup_file": "setup_scala_anorm", 
         "framework": "play2", 
@@ -41,7 +41,7 @@
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
       }, 
-      "scala-anorm-windows": {
+      "anorm-windows": {
         "display_name": "play2-scala-anorm-windows", 
         "setup_file": "setup_scala_anorm", 
         "framework": "play2", 
@@ -62,7 +62,7 @@
         "fortune_url": "/fortunes", 
         "update_url": "/update?queries="
       }, 
-      "scala-slick": {
+      "slick": {
         "display_name": "play2-scala-slick", 
         "setup_file": "setup_scala_slick", 
         "framework": "play2",