diff --git a/forge-gui/res/cardsfolder/b/beacon_of_destiny.txt b/forge-gui/res/cardsfolder/b/beacon_of_destiny.txt
index d513155db5d..b35565ff1f5 100644
--- a/forge-gui/res/cardsfolder/b/beacon_of_destiny.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_destiny.txt
@@ -4,7 +4,7 @@ Types:Creature Human Cleric
 PT:1/3
 A:AB$ ChooseSource | Cost$ T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to CARDNAME instead.
 
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDamage,ExileEffect | References$ SelflessDamage,OutOfSight,SelflessDamage,ExileEffect | Duration$ HostLeavesOrEOT | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,OutOfSight | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | Duration$ HostLeavesOrEOT | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
 
 SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | DamageTarget$ EffectSource | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to EFFECTSOURCE instead.
 
diff --git a/forge-gui/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt b/forge-gui/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
index 5d8a550cf96..66217b0b861 100644
--- a/forge-gui/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
+++ b/forge-gui/res/cardsfolder/o/opal_eye_kondas_yojimbo.txt
@@ -5,9 +5,9 @@ PT:1/4
 K:Defender
 K:Bushido 1
 A:AB$ ChooseSource | Cost$ T | Choices$ Card | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a source of your choice would deal damage this turn, that damage is dealt to CARDNAME instead.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ OpalDamage | Triggers$ OutOfSight | SVars$ OpalDmg,ExileEffect | References$ OpalDamage,OutOfSight,OpalDmg,ExileEffect | RememberObjects$ Targeted | Duration$ HostLeavesOrEOT | SubAbility$ DBCleanup
-SVar:OpalDamage:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.ChosenCard | ReplaceWith$ OpalDmg | DamageTarget$ EffectSource | Description$ The next time a source of your choice would deal damage this turn, that damage is dealt to EFFECTSOURCE instead.
-SVar:OpalDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card | SubAbility$ ExileEffect
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ SelflessDamage | Triggers$ OutOfSight | SVars$ SelflessDmg,OutOfSight | References$ SelflessDamage,OutOfSight,SelflessDmg,ExileEffect | Duration$ HostLeavesOrEOT | SubAbility$ DBCleanup | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:SelflessDamage:Event$ DamageDone | ValidTarget$ You | ValidSource$ Card.ChosenCard | ReplaceWith$ SelflessDmg | DamageTarget$ EffectSource | Description$ The next time a source of your choice would deal damage to you this turn, that damage is dealt to EFFECTSOURCE instead.
+SVar:SelflessDmg:DB$ ReplaceEffect | VarName$ Affected | VarValue$ EffectSource | VarType$ Card | SubAbility$ ExileEffect
 SVar:OutOfSight:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Defined$ ChosenCard | Execute$ ExileEffect | Static$ True
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile | Static$ True
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True