diff --git a/common/script/src/content/gear/sets/warrior.js b/common/script/src/content/gear/sets/warrior.js
index 52b4bc73b4..9e01375613 100644
--- a/common/script/src/content/gear/sets/warrior.js
+++ b/common/script/src/content/gear/sets/warrior.js
@@ -1,4 +1,4 @@
-import {generateGearSet} from '../../helpers';
+import {setGearSetDefaults} from '../../helpers';
 import events from '../../events';
 
 let armor = {
@@ -42,9 +42,6 @@ let warriorSet = {
   weapon: weapon,
 };
 
-generateGearSet(armor, {setName: 'warrior', gearType: 'armor'});
-generateGearSet(head, {setName: 'warrior', gearType: 'head'});
-generateGearSet(shield, {setName: 'warrior', gearType: 'shield'});
-generateGearSet(weapon, {setName: 'warrior', gearType: 'weapon'});
+setGearSetDefaults(warriorSet, {setName: 'warrior'});
 
 export default warriorSet;
diff --git a/common/script/src/content/helpers.js b/common/script/src/content/helpers.js
index bf6ffae010..d6f0b8e55b 100644
--- a/common/script/src/content/helpers.js
+++ b/common/script/src/content/helpers.js
@@ -137,27 +137,28 @@ export function setQuestSetDefaults(quests, mainDefaultsFunction, dropDefaultsFu
   });
 };
 
+export function setGearSetDefaults(gearSet, options={}) {
+  let setName = formatForTranslator(options.setName);
+
+  each(gearSet, (gear, gearType) => {
+    each(gear, (item, number) => {
+      let text = `${gearType}${setName}${number}Text`;
+      let notes = `${gearType}${setName}${number}Notes`;
+      let attributes = _getGearAttributes(item);
+      let gearDefaults = {
+        text: translator(text),
+        notes: translator(notes, attributes),
+      }
+
+      defaults(item, gearDefaults);
+    });
+  });
+};
+
 //----------------------------------------
 // Generators
 //----------------------------------------
 
-export function generateGearSet(gear, options={}) {
-  let setName = formatForTranslator(options.setName);
-  let gearType = options.gearType;
-
-  each(gear, (item, number) => {
-    let text = `${gearType}${setName}${number}Text`;
-    let notes = `${gearType}${setName}${number}Notes`;
-    let attributes = _getGearAttributes(item);
-    let gearDefaults = {
-      text: translator(text),
-      notes: translator(notes, attributes),
-    }
-
-    defaults(item, gearDefaults);
-  });
-};
-
 export function generateBackgrounds(sets) {
   let backgrounds = {};