diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
index bbe4ad70d..9191ca020 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/BeastChakra.cs
@@ -8,20 +8,20 @@ public enum BeastChakra : byte
     /// <summary>
     /// No chakra.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// The Opo-Opo chakra.
     /// </summary>
-    OPOOPO = 1,
+    OpoOpo = 1,
 
     /// <summary>
     /// The Raptor chakra.
     /// </summary>
-    RAPTOR = 2,
+    Raptor = 2,
 
     /// <summary>
     /// The Coeurl chakra.
     /// </summary>
-    COEURL = 3,
+    Coeurl = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs b/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs
index 24ffc2b19..89fceed96 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/CardType.cs
@@ -8,45 +8,45 @@ public enum CardType : byte
     /// <summary>
     /// No card.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// The Balance card.
     /// </summary>
-    BALANCE = 1,
+    Balance = 1,
 
     /// <summary>
     /// The Bole card.
     /// </summary>
-    BOLE = 2,
+    Bole = 2,
 
     /// <summary>
     /// The Arrow card.
     /// </summary>
-    ARROW = 3,
+    Arrow = 3,
 
     /// <summary>
     /// The Spear card.
     /// </summary>
-    SPEAR = 4,
+    Spear = 4,
 
     /// <summary>
     /// The Ewer card.
     /// </summary>
-    EWER = 5,
+    Ewer = 5,
 
     /// <summary>
     /// The Spire card.
     /// </summary>
-    SPIRE = 6,
+    Spire = 6,
 
     /// <summary>
     /// The Lord of Crowns card.
     /// </summary>
-    LORD = 7,
+    Lord = 7,
 
     /// <summary>
     /// The Lady of Crowns card.
     /// </summary>
-    LADY = 8,
+    Lady = 8,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs b/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs
index b674d11b8..446489bd1 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/DismissedFairy.cs
@@ -8,10 +8,10 @@ public enum DismissedFairy : byte
     /// <summary>
     /// Dismissed fairy is Eos.
     /// </summary>
-    EOS = 6,
+    Eos = 6,
 
     /// <summary>
     /// Dismissed fairy is Selene.
     /// </summary>
-    SELENE = 7,
+    Selene = 7,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs b/Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs
index f8833d6d0..619059daa 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/DrawType.cs
@@ -8,10 +8,10 @@ public enum DrawType : byte
     /// <summary>
     /// Astral Draw active.
     /// </summary>
-    ASTRAL = 0,
+    Astral = 0,
 
     /// <summary>
     /// Umbral Draw active.
     /// </summary>
-    UMBRAL = 1,
+    Umbral = 1,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
index e35dcc7f9..86e58771b 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Kaeshi.cs
@@ -8,25 +8,25 @@ public enum Kaeshi : byte
     /// <summary>
     /// No Kaeshi is active.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// Kaeshi: Higanbana type.
     /// </summary>
-    HIGANBANA = 1,
+    Higanbana = 1,
 
     /// <summary>
     /// Kaeshi: Goken type.
     /// </summary>
-    GOKEN = 2,
+    Goken = 2,
 
     /// <summary>
     /// Kaeshi: Setsugekka type.
     /// </summary>
-    SETSUGEKKA = 3,
+    Setsugekka = 3,
 
     /// <summary>
     /// Kaeshi: Namikiri type.
     /// </summary>
-    NAMIKIRI = 4,
+    Namikiri = 4,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs
index 31ee6dac1..8955c0735 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Mudras.cs
@@ -8,15 +8,15 @@ public enum Mudras : byte
     /// <summary>
     /// Ten mudra.
     /// </summary>
-    TEN = 1,
+    Ten = 1,
 
     /// <summary>
     /// Chi mudra.
     /// </summary>
-    CHI = 2,
+    Chi = 2,
 
     /// <summary>
     /// Jin mudra.
     /// </summary>
-    JIN = 3,
+    Jin = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
index 8be5c739e..f61e54104 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Nadi.cs
@@ -9,15 +9,15 @@ public enum Nadi : byte
     /// <summary>
     /// No nadi.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// The Lunar nadi.
     /// </summary>
-    LUNAR = 1,
+    Lunar = 1,
 
     /// <summary>
     /// The Solar nadi.
     /// </summary>
-    SOLAR = 2,
+    Solar = 2,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs b/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs
index 248caa396..c10c369d3 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/PetGlam.cs
@@ -8,40 +8,40 @@ public enum PetGlam : byte
     /// <summary>
     /// No pet glam.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// Emerald carbuncle pet glam.
     /// </summary>
-    EMERALD = 1,
+    Emerald = 1,
 
     /// <summary>
     /// Topaz carbuncle pet glam.
     /// </summary>
-    TOPAZ = 2,
+    Topaz = 2,
 
     /// <summary>
     /// Ruby carbuncle pet glam.
     /// </summary>
-    RUBY = 3,
+    Ruby = 3,
 
     /// <summary>
     /// Normal carbuncle pet glam.
     /// </summary>
-    CARBUNCLE = 4,
+    Carbuncle = 4,
 
     /// <summary>
     /// Ifrit Egi pet glam.
     /// </summary>
-    IFRIT = 5,
+    Ifrit = 5,
 
     /// <summary>
     /// Titan Egi pet glam.
     /// </summary>
-    TITAN = 6,
+    Titan = 6,
 
     /// <summary>
     /// Garuda Egi pet glam.
     /// </summary>
-    GARUDA = 7,
+    Garuda = 7,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs
index a1a6035c6..0eb86b1b1 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Sen.cs
@@ -9,20 +9,20 @@ public enum Sen : byte
     /// <summary>
     /// No Sen.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// Setsu Sen type.
     /// </summary>
-    SETSU = 1 << 0,
+    Setsu = 1 << 0,
 
     /// <summary>
     /// Getsu Sen type.
     /// </summary>
-    GETSU = 1 << 1,
+    Getsu = 1 << 1,
 
     /// <summary>
     /// Ka Sen type.
     /// </summary>
-    KA = 1 << 2,
+    Ka = 1 << 2,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/SerpentCombo.cs b/Dalamud/Game/ClientState/JobGauge/Enums/SerpentCombo.cs
index 0fc50d87a..f4850cf8c 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/SerpentCombo.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/SerpentCombo.cs
@@ -8,35 +8,35 @@ public enum SerpentCombo : byte
     /// <summary>
     /// No Serpent combo is active.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// Death Rattle action.
     /// </summary>
-    DEATHRATTLE = 1,
+    DeathRattle = 1,
 
     /// <summary>
     /// Last Lash action.
     /// </summary>
-    LASTLASH = 2,
+    LastLash = 2,
 
     /// <summary>
     /// First Legacy action.
     /// </summary>
-    FIRSTLEGACY = 3,
+    FirstLegacy = 3,
 
     /// <summary>
     /// Second Legacy action.
     /// </summary>
-    SECONDLEGACY = 4,
+    SecondLegacy = 4,
 
     /// <summary>
     /// Third Legacy action.
     /// </summary>
-    THIRDLEGACY = 5,
+    ThirdLegacy = 5,
 
     /// <summary>
     /// Fourth Legacy action.
     /// </summary>
-    FOURTHLEGACY = 6,
+    FourthLegacy = 6,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs b/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs
index c23fbbbff..7ca6b6c07 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/Song.cs
@@ -8,20 +8,20 @@ public enum Song : byte
     /// <summary>
     /// No song is active type.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// Mage's Ballad type.
     /// </summary>
-    MAGE = 1,
+    Mage = 1,
 
     /// <summary>
     /// Army's Paeon type.
     /// </summary>
-    ARMY = 2,
+    Army = 2,
 
     /// <summary>
     /// The Wanderer's Minuet type.
     /// </summary>
-    WANDERER = 3,
+    Wanderer = 3,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs b/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs
index 30cc0fff0..37569f4bf 100644
--- a/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Enums/SummonPet.cs
@@ -8,10 +8,10 @@ public enum SummonPet : byte
     /// <summary>
     /// No pet.
     /// </summary>
-    NONE = 0,
+    None = 0,
 
     /// <summary>
     /// The summoned pet Carbuncle.
     /// </summary>
-    CARBUNCLE = 23,
+    Carbuncle = 23,
 }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs
index bfcf3cc38..8880c3555 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/BRDGauge.cs
@@ -40,15 +40,15 @@ public unsafe class BRDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
         get
         {
             if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuet))
-                return Song.WANDERER;
+                return Song.Wanderer;
 
             if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeon))
-                return Song.ARMY;
+                return Song.Army;
 
             if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBallad))
-                return Song.MAGE;
+                return Song.Mage;
 
-            return Song.NONE;
+            return Song.None;
         }
     }
 
@@ -60,15 +60,15 @@ public unsafe class BRDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
         get
         {
             if (this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetLastPlayed))
-                return Song.WANDERER;
+                return Song.Wanderer;
 
             if (this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonLastPlayed))
-                return Song.ARMY;
+                return Song.Army;
 
             if (this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladLastPlayed))
-                return Song.MAGE;
+                return Song.Mage;
 
-            return Song.NONE;
+            return Song.None;
         }
     }
 
@@ -76,7 +76,7 @@ public unsafe class BRDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
     /// Gets the song Coda that are currently active.
     /// </summary>
     /// <remarks>
-    /// This will always return an array of size 3, inactive Coda are represented by <see cref="Song.NONE"/>.
+    /// This will always return an array of size 3, inactive Coda are represented by <see cref="Enums.Song.None"/>.
     /// </remarks>
     public Song[] Coda
     {
@@ -84,9 +84,9 @@ public unsafe class BRDGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
         {
             return new[]
             {
-                this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladCoda) ? Song.MAGE : Song.NONE,
-                this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonCoda) ? Song.ARMY : Song.NONE,
-                this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetCoda) ? Song.WANDERER : Song.NONE,
+                this.Struct->SongFlags.HasFlag(SongFlags.MagesBalladCoda) ? Song.Mage : Song.None,
+                this.Struct->SongFlags.HasFlag(SongFlags.ArmysPaeonCoda) ? Song.Army : Song.None,
+                this.Struct->SongFlags.HasFlag(SongFlags.WanderersMinuetCoda) ? Song.Wanderer : Song.None,
             };
         }
     }
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
index 803740f33..31a5ceb9b 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/MNKGauge.cs
@@ -27,7 +27,7 @@ public unsafe class MNKGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
     /// Gets the types of Beast Chakra available.
     /// </summary>
     /// <remarks>
-    /// This will always return an array of size 3, inactive Beast Chakra are represented by <see cref="BeastChakra.NONE"/>.
+    /// This will always return an array of size 3, inactive Beast Chakra are represented by <see cref="Enums.BeastChakra.None"/>.
     /// </remarks>
     public BeastChakra[] BeastChakra => this.Struct->BeastChakra.Select(c => (BeastChakra)c).ToArray();
 
diff --git a/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs b/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
index f3417f002..52dc0e51a 100644
--- a/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
+++ b/Dalamud/Game/ClientState/JobGauge/Types/SAMGauge.cs
@@ -40,17 +40,17 @@ public unsafe class SAMGauge : JobGaugeBase<FFXIVClientStructs.FFXIV.Client.Game
     /// Gets a value indicating whether the Setsu Sen is active.
     /// </summary>
     /// <returns><c>true</c> or <c>false</c>.</returns>
-    public bool HasSetsu => (this.Sen & Sen.SETSU) != 0;
+    public bool HasSetsu => (this.Sen & Sen.Setsu) != 0;
 
     /// <summary>
     /// Gets a value indicating whether the Getsu Sen is active.
     /// </summary>
     /// <returns><c>true</c> or <c>false</c>.</returns>
-    public bool HasGetsu => (this.Sen & Sen.GETSU) != 0;
+    public bool HasGetsu => (this.Sen & Sen.Getsu) != 0;
 
     /// <summary>
     /// Gets a value indicating whether the Ka Sen is active.
     /// </summary>
     /// <returns><c>true</c> or <c>false</c>.</returns>
-    public bool HasKa => (this.Sen & Sen.KA) != 0;
+    public bool HasKa => (this.Sen & Sen.Ka) != 0;
 }