diff --git a/sim/core/buffs.go b/sim/core/buffs.go
index 0af9973c73..bc2a5bde09 100644
--- a/sim/core/buffs.go
+++ b/sim/core/buffs.go
@@ -652,7 +652,7 @@ func registerPowerInfusionCD(agent Agent, numPowerInfusions int32) {
 
 			ShouldActivate: func(sim *Simulation, character *Character) bool {
 				// Haste portion doesn't stack with Bloodlust, so prefer to wait.
-				return !character.HasActiveAuraWithTag(BloodlustAuraTag)
+				return !character.HasActiveAura("Bloodlust-" + BloodlustActionID.WithTag(-1).String())
 			},
 			AddAura: func(sim *Simulation, character *Character) { piAura.Activate(sim) },
 		},
diff --git a/sim/druid/balance/rotation.go b/sim/druid/balance/rotation.go
index 5a1cf0a435..e0a633aad4 100644
--- a/sim/druid/balance/rotation.go
+++ b/sim/druid/balance/rotation.go
@@ -78,7 +78,7 @@ func (moonkin *BalanceDruid) rotation(sim *core.Simulation) (*druid.DruidSpell,
 		return moonkin.Hurricane, target
 	}
 
-	shouldHoldIs := core.Ternary(moonkin.MoonkinT84PCAura == nil, lunarIsActive, lunarIsActive && moonkin.HasActiveAuraWithTag(core.BloodlustAuraTag))
+	shouldHoldIs := core.Ternary(moonkin.MoonkinT84PCAura == nil, lunarIsActive, lunarIsActive && moonkin.HasActiveAura("Bloodlust-"+core.BloodlustActionID.WithTag(-1).String()))
 
 	// Max IS uptime
 	if rotation.IsUsage == proto.BalanceDruid_Rotation_OptimizeIs && !shouldHoldIs {
@@ -146,7 +146,7 @@ func (moonkin *BalanceDruid) rotation(sim *core.Simulation) (*druid.DruidSpell,
 					moonkin.castMajorCooldown(moonkin.hyperSpeedMCD, sim, target)
 					moonkin.castMajorCooldown(moonkin.potionSpeedMCD, sim, target)
 					moonkin.useTrinkets(stats.SpellHaste, sim, target)
-					if !moonkin.HasActiveAuraWithTag(core.BloodlustAuraTag) {
+					if !moonkin.HasActiveAura("Bloodlust-" + core.BloodlustActionID.WithTag(-1).String()) {
 						moonkin.castMajorCooldown(moonkin.powerInfusion, sim, target)
 					}
 				}
diff --git a/sim/priest/power_infusion.go b/sim/priest/power_infusion.go
index 1acb5b4fd5..37de070beb 100644
--- a/sim/priest/power_infusion.go
+++ b/sim/priest/power_infusion.go
@@ -48,7 +48,7 @@ func (priest *Priest) registerPowerInfusionCD() {
 			//if powerInfusionTarget.CurrentMana() < 3000 {
 			//	return false
 			//}
-			return !powerInfusionTarget.HasActiveAuraWithTag(core.BloodlustAuraTag)
+			return !powerInfusionTarget.HasActiveAura("Bloodlust-" + core.BloodlustActionID.WithTag(-1).String())
 		},
 	})
 }
diff --git a/sim/shaman/bloodlust.go b/sim/shaman/bloodlust.go
index 6630cad8c5..abc127a281 100644
--- a/sim/shaman/bloodlust.go
+++ b/sim/shaman/bloodlust.go
@@ -46,7 +46,7 @@ func (shaman *Shaman) registerBloodlustCD() {
 			// major CD ordering issues with the shared bloodlust.
 			for _, party := range shaman.Env.Raid.Parties {
 				for _, partyMember := range party.Players {
-					if partyMember.GetCharacter().HasActiveAuraWithTag(core.BloodlustAuraTag) {
+					if partyMember.GetCharacter().HasActiveAura("Bloodlust-" + core.BloodlustActionID.WithTag(-1).String()) {
 						return false
 					}
 				}
diff --git a/sim/warlock/metamorphosis.go b/sim/warlock/metamorphosis.go
index 6c048a8b76..ea221c3dc2 100644
--- a/sim/warlock/metamorphosis.go
+++ b/sim/warlock/metamorphosis.go
@@ -47,7 +47,7 @@ func (warlock *Warlock) registerMetamorphosisSpell() {
 			}
 			MetamorphosisNumber := (float64(sim.Duration) + float64(warlock.MetamorphosisAura.Duration)) / float64(warlock.Metamorphosis.CD.Duration)
 			if MetamorphosisNumber < 1 {
-				return character.HasActiveAuraWithTag(core.BloodlustAuraTag) || sim.IsExecutePhase35()
+				return warlock.HasActiveAura("Bloodlust-"+core.BloodlustActionID.WithTag(-1).String()) || sim.IsExecutePhase35()
 			}
 
 			return true