diff --git a/Dalamud.Boot/Dalamud.Boot.vcxproj b/Dalamud.Boot/Dalamud.Boot.vcxproj
index 95eb9d12c..00d8b4575 100644
--- a/Dalamud.Boot/Dalamud.Boot.vcxproj
+++ b/Dalamud.Boot/Dalamud.Boot.vcxproj
@@ -103,4 +103,4 @@
     <Delete Files="$(OutDir)$(TargetName).lib" />
     <Delete Files="$(OutDir)$(TargetName).exp" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj b/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj
index 8257d42aa..9470c83e0 100644
--- a/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj
+++ b/Dalamud.Injector.Boot/Dalamud.Injector.Boot.vcxproj
@@ -110,4 +110,4 @@
     <Delete Files="$(OutDir)$(TargetName).lib" />
     <Delete Files="$(OutDir)$(TargetName).exp" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderConditionFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
similarity index 79%
rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderConditionFlags.cs
rename to Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
index 2abd371ab..3eb5ec1b6 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderConditionFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/ConditionFlags.cs
@@ -3,10 +3,10 @@ using System;
 namespace Dalamud.Game.Gui.PartyFinder.Types
 {
     /// <summary>
-    /// Condition flags for the <see cref="PartyFinder"/> class.
+    /// Condition flags for the <see cref="PartyFinderGui"/> class.
     /// </summary>
     [Flags]
-    public enum DutyFinderConditionFlags : uint
+    public enum ConditionFlags : uint
     {
         /// <summary>
         /// No duty condition.
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderCategory.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
similarity index 90%
rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderCategory.cs
rename to Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
index d7ffe568b..920325d64 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderCategory.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyCategory.cs
@@ -1,9 +1,9 @@
 namespace Dalamud.Game.Gui.PartyFinder.Types
 {
     /// <summary>
-    /// Category flags for the <see cref="PartyFinder"/> class.
+    /// Category flags for the <see cref="PartyFinderGui"/> class.
     /// </summary>
-    public enum DutyFinderCategory
+    public enum DutyCategory
     {
         /// <summary>
         /// The duty category.
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs
index 6dfe10c69..03335dbaf 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSettingsFlags.cs
@@ -3,7 +3,7 @@ using System;
 namespace Dalamud.Game.Gui.PartyFinder.Types
 {
     /// <summary>
-    /// Duty finder settings flags for the <see cref="PartyFinder"/> class.
+    /// Duty finder settings flags for the <see cref="PartyFinderGui"/> class.
     /// </summary>
     [Flags]
     public enum DutyFinderSettingsFlags : uint
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs
index 3e3342938..589d0b91b 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/DutyType.cs
@@ -1,7 +1,7 @@
 namespace Dalamud.Game.Gui.PartyFinder.Types
 {
     /// <summary>
-    /// Duty type flags for the <see cref="PartyFinder"/> class.
+    /// Duty type flags for the <see cref="PartyFinderGui"/> class.
     /// </summary>
     public enum DutyType
     {
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderLootRuleFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs
similarity index 78%
rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderLootRuleFlags.cs
rename to Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs
index aa75807fd..a1a29ceb8 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderLootRuleFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/LootRuleFlags.cs
@@ -3,10 +3,10 @@ using System;
 namespace Dalamud.Game.Gui.PartyFinder.Types
 {
     /// <summary>
-    /// Loot rule flags for the <see cref="PartyFinder"/> class.
+    /// Loot rule flags for the <see cref="PartyFinderGui"/> class.
     /// </summary>
     [Flags]
-    public enum DutyFinderLootRuleFlags : uint
+    public enum LootRuleFlags : uint
     {
         /// <summary>
         /// No loot rules.
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderObjectiveFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs
similarity index 82%
rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderObjectiveFlags.cs
rename to Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs
index 40e34c1fc..de3b8fc6b 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderObjectiveFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/ObjectiveFlags.cs
@@ -3,10 +3,10 @@ using System;
 namespace Dalamud.Game.Gui.PartyFinder.Types
 {
     /// <summary>
-    /// Objective flags for the <see cref="PartyFinder"/> class.
+    /// Objective flags for the <see cref="PartyFinderGui"/> class.
     /// </summary>
     [Flags]
-    public enum DutyFinderObjectiveFlags : uint
+    public enum ObjectiveFlags : uint
     {
         /// <summary>
         /// No objective.
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
index 4ee89bb80..c03a2dfcd 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
@@ -46,7 +46,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
             this.World = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.World));
             this.HomeWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.HomeWorld));
             this.CurrentWorld = new Lazy<World>(() => dataManager.GetExcelSheet<World>().GetRow(listing.CurrentWorld));
-            this.Category = (DutyFinderCategory)listing.Category;
+            this.Category = (DutyCategory)listing.Category;
             this.RawDuty = listing.Duty;
             this.Duty = new Lazy<ContentFinderCondition>(() => dataManager.GetExcelSheet<ContentFinderCondition>().GetRow(listing.Duty));
             this.DutyType = (DutyType)listing.DutyType;
@@ -101,7 +101,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
         /// <summary>
         /// Gets the Party Finder category this listing is listed under.
         /// </summary>
-        public DutyFinderCategory Category { get; }
+        public DutyCategory Category { get; }
 
         /// <summary>
         /// Gets the row ID of the duty this listing is for. May be 0 for non-duty listings.
@@ -152,12 +152,12 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
         /// <summary>
         /// Gets  the objective of this listing.
         /// </summary>
-        public DutyFinderObjectiveFlags Objective => (DutyFinderObjectiveFlags)this.objective;
+        public ObjectiveFlags Objective => (ObjectiveFlags)this.objective;
 
         /// <summary>
         /// Gets the conditions of this listing.
         /// </summary>
-        public DutyFinderConditionFlags Conditions => (DutyFinderConditionFlags)this.conditions;
+        public ConditionFlags Conditions => (ConditionFlags)this.conditions;
 
         /// <summary>
         /// Gets the Duty Finder settings that will be used for this listing.
@@ -167,13 +167,13 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
         /// <summary>
         /// Gets the loot rules that will be used for this listing.
         /// </summary>
-        public DutyFinderLootRuleFlags LootRules => (DutyFinderLootRuleFlags)this.lootRules;
+        public LootRuleFlags LootRules => (LootRuleFlags)this.lootRules;
 
         /// <summary>
         /// Gets where this listing is searching. Note that this is also used for denoting alliance raid listings and one
         /// player per job.
         /// </summary>
-        public DutyFinderSearchAreaFlags SearchArea => (DutyFinderSearchAreaFlags)this.searchArea;
+        public SearchAreaFlags SearchArea => (SearchAreaFlags)this.searchArea;
 
         /// <summary>
         /// Gets a list of the class/job IDs that are currently present in the party.
@@ -192,14 +192,14 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
         /// </summary>
         /// <param name="flag">The flag to check for.</param>
         /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[DutyFinderObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0;
+        public bool this[ObjectiveFlags flag] => this.objective == 0 || (this.objective & (uint)flag) > 0;
 
         /// <summary>
         /// Check if the given flag is present.
         /// </summary>
         /// <param name="flag">The flag to check for.</param>
         /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[DutyFinderConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0;
+        public bool this[ConditionFlags flag] => this.conditions == 0 || (this.conditions & (uint)flag) > 0;
 
         /// <summary>
         /// Check if the given flag is present.
@@ -213,14 +213,14 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
         /// </summary>
         /// <param name="flag">The flag to check for.</param>
         /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[DutyFinderLootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0;
+        public bool this[LootRuleFlags flag] => this.lootRules == 0 || (this.lootRules & (uint)flag) > 0;
 
         /// <summary>
         /// Check if the given flag is present.
         /// </summary>
         /// <param name="flag">The flag to check for.</param>
         /// <returns>A value indicating whether the flag is present.</returns>
-        public bool this[DutyFinderSearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0;
+        public bool this[SearchAreaFlags flag] => this.searchArea == 0 || (this.searchArea & (uint)flag) > 0;
 
         #endregion
 
diff --git a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSearchAreaFlags.cs b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs
similarity index 84%
rename from Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSearchAreaFlags.cs
rename to Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs
index c9c238e48..85308c8d1 100644
--- a/Dalamud/Game/Gui/PartyFinder/Types/DutyFinderSearchAreaFlags.cs
+++ b/Dalamud/Game/Gui/PartyFinder/Types/SearchAreaFlags.cs
@@ -3,10 +3,10 @@ using System;
 namespace Dalamud.Game.Gui.PartyFinder.Types
 {
     /// <summary>
-    /// Search area flags for the <see cref="PartyFinder"/> class.
+    /// Search area flags for the <see cref="PartyFinderGui"/> class.
     /// </summary>
     [Flags]
-    public enum DutyFinderSearchAreaFlags : uint
+    public enum SearchAreaFlags : uint
     {
         /// <summary>
         /// Datacenter.