diff --git a/client/src/components/Form/FormDisplay.vue b/client/src/components/Form/FormDisplay.vue
index 1fb99241e32..09ccc043a2d 100644
--- a/client/src/components/Form/FormDisplay.vue
+++ b/client/src/components/Form/FormDisplay.vue
@@ -17,7 +17,7 @@
 <script>
 import Vue from "vue";
 import FormInputs from "./FormInputs";
-import { visitInputs, validateInputs, matchErrors } from "./utilities";
+import { visitInputs, validateInputs, matchInputs } from "./utilities";
 export default {
     components: {
         FormInputs,
@@ -185,7 +185,7 @@ export default {
         onErrors() {
             this.resetErrors();
             if (this.errors) {
-                const errorMessages = matchErrors(this.formIndex, this.errors);
+                const errorMessages = matchInputs(this.formIndex, this.errors);
                 for (const inputId in errorMessages) {
                     this.setError(inputId, errorMessages[inputId]);
                 }
@@ -193,7 +193,7 @@ export default {
         },
         onWarnings() {
             if (this.warnings) {
-                const warningMessages = matchErrors(this.formIndex, this.warnings);
+                const warningMessages = matchInputs(this.formIndex, this.warnings);
                 for (const inputId in warningMessages) {
                     this.setWarning(inputId, warningMessages[inputId]);
                 }
diff --git a/client/src/components/Form/utilities.js b/client/src/components/Form/utilities.js
index 0e3d1d07bff..aff9fa2ba0b 100644
--- a/client/src/components/Form/utilities.js
+++ b/client/src/components/Form/utilities.js
@@ -71,11 +71,11 @@ export function matchCase(input, value) {
     return -1;
 }
 
-/** Match server validation response to highlight errors
+/** Match server validation response to highlight inputs
  * @param{dict}   index     - Index of input elements
- * @param{dict}   response  - Nested dictionary with error messages
+ * @param{dict}   response  - Nested dictionary with error/warning messages
  */
-export function matchErrors(index, response) {
+export function matchInputs(index, response) {
     var result = {};
     function search(id, head) {
         if (typeof head === "string") {
diff --git a/client/src/components/Form/utilities.test.js b/client/src/components/Form/utilities.test.js
index 783b11629a8..9b2084ed3b2 100644
--- a/client/src/components/Form/utilities.test.js
+++ b/client/src/components/Form/utilities.test.js
@@ -1,4 +1,4 @@
-import { visitInputs, validateInputs, matchCase, matchErrors } from "./utilities";
+import { visitInputs, validateInputs, matchCase, matchInputs } from "./utilities";
 import toolModel from "./test-data/tool";
 
 function visitInputsString(inputs) {
@@ -129,7 +129,7 @@ describe("form component utilities", () => {
             input_b: ["error_b"],
             input_c: { input_d: "error_d" },
         };
-        const result = matchErrors(index, values);
+        const result = matchInputs(index, values);
         expect(result["input_a"]).toEqual("error_a");
         expect(result["input_b_0"]).toEqual("error_b");
         expect(result["input_c|input_d"]).toEqual("error_d");