diff --git a/dist/workflow-step-template-schema.json b/dist/workflow-step-template-schema.json
index c90c276b..263bda84 100644
--- a/dist/workflow-step-template-schema.json
+++ b/dist/workflow-step-template-schema.json
@@ -2099,7 +2099,6 @@
                                                     "dashboard",
                                                     "export",
                                                     "measurement",
-                                                    "sample",
                                                     "workflow_step_template",
                                                     "workflow_template"
                                                 ]
@@ -2136,7 +2135,7 @@
                                 "id": "workflow_run.data.id",
                                 "type": "workflow_run",
                                 "attributes": {
-                                    "title": "sampleField.name"
+                                    "title": "deviceField.name"
                                 }
                             }
                         },
@@ -3933,7 +3932,6 @@
                             "users",
                             "devices",
                             "measurements",
-                            "samples",
                             "channels",
                             "collections",
                             "attachments"
@@ -4234,7 +4232,6 @@
                 "ports",
                 "protonotifications",
                 "roles",
-                "samples",
                 "smart_views",
                 "users",
                 "versions",
diff --git a/dist/workflow-template-schema.json b/dist/workflow-template-schema.json
index 94605144..c7368977 100644
--- a/dist/workflow-template-schema.json
+++ b/dist/workflow-template-schema.json
@@ -3251,7 +3251,6 @@
                                                     "dashboard",
                                                     "export",
                                                     "measurement",
-                                                    "sample",
                                                     "workflow_step_template",
                                                     "workflow_template"
                                                 ]
@@ -3288,7 +3287,7 @@
                                 "id": "workflow_run.data.id",
                                 "type": "workflow_run",
                                 "attributes": {
-                                    "title": "sampleField.name"
+                                    "title": "deviceField.name"
                                 }
                             }
                         },
@@ -4554,7 +4553,6 @@
                             "users",
                             "devices",
                             "measurements",
-                            "samples",
                             "channels",
                             "collections",
                             "attachments"
@@ -4850,7 +4848,6 @@
                 "ports",
                 "protonotifications",
                 "roles",
-                "samples",
                 "smart_views",
                 "users",
                 "versions",
diff --git a/src/__tests__/fixtures/workflow_templates/example.yml b/src/__tests__/fixtures/workflow_templates/example.yml
index 87af5920..f47437db 100644
--- a/src/__tests__/fixtures/workflow_templates/example.yml
+++ b/src/__tests__/fixtures/workflow_templates/example.yml
@@ -86,9 +86,9 @@ steps:
 
             ![music](https://source.unsplash.com/600x400/?music)
     fields:
-      sample:
+      device:
         type: relationship
-        resourceType: samples
+        resourceType: devices
       target:
         type: quantity
         unit: mg
@@ -96,7 +96,7 @@ steps:
         type: quantity
         unit: mg
     substeps:
-      - primary: Place the {{sample}} on the balance.
+      - primary: Tare the balance {{device}}.
         description: |
           Your fancy markdown body with formatting, images and what not else!
         confirm: true
diff --git a/src/schemata/definitions/field-schema/relationship.yml b/src/schemata/definitions/field-schema/relationship.yml
index 825d21df..c4a9f3b3 100755
--- a/src/schemata/definitions/field-schema/relationship.yml
+++ b/src/schemata/definitions/field-schema/relationship.yml
@@ -14,7 +14,6 @@ properties:
       - users
       - devices
       - measurements
-      - samples
       - channels
       - collections
       - attachments
diff --git a/src/schemata/definitions/resource-tag.yml b/src/schemata/definitions/resource-tag.yml
index 6813664d..c0cb12f0 100644
--- a/src/schemata/definitions/resource-tag.yml
+++ b/src/schemata/definitions/resource-tag.yml
@@ -21,7 +21,6 @@ enum:
   - ports
   - protonotifications
   - roles
-  - samples
   - smart_views
   - users
   - versions
diff --git a/src/schemata/definitions/workflow-template/action-objects/update-resource.yml b/src/schemata/definitions/workflow-template/action-objects/update-resource.yml
index 9109d9b8..fa4eef2e 100644
--- a/src/schemata/definitions/workflow-template/action-objects/update-resource.yml
+++ b/src/schemata/definitions/workflow-template/action-objects/update-resource.yml
@@ -67,7 +67,6 @@ additionalProperties:
                 - dashboard
                 - export
                 - measurement
-                - sample
                 - workflow_step_template
                 - workflow_template
             attributes:
@@ -85,7 +84,7 @@ examples:
       id: workflow_run.data.id
       type: workflow_run
       attributes:
-        title: sampleField.name
+        title: deviceField.name
   - update_resource:
       id: balance.id
       type: device
diff --git a/src/workflow-step-template-schema.json b/src/workflow-step-template-schema.json
index 8ed1b1d0..6b69e2d0 100644
--- a/src/workflow-step-template-schema.json
+++ b/src/workflow-step-template-schema.json
@@ -2099,7 +2099,6 @@
                           "dashboard",
                           "export",
                           "measurement",
-                          "sample",
                           "workflow_step_template",
                           "workflow_template"
                         ]
@@ -2136,7 +2135,7 @@
                 "id": "workflow_run.data.id",
                 "type": "workflow_run",
                 "attributes": {
-                  "title": "sampleField.name"
+                  "title": "deviceField.name"
                 }
               }
             },
@@ -3933,7 +3932,6 @@
               "users",
               "devices",
               "measurements",
-              "samples",
               "channels",
               "collections",
               "attachments"
@@ -4234,7 +4232,6 @@
         "ports",
         "protonotifications",
         "roles",
-        "samples",
         "smart_views",
         "users",
         "versions",
diff --git a/src/workflow-template-schema.json b/src/workflow-template-schema.json
index 47144d8f..50b07235 100644
--- a/src/workflow-template-schema.json
+++ b/src/workflow-template-schema.json
@@ -3251,7 +3251,6 @@
                           "dashboard",
                           "export",
                           "measurement",
-                          "sample",
                           "workflow_step_template",
                           "workflow_template"
                         ]
@@ -3288,7 +3287,7 @@
                 "id": "workflow_run.data.id",
                 "type": "workflow_run",
                 "attributes": {
-                  "title": "sampleField.name"
+                  "title": "deviceField.name"
                 }
               }
             },
@@ -4554,7 +4553,6 @@
               "users",
               "devices",
               "measurements",
-              "samples",
               "channels",
               "collections",
               "attachments"
@@ -4850,7 +4848,6 @@
         "ports",
         "protonotifications",
         "roles",
-        "samples",
         "smart_views",
         "users",
         "versions",