diff --git a/Dalamud/Game/ClientState/Actors/Types/Chara.cs b/Dalamud/Game/ClientState/Actors/Types/Chara.cs
index 792ca17c0..5c8dca228 100644
--- a/Dalamud/Game/ClientState/Actors/Types/Chara.cs
+++ b/Dalamud/Game/ClientState/Actors/Types/Chara.cs
@@ -65,7 +65,7 @@ namespace Dalamud.Game.ClientState.Actors.Types
         /// <summary>
         /// Gets the ClassJob of this Chara.
         /// </summary>
-        public ClassJobResolver ClassJob => new(*(byte*)(this.Address + ActorOffsets.ClassJob), this.Dalamud);
+        public ExcelResolver<Lumina.Excel.GeneratedSheets.ClassJob> ClassJob => new(*(byte*)(this.Address + ActorOffsets.ClassJob), this.Dalamud);
 
         /// <summary>
         /// Gets the level of this Chara.
diff --git a/Dalamud/Game/ClientState/Actors/Types/PlayerCharacter.cs b/Dalamud/Game/ClientState/Actors/Types/PlayerCharacter.cs
index a1ebe1ab0..e04c36d32 100644
--- a/Dalamud/Game/ClientState/Actors/Types/PlayerCharacter.cs
+++ b/Dalamud/Game/ClientState/Actors/Types/PlayerCharacter.cs
@@ -23,14 +23,14 @@ namespace Dalamud.Game.ClientState.Actors.Types
         }
 
         /// <summary>
-        /// Gets the current <see cref="WorldResolver">world</see> of the character.
+        /// Gets the current <see cref="ExcelResolver{T}">world</see> of the character.
         /// </summary>
-        public WorldResolver CurrentWorld => new(*(ushort*)(this.Address + ActorOffsets.CurrentWorld), this.Dalamud);
+        public ExcelResolver<Lumina.Excel.GeneratedSheets.World> CurrentWorld => new(*(ushort*)(this.Address + ActorOffsets.CurrentWorld), this.Dalamud);
 
         /// <summary>
-        /// Gets the home <see cref="WorldResolver">world</see> of the character.
+        /// Gets the home <see cref="ExcelResolver{T}">world</see> of the character.
         /// </summary>
-        public WorldResolver HomeWorld => new(*(ushort*)(this.Address + ActorOffsets.HomeWorld), this.Dalamud);
+        public ExcelResolver<Lumina.Excel.GeneratedSheets.World> HomeWorld => new(*(ushort*)(this.Address + ActorOffsets.HomeWorld), this.Dalamud);
 
         /// <summary>
         /// Gets the Free Company tag of this player.
diff --git a/Dalamud/Game/ClientState/Resolvers/ClassJobResolver.cs b/Dalamud/Game/ClientState/Resolvers/ClassJobResolver.cs
deleted file mode 100644
index b9603838d..000000000
--- a/Dalamud/Game/ClientState/Resolvers/ClassJobResolver.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Dalamud.Game.ClientState.Resolvers
-{
-    /// <summary>
-    /// This object represents a class or job.
-    /// </summary>
-    public class ClassJobResolver : BaseResolver<Lumina.Excel.GeneratedSheets.ClassJob>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ClassJobResolver"/> class.
-        /// Set up the ClassJob resolver with the provided ID.
-        /// </summary>
-        /// <param name="id">The ID of the classJob.</param>
-        /// <param name="dalamud">The Dalamud instance.</param>
-        internal ClassJobResolver(ushort id, Dalamud dalamud)
-            : base(id, dalamud)
-        {
-        }
-    }
-}
diff --git a/Dalamud/Game/ClientState/Resolvers/BaseResolver{T}.cs b/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs
similarity index 75%
rename from Dalamud/Game/ClientState/Resolvers/BaseResolver{T}.cs
rename to Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs
index 2ded995d7..920f7b69e 100644
--- a/Dalamud/Game/ClientState/Resolvers/BaseResolver{T}.cs
+++ b/Dalamud/Game/ClientState/Resolvers/ExcelResolver{T}.cs
@@ -3,19 +3,19 @@ using Lumina.Excel;
 namespace Dalamud.Game.ClientState.Resolvers
 {
     /// <summary>
-    /// This object represents a class or job.
+    /// This object resolves a rowID within an Excel sheet.
     /// </summary>
     /// <typeparam name="T">The type of Lumina sheet to resolve.</typeparam>
-    public class BaseResolver<T> where T : ExcelRow
+    public class ExcelResolver<T> where T : ExcelRow
     {
         private readonly Dalamud dalamud;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="BaseResolver{T}"/> class.
+        /// Initializes a new instance of the <see cref="ExcelResolver{T}"/> class.
         /// </summary>
         /// <param name="id">The ID of the classJob.</param>
         /// <param name="dalamud">The Dalamud instance.</param>
-        internal BaseResolver(uint id, Dalamud dalamud)
+        internal ExcelResolver(uint id, Dalamud dalamud)
         {
             this.dalamud = dalamud;
             this.Id = id;
diff --git a/Dalamud/Game/ClientState/Resolvers/FateResolver.cs b/Dalamud/Game/ClientState/Resolvers/FateResolver.cs
deleted file mode 100644
index 15f2fce0d..000000000
--- a/Dalamud/Game/ClientState/Resolvers/FateResolver.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Dalamud.Game.ClientState.Resolvers
-{
-    /// <summary>
-    /// This object represents a Fate a character can participate in.
-    /// </summary>
-    public class FateResolver : BaseResolver<Lumina.Excel.GeneratedSheets.Fate>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FateResolver"/> class.
-        /// Set up the Fate resolver with the provided ID.
-        /// </summary>
-        /// <param name="id">The ID of the Fate.</param>
-        /// <param name="dalamud">The Dalamud instance.</param>
-        internal FateResolver(ushort id, Dalamud dalamud)
-            : base(id, dalamud)
-        {
-        }
-    }
-}
diff --git a/Dalamud/Game/ClientState/Resolvers/TerritoryTypeResolver.cs b/Dalamud/Game/ClientState/Resolvers/TerritoryTypeResolver.cs
deleted file mode 100644
index 248bf94bb..000000000
--- a/Dalamud/Game/ClientState/Resolvers/TerritoryTypeResolver.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Dalamud.Game.ClientState.Resolvers
-{
-    /// <summary>
-    /// This object represents a territory a character can be in.
-    /// </summary>
-    public class TerritoryTypeResolver : BaseResolver<Lumina.Excel.GeneratedSheets.TerritoryType>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TerritoryTypeResolver"/> class.
-        /// Set up the territory type resolver with the provided ID.
-        /// </summary>
-        /// <param name="id">The ID of the territory type.</param>
-        /// <param name="dalamud">The Dalamud instance.</param>
-        internal TerritoryTypeResolver(ushort id, Dalamud dalamud)
-            : base(id, dalamud)
-        {
-        }
-    }
-}
diff --git a/Dalamud/Game/ClientState/Resolvers/WorldResolver.cs b/Dalamud/Game/ClientState/Resolvers/WorldResolver.cs
deleted file mode 100644
index 0d37e3549..000000000
--- a/Dalamud/Game/ClientState/Resolvers/WorldResolver.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-namespace Dalamud.Game.ClientState.Resolvers
-{
-    /// <summary>
-    /// This object represents a world a character can reside on.
-    /// </summary>
-    public class WorldResolver : BaseResolver<Lumina.Excel.GeneratedSheets.World>
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WorldResolver"/> class.
-        /// Set up the world resolver with the provided ID.
-        /// </summary>
-        /// <param name="id">The ID of the world.</param>
-        /// <param name="dalamud">The Dalamud instance.</param>
-        internal WorldResolver(ushort id, Dalamud dalamud)
-            : base(id, dalamud)
-        {
-        }
-    }
-}