diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index b371cd2351..c157bd3889 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -788,7 +788,7 @@
   "weaponArmoireFunnyFoolBatonText": "Funny Fool Baton",
   "weaponArmoireFunnyFoolBatonNotes": "With a wave of your baton you can deliver a punchline, redirect attention, or summon applause. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Funny Fool Set (Item 3 of 3)",
   "weaponArmoireSpookyCandyBucketText": "Spooky Candy Bucket",
-  "weaponArmoireSpookyCandyBucketNotes": "With an epic costume like that, you’re going to get so much candy! Good thing you’ve got this bottomless bucket to hold it all. Try not to snack on any until you get home. Increases Intelligence by <%= int %>. Enchanted Armoire: Trick or Treat Set (Item 2 of 2)",
+  "weaponArmoireSpookyCandyBucketNotes": "With an epic costume like that, you’re going to get so much candy! Good thing you’ve got this bottomless bucket to hold it all. Try not to snack on any until you get home. Increases Intelligence by <%= int %>. Enchanted Armoire: Fright Night Set (Item 2 of 2)",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -3005,7 +3005,7 @@
   "shieldArmoireBuoyantBeachBallText": "Beachball",
   "shieldArmoireBuoyantBeachBallNotes": "Got too many balls up in the air already? Here’s one that you can safely set down, roll, bounce and bounce and bounce...  Increases Strength by <%= str %>. Enchanted Armoire: Beachside Set (Item 4 of 4).",
   "shieldArmoireSafetyFlashlightText": "Safety Flashlight",
-  "shieldArmoireSafetyFlashlightNotes": "Wait, did you hear that noise? Quick! Shine your flashlight into the shadows over there. Hmmm. Looks like it was just the wind. Or was it…? Increases Constitution by <%= con $>. Enchanted Armoire: Trick or Treat Set (Item 1 of 2)",
+  "shieldArmoireSafetyFlashlightNotes": "Wait, did you hear that noise? Quick! Shine your flashlight into the shadows over there. Hmmm. Looks like it was just the wind. Or was it…? Increases Constitution by <%= con %>. Enchanted Armoire: Fright Night Set (Item 1 of 2)",
 
   "back": "Back Accessory",
   "backBase0Text": "No Back Accessory",
diff --git a/website/common/script/content/constants/releaseDates.js b/website/common/script/content/constants/releaseDates.js
index 9e0833e374..d528c117a0 100644
--- a/website/common/script/content/constants/releaseDates.js
+++ b/website/common/script/content/constants/releaseDates.js
@@ -11,7 +11,7 @@ export const ARMOIRE_RELEASE_DATES = {
   corsairSet: { year: 2024, month: 7 },
   dragonKnightSet: { year: 2024, month: 8 },
   funnyFoolSet: { year: 2024, month: 9 },
-  trickOrTreatSet: { year: 2024, month: 10 },
+  frightNightSet: { year: 2024, month: 10 },
 };
 
 export const EGGS_RELEASE_DATES = {
diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js
index ca2b5a7240..d89d7359bb 100644
--- a/website/common/script/content/gear/sets/armoire.js
+++ b/website/common/script/content/gear/sets/armoire.js
@@ -1372,7 +1372,7 @@ const shield = {
   },
   safetyFlashlight: {
     con: 10,
-    set: 'trickOrTreatSet',
+    set: 'frightNightSet',
   },
 };
 
@@ -1875,7 +1875,7 @@ const weapon = {
   },
   spookyCandyBucket: {
     int: 10,
-    set: 'trickOrTreatSet',
+    set: 'frightNightSet',
   },
 };