diff --git a/src/www/views/contact_view/support_form/index.spec.ts b/src/www/views/contact_view/support_form/index.spec.ts
index f4a5a5964d4..d413114f149 100644
--- a/src/www/views/contact_view/support_form/index.spec.ts
+++ b/src/www/views/contact_view/support_form/index.spec.ts
@@ -34,15 +34,15 @@ describe('SupportForm', () => {
   it('shows correct fields for the client variant', async () => {
     const el = await fixture(html` <support-form variant="client"></support-form> `);
 
-    expect(el.shadowRoot!.querySelector('mwc-textfield[name="Where_did_you_get_your_access_key"]')).not.toBeNull();
-    expect(el.shadowRoot!.querySelector('mwc-select[name="Cloud_Provider"]')).toBeNull();
+    expect(el.shadowRoot!.querySelector('mwc-textfield[name="source"]')).not.toBeNull();
+    expect(el.shadowRoot!.querySelector('mwc-select[name="cloudProvider"]')).toBeNull();
   });
 
   it('shows correct fields for the manager variant', async () => {
     const el = await fixture(html` <support-form variant="manager"></support-form> `);
 
-    expect(el.shadowRoot!.querySelector('mwc-textfield[name="Where_did_you_get_your_access_key"]')).toBeNull();
-    expect(el.shadowRoot!.querySelector('mwc-select[name="Cloud_Provider"]')).not.toBeNull();
+    expect(el.shadowRoot!.querySelector('mwc-textfield[name="source"]')).toBeNull();
+    expect(el.shadowRoot!.querySelector('mwc-select[name="cloudProvider"]')).not.toBeNull();
   });
 
   it('submit button is disabled by default', async () => {
@@ -60,9 +60,7 @@ describe('SupportForm', () => {
 
       const emailInput: HTMLInputElement = el.shadowRoot!.querySelector('mwc-textfield[name="email"')!;
       await setValue(emailInput, 'foo@bar.com');
-      const accessKeySourceInput: HTMLInputElement = el.shadowRoot!.querySelector(
-        'mwc-textfield[name="Where_did_you_get_your_access_key"'
-      )!;
+      const accessKeySourceInput: HTMLInputElement = el.shadowRoot!.querySelector('mwc-textfield[name="source"')!;
       await setValue(accessKeySourceInput, 'From a friend');
       const subjectInput: HTMLInputElement = el.shadowRoot!.querySelector('mwc-textfield[name="subject"')!;
       await setValue(subjectInput, 'Test Subject');
diff --git a/src/www/views/contact_view/support_form/index.ts b/src/www/views/contact_view/support_form/index.ts
index a54e55da3a2..de835d934e2 100644
--- a/src/www/views/contact_view/support_form/index.ts
+++ b/src/www/views/contact_view/support_form/index.ts
@@ -139,7 +139,7 @@ export class SupportForm extends LitElement {
 
     return html`
       <mwc-select
-        name="Cloud_Provider"
+        name="cloudProvider"
         label="Cloud provider"
         helper="Which cloud provider does this relate to?"
         helperPersistent
@@ -164,7 +164,7 @@ export class SupportForm extends LitElement {
 
     return html`
       <mwc-textfield
-        name="Where_did_you_get_your_access_key"
+        name="source"
         label="source"
         helper="Where did you get your access key?"
         helperPersistent