diff --git a/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.golden b/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.golden
index 003b9df246d2f1..18f62cb3fa5991 100644
--- a/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.golden
+++ b/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.golden
@@ -1,3 +1,3 @@
 {
-    "error": "invalid request: workspace_image: cannot be blank; workspace_location: cannot be blank."
-}
\ No newline at end of file
+    "error": "invalid request: type: value 200 is out of range."
+}
diff --git a/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.json b/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.json
index b74c5edc864c33..bae7280a199e8f 100644
--- a/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.json
+++ b/components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.json
@@ -7,14 +7,14 @@
             "owner": "tester",
             "metaId": "foobar"
         },
-        "servicePrefix": "foobarservice",
+        "service_prefix": "foobarservice",
         "spec": {
             "ideImage": {
                 "webRef": "eu.gcr.io/gitpod-core-dev/buid/theia-ide:someversion"
             },
-            "workspaceImage": "eu.gcr.io/gitpod-dev/workspace-images/ac1c0755007966e4d6e090ea821729ac747d22ac/eu.gcr.io/gitpod-dev/workspace-base-images/github.com/typefox/gitpod:80a7d427a1fcd346d420603d80a31d57cf75a7af",
-            "checkoutLocation": "/",
-            "workspaceLocation": "/",
+            "workspace_image": "eu.gcr.io/gitpod-dev/workspace-images/ac1c0755007966e4d6e090ea821729ac747d22ac/eu.gcr.io/gitpod-dev/workspace-base-images/github.com/typefox/gitpod:80a7d427a1fcd346d420603d80a31d57cf75a7af",
+            "checkout_location": "/",
+            "workspace_location": "/",
             "initializer": {
                 "snapshot": {
                     "snapshot": "workspaces/cryptic-id-goes-herg/fd62804b-4cab-11e9-843a-4e645373048e.tar@gitpod-dev-user-christesting"
@@ -37,4 +37,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.golden b/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.golden
index 003b9df246d2f1..0967ef424bce67 100644
--- a/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.golden
+++ b/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.golden
@@ -1,3 +1 @@
-{
-    "error": "invalid request: workspace_image: cannot be blank; workspace_location: cannot be blank."
-}
\ No newline at end of file
+{}
diff --git a/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.json b/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.json
index 549e032a02453b..82f2438aa2cac5 100644
--- a/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.json
+++ b/components/ws-manager/pkg/manager/testdata/validateStartReq_valid.json
@@ -7,13 +7,13 @@
             "owner": "tester",
             "metaId": "foobar"
         },
-        "servicePrefix": "foobarservice",
+        "service_prefix": "foobarservice",
         "spec": {
             "ideImage": {
                 "webRef": "eu.gcr.io/gitpod-core-dev/buid/theia-ide:someversion"
             },
-            "workspaceImage": "eu.gcr.io/gitpod-dev/workspace-images/ac1c0755007966e4d6e090ea821729ac747d22ac/eu.gcr.io/gitpod-dev/workspace-base-images/github.com/typefox/gitpod:80a7d427a1fcd346d420603d80a31d57cf75a7af",
-            "workspaceLocation": "/",
+            "workspace_image": "eu.gcr.io/gitpod-dev/workspace-images/ac1c0755007966e4d6e090ea821729ac747d22ac/eu.gcr.io/gitpod-dev/workspace-base-images/github.com/typefox/gitpod:80a7d427a1fcd346d420603d80a31d57cf75a7af",
+            "workspace_location": "/",
             "initializer": {
                 "snapshot": {
                     "snapshot": "workspaces/cryptic-id-goes-herg/fd62804b-4cab-11e9-843a-4e645373048e.tar@gitpod-dev-user-christesting"
@@ -36,4 +36,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}