diff --git a/app/javascript/data/advancedFilterOptions.js b/app/javascript/data/advancedFilterOptions.js
index 07316b4d1..7662aab44 100644
--- a/app/javascript/data/advancedFilterOptions.js
+++ b/app/javascript/data/advancedFilterOptions.js
@@ -371,13 +371,14 @@ export const advancedFilterOptions = [
         title: 'product name',
         type: 'select',
         options: [
-          'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)',
-          'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+          'Moderna COVID-19 Vaccine (non-US Spikevax)',
+          'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
           'Janssen (J&J) COVID-19 Vaccine',
-          'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)',
-          'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)',
-          'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)',
-          'Unknown'],
+          'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)',
+          'Coronavac (Sinovac) COVID-19 Vaccine',
+          'Sinopharm (BIBP) COVID-19 Vaccine',
+          'Unknown',
+        ],
       },
       {
         name: 'administration-date',
diff --git a/config/vaccines.yml b/config/vaccines.yml
index 04002b302..a2a7ba3ab 100644
--- a/config/vaccines.yml
+++ b/config/vaccines.yml
@@ -6,12 +6,12 @@
     - system: 'http://hl7.org/fhir/sid/cvx'
       code: '213'
   vaccines:
-    - product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)'
+    - product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)'
       num_doses: 3
       product_codes:
         - system: 'http://hl7.org/fhir/sid/cvx'
           code: '207'
-    - product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)'
+    - product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)'
       num_doses: 3
       product_codes:
         - system: 'http://hl7.org/fhir/sid/cvx'
@@ -21,17 +21,17 @@
       product_codes:
         - system: 'http://hl7.org/fhir/sid/cvx'
           code: '212'
-    - product_name: 'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)'
+    - product_name: 'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)'
       num_doses: 3
       product_codes:
         - system: 'http://hl7.org/fhir/sid/cvx'
           code: '210'
-    - product_name: 'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)'
+    - product_name: 'Coronavac (Sinovac) COVID-19 Vaccine'
       num_doses: 3
       product_codes:
         - system: 'http://hl7.org/fhir/sid/cvx'
           code: '511'
-    - product_name: 'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)'
+    - product_name: 'Sinopharm (BIBP) COVID-19 Vaccine'
       num_doses: 3
       product_codes:
         - system: 'http://hl7.org/fhir/sid/cvx'
diff --git a/db/migrate/20210901192909_update_vaccine_product_names_to_match_cdc.rb b/db/migrate/20210901192909_update_vaccine_product_names_to_match_cdc.rb
new file mode 100644
index 000000000..ed64f911f
--- /dev/null
+++ b/db/migrate/20210901192909_update_vaccine_product_names_to_match_cdc.rb
@@ -0,0 +1,47 @@
+class UpdateVaccineProductNamesToMatchCdc < ActiveRecord::Migration[6.1]
+  def up
+    # Update all vaccine names which have changed
+    Vaccine.where(product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)').update_all(product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)')
+    Vaccine.where(product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)').update_all(product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)')
+    Vaccine.where(product_name: 'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)').update_all(product_name: 'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)')
+    Vaccine.where(product_name: 'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)').update_all(product_name: 'Coronavac (Sinovac) COVID-19 Vaccine')
+    Vaccine.where(product_name: 'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)').update_all(product_name: 'Sinopharm (BIBP) COVID-19 Vaccine')
+
+    # Update all saved user_export_presets
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)', 'Moderna COVID-19 Vaccine (non-US Spikevax)') WHERE config REGEXP 'Moderna'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)') WHERE config REGEXP 'Pfizer'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)', 'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)') WHERE config REGEXP 'AstraZeneca'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)', 'Coronavac (Sinovac) COVID-19 Vaccine') WHERE config REGEXP 'Coronavac'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)', 'Sinopharm (BIBP) COVID-19 Vaccine') WHERE config REGEXP 'Sinopharm'")).execute
+
+    # Update all saved user_filters
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)', 'Moderna COVID-19 Vaccine (non-US Spikevax)') WHERE contents REGEXP 'Moderna'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)') WHERE contents REGEXP 'Pfizer'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)', 'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)') WHERE contents REGEXP 'AstraZeneca'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)', 'Coronavac (Sinovac) COVID-19 Vaccine') WHERE contents REGEXP 'Coronavac'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)', 'Sinopharm (BIBP) COVID-19 Vaccine') WHERE contents REGEXP 'Sinopharm'")).execute
+  end
+
+  def down
+    # Revert the vaccine names which have changed
+    Vaccine.where(product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)').update_all(product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)')
+    Vaccine.where(product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)').update_all(product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)')
+    Vaccine.where(product_name: 'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)').update_all(product_name: 'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)')
+    Vaccine.where(product_name: 'Coronavac (Sinovac) COVID-19 Vaccine').update_all(product_name: 'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)')
+    Vaccine.where(product_name: 'Sinopharm (BIBP) COVID-19 Vaccine').update_all(product_name: 'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)')
+
+    # Revert the saved user_export_presets
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Moderna COVID-19 Vaccine (non-US Spikevax)', 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)') WHERE config REGEXP 'Moderna'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)') WHERE config REGEXP 'Pfizer'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Coronavac (Sinovac) COVID-19 Vaccine', 'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)') WHERE config REGEXP 'Coronovac'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'Sinopharm (BIBP) COVID-19 Vaccine', 'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)') WHERE config REGEXP 'Sinopharm'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_export_presets SET config = REPLACE(config, 'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)', 'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)') WHERE config REGEXP 'AstraZeneca'")).execute
+
+    # Revert the saved user_filter_presets
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Moderna COVID-19 Vaccine (non-US Spikevax)', 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)') WHERE contents REGEXP 'Moderna'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)') WHERE contents REGEXP 'Pfizer'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Coronavac (Sinovac) COVID-19 Vaccine', 'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)') WHERE contents REGEXP 'Coronovac'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'Sinopharm (BIBP) COVID-19 Vaccine', 'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)') WHERE contents REGEXP 'Sinopharm'")).execute
+    ActiveRecord::Base.connection.raw_connection.prepare(Arel.sql("UPDATE user_filters SET contents = REPLACE(contents, 'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)', 'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)') WHERE contents REGEXP 'AstraZeneca'")).execute
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a9ca45ad8..b182f1730 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2021_08_24_154651) do
+ActiveRecord::Schema.define(version: 2021_09_01_192909) do
 
   create_table "active_storage_attachments", charset: "utf8", force: :cascade do |t|
     t.string "name", null: false
diff --git a/docs/api/fhir-api-specification.md b/docs/api/fhir-api-specification.md
index 20c698010..b2a099951 100644
--- a/docs/api/fhir-api-specification.md
+++ b/docs/api/fhir-api-specification.md
@@ -2540,7 +2540,7 @@ Use this route to retrieve a FHIR Bundle containing the monitoree and all their
                 "code": "208"
               }
             ],
-            "text": "Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)"
+            "text": "Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)"
           }
         ],
         "patient": {
@@ -3303,7 +3303,7 @@ To create a new monitoree vaccination, simply POST a FHIR Immunization resource
           "code": "207"
         }
       ],
-      "text": "Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)"
+      "text": "Moderna COVID-19 Vaccine (non-US Spikevax)"
     }
   ],
   "patient": {
@@ -3768,7 +3768,7 @@ On success, the server will update the existing resource given the id.
           "code": "207"
         }
       ],
-      "text": "Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)"
+      "text": "Moderna COVID-19 Vaccine (non-US Spikevax)"
     }
   ],
   "patient": {
diff --git a/public/Sara Alert Import Format.xlsx b/public/Sara Alert Import Format.xlsx
index fea049bfe..171a2ea4f 100644
--- a/public/Sara Alert Import Format.xlsx	
+++ b/public/Sara Alert Import Format.xlsx	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecc01e2b471f0ff13d1bf0a06c8aca12e688eef6d4afc90213ee0e43ae7b86ad
-size 41286
+oid sha256:ec61c2d8589e620a5bd36cec6e70a0b8d8f873e788f214b7e6284c487ed56a30
+size 41273
diff --git a/test/factories/user_filter.rb b/test/factories/user_filter.rb
index e9e2ace9d..db963ec25 100644
--- a/test/factories/user_filter.rb
+++ b/test/factories/user_filter.rb
@@ -23,12 +23,12 @@
               'title' => 'product name',
               'type' => 'select',
               'options' => [
-                'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)',
-                'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+                'Moderna COVID-19 Vaccine (non-US Spikevax)',
+                'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                 'Janssen (J&J) COVID-19 Vaccine',
-                'AstraZeneca COVID-19 Vaccine (Non-US tradenames: VAXZEVRIA, COVISHIELD)',
-                'Coronavac (Sinovac) COVID-19 Vaccine (Non-US)',
-                'Sinopharm (BIBP) COVID-19 Vaccine (Non-US)',
+                'AstraZeneca COVID-19 Vaccine (Non-US tradenames include VAXZEVRIA, COVISHIELD)',
+                'Coronavac (Sinovac) COVID-19 Vaccine',
+                'Sinopharm (BIBP) COVID-19 Vaccine',
                 'Unknown'
               ]
             }, {
diff --git a/test/fixtures/files/Sara-Alert-Format-Exposure-Workflow.xlsx b/test/fixtures/files/Sara-Alert-Format-Exposure-Workflow.xlsx
index 6d61e5ea1..01b718e70 100644
--- a/test/fixtures/files/Sara-Alert-Format-Exposure-Workflow.xlsx
+++ b/test/fixtures/files/Sara-Alert-Format-Exposure-Workflow.xlsx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51c7277903f30f229577367cbf76d1a2f2470a9e17976b7f5f3566e3aca6aae0
-size 18857
+oid sha256:11d3396d3eea4eed49cd37f4e5106c453d1d467b7b9117f604d27a4abc41dd08
+size 18851
diff --git a/test/fixtures/files/Sara-Alert-Format-Invalid-Headers.xlsx b/test/fixtures/files/Sara-Alert-Format-Invalid-Headers.xlsx
index 24fe4b232..e8172c991 100644
--- a/test/fixtures/files/Sara-Alert-Format-Invalid-Headers.xlsx
+++ b/test/fixtures/files/Sara-Alert-Format-Invalid-Headers.xlsx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31265520c117a863af86401f0ac63b3302e8a663c62897c1cbca03bab24f153e
-size 17519
+oid sha256:bfa59124e2eb440548addf82d306ada01b8cc5e4b197a2fb85666b435137b9ff
+size 17503
diff --git a/test/fixtures/files/Sara-Alert-Format-Isolation-Workflow.xlsx b/test/fixtures/files/Sara-Alert-Format-Isolation-Workflow.xlsx
index 1da0a3d3a..e8b717bc3 100644
--- a/test/fixtures/files/Sara-Alert-Format-Isolation-Workflow.xlsx
+++ b/test/fixtures/files/Sara-Alert-Format-Isolation-Workflow.xlsx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:965c968baab61aa34b205be6b69b39eeb4f3705e099098f6ae883fcba53c804d
-size 18772
+oid sha256:9c95debe98d94fd9c945c583067038a784573b9b97a8ba0e73278eb736093dff
+size 18747
diff --git a/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-EW.xlsx b/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-EW.xlsx
index 2274ea9d9..16ca3698c 100644
--- a/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-EW.xlsx
+++ b/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-EW.xlsx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e92da34198b35b92b051bbfa119d60b612e8e9f45e1dfe60f15b4c1d29feff53
-size 18298
+oid sha256:18697905a8ea8829c2951ea8c780918ba43368884d243c52745726852d799c5c
+size 18279
diff --git a/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-IW.xlsx b/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-IW.xlsx
index 84d37530c..58e15e033 100644
--- a/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-IW.xlsx
+++ b/test/fixtures/files/Sara-Alert-Format-With-Jurisdictions-IW.xlsx
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccb41abce1f76849152af0cf22a9b03b5f72fab39a92b537d7584db3e3d737c6
-size 18242
+oid sha256:5beb7eaa8f81a105002b50d17b51efb5c8070490a1ae07488a44e72401d36e89
+size 18265
diff --git a/test/helpers/patient_query_helper_test.rb b/test/helpers/patient_query_helper_test.rb
index 718f87e34..843846ea0 100644
--- a/test/helpers/patient_query_helper_test.rb
+++ b/test/helpers/patient_query_helper_test.rb
@@ -562,24 +562,24 @@ class PatientQueryHelperTest < ActionView::TestCase
     Patient.destroy_all
     user = create(:public_health_enroller_user)
     patient_1 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_1, product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)')
-    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)')
+    create(:vaccine, patient: patient_1, product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)')
+    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)')
     patient_2 = create(:patient, creator: user)
     create(:vaccine, patient: patient_2, product_name: 'Janssen (J&J) COVID-19 Vaccine')
     patient_3 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_3, product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)')
+    create(:vaccine, patient: patient_3, product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)')
     patient_4 = create(:patient, creator: user)
     create(:vaccine, patient: patient_4, product_name: 'Unknown')
     patient_5 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)')
-    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)')
+    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)')
+    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)')
     patient_6 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)')
-    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)')
+    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)')
+    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)')
     create(:patient, creator: user)
 
     patients = Patient.all
-    filters = [{ filterOption: {}, value: [{ name: 'product-name', value: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)' }] }]
+    filters = [{ filterOption: {}, value: [{ name: 'product-name', value: 'Moderna COVID-19 Vaccine (non-US Spikevax)' }] }]
     filters[0][:filterOption]['name'] = 'vaccination'
     tz_offset = 300
     filtered_patients = advanced_filter(patients, filters, tz_offset)
@@ -680,29 +680,29 @@ class PatientQueryHelperTest < ActionView::TestCase
     Patient.destroy_all
     user = create(:public_health_enroller_user)
     patient_1 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '1')
-    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '2')
+    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '1')
+    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '2')
     patient_2 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_2, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: 'Unknown')
+    create(:vaccine, patient: patient_2, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: 'Unknown')
     patient_3 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_3, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: nil)
+    create(:vaccine, patient: patient_3, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: nil)
     patient_4 = create(:patient, creator: user)
     create(:vaccine, patient: patient_4, product_name: 'Janssen (J&J) COVID-19 Vaccine', dose_number: '1')
     patient_5 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '1')
+    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '1')
     create(:vaccine, patient: patient_5, product_name: 'Janssen (J&J) COVID-19 Vaccine', dose_number: '1')
     create(:vaccine, patient: patient_5, product_name: 'Unknown', dose_number: 'Unknown')
-    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '2')
+    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '2')
     patient_6 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)', dose_number: '1')
-    create(:vaccine, patient: patient_6, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '2')
+    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)', dose_number: '1')
+    create(:vaccine, patient: patient_6, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '2')
     patient_7 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_7, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '1')
+    create(:vaccine, patient: patient_7, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '1')
     create(:patient, creator: user)
 
     patients = Patient.all
     filters = [{ filterOption: {},
-                 value: [{ name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)' }, { name: 'dose-number', value: '1' }] }]
+                 value: [{ name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)' }, { name: 'dose-number', value: '1' }] }]
     filters[0][:filterOption]['name'] = 'vaccination'
     tz_offset = 300
     filtered_patients = advanced_filter(patients, filters, tz_offset)
@@ -714,42 +714,42 @@ class PatientQueryHelperTest < ActionView::TestCase
     Patient.destroy_all
     user = create(:public_health_enroller_user)
     patient_1 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
-    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 4, 11), dose_number: '2')
     patient_2 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_2, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_2, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: 'Unknown')
     patient_3 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_3, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_3, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 25), dose_number: '1')
     patient_4 = create(:patient, creator: user)
     create(:vaccine, patient: patient_4, group_name: 'COVID-19', product_name: 'Janssen (J&J) COVID-19 Vaccine',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
     patient_5 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
     create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Janssen (J&J) COVID-19 Vaccine',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
     create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 24),
                      dose_number: 'Unknown')
-    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 4, 13), dose_number: '2')
     patient_6 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)',
+    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
-    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 4, 11), dose_number: '2')
     patient_7 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
     create(:patient, creator: user)
 
     patients = Patient.all
     filters = [{ filterOption: {},
                  value: [{ name: 'vaccine-group', value: 'COVID-19' },
-                         { name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)' },
+                         { name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)' },
                          { name: 'administration-date', value: { when: 'before', date: '2021-03-25' } },
                          { name: 'dose-number', value: '1' }] }]
     filters[0][:filterOption]['name'] = 'vaccination'
@@ -763,32 +763,32 @@ class PatientQueryHelperTest < ActionView::TestCase
     Patient.destroy_all
     user = create(:public_health_enroller_user)
     patient_1 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '1')
-    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '2')
+    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '1')
+    create(:vaccine, patient: patient_1, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '2')
     patient_2 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_2, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: 'Unknown')
+    create(:vaccine, patient: patient_2, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: 'Unknown')
     patient_3 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_3, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: nil)
+    create(:vaccine, patient: patient_3, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: nil)
     patient_4 = create(:patient, creator: user)
     create(:vaccine, patient: patient_4, product_name: 'Janssen (J&J) COVID-19 Vaccine', dose_number: '1')
     patient_5 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '1')
+    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '1')
     create(:vaccine, patient: patient_5, product_name: 'Janssen (J&J) COVID-19 Vaccine', dose_number: '1')
     create(:vaccine, patient: patient_5, product_name: 'Unknown', dose_number: 'Unknown')
-    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '2')
+    create(:vaccine, patient: patient_5, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '2')
     patient_6 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)', dose_number: '1')
-    create(:vaccine, patient: patient_6, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '2')
+    create(:vaccine, patient: patient_6, product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)', dose_number: '1')
+    create(:vaccine, patient: patient_6, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '2')
     patient_7 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_7, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)', dose_number: '1')
+    create(:vaccine, patient: patient_7, product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)', dose_number: '1')
     create(:patient, creator: user)
 
     patients = Patient.all
     filter_option_1 = { filterOption: {},
-                        value: [{ name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)' },
+                        value: [{ name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)' },
                                 { name: 'dose-number', value: '1' }] }
     filter_option_2 = { filterOption: {},
-                        value: [{ name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)' },
+                        value: [{ name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)' },
                                 { name: 'dose-number', value: '2' }] }
     filter_option_1[:filterOption]['name'] = 'vaccination'
     filter_option_2[:filterOption]['name'] = 'vaccination'
@@ -803,56 +803,56 @@ class PatientQueryHelperTest < ActionView::TestCase
     Patient.destroy_all
     user = create(:public_health_enroller_user)
     patient_1 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
-    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_1, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 4, 11), dose_number: '2')
     patient_2 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_2, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_2, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
     patient_3 = create(:patient, creator: user)
     create(:vaccine, patient: patient_3, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 26),
                      dose_number: 'Unknown')
     patient_4 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_4, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_4, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
     create(:vaccine, patient: patient_4, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 26), dose_number: nil)
     patient_5 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 25), dose_number: '1')
-    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 4, 18), dose_number: '2')
-    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: 'Unknown')
-    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: nil)
-    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)',
+    create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)',
                      administration_date: DateTime.new(2021, 3, 25),
                      dose_number: '1')
     create(:vaccine, patient: patient_5, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 26), dose_number: nil)
     patient_6 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
-    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 26), dose_number: nil)
     create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 25), dose_number: nil)
     create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 5), dose_number: nil)
     create(:vaccine, patient: patient_6, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 26), dose_number: '2')
     patient_7 = create(:patient, creator: user)
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: '1')
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 25), dose_number: '1')
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 4, 18), dose_number: '2')
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: 'Unknown')
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 24), dose_number: nil)
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Moderna COVID-19 Vaccine (non-US Spikevax)',
                      administration_date: DateTime.new(2021, 3, 25),
                      dose_number: '1')
-    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+    create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
                      administration_date: DateTime.new(2021, 3, 26), dose_number: nil)
     create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 25), dose_number: nil)
     create(:vaccine, patient: patient_7, group_name: 'COVID-19', product_name: 'Unknown', administration_date: DateTime.new(2021, 3, 5), dose_number: nil)
@@ -863,7 +863,7 @@ class PatientQueryHelperTest < ActionView::TestCase
     patients = Patient.all
     filter_option_1 = { filterOption: {},
                         value: [{ name: 'vaccine-group', value: 'COVID-19' },
-                                { name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)' },
+                                { name: 'product-name', value: 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)' },
                                 { name: 'administration-date', value: { when: 'before', date: '2021-03-25' } },
                                 { name: 'dose-number', value: '1' }] }
     filter_option_2 = { filterOption: {},
diff --git a/test/helpers/vaccine_query_helper_test.rb b/test/helpers/vaccine_query_helper_test.rb
index 3f4f273f3..61be9d24c 100644
--- a/test/helpers/vaccine_query_helper_test.rb
+++ b/test/helpers/vaccine_query_helper_test.rb
@@ -12,11 +12,11 @@ def setup
         'name' => 'COVID-19',
         'vaccines' => [
           {
-            'product_name' => 'Moderna COVID-19 Vaccine (Non-US tradename: Spikevax)',
+            'product_name' => 'Moderna COVID-19 Vaccine (non-US Spikevax)',
             'num_doses' => 2
           },
           {
-            'product_name' => 'Pfizer-BioNTech COVID-19 Vaccine (Tradename: COMIRNATY)',
+            'product_name' => 'Pfizer-BioNTech COVID-19 Vaccine (COMIRNATY)',
             'num_doses' => 2
           },
           {