diff --git a/Mage.Sets/src/mage/cards/d/DepthDefiler.java b/Mage.Sets/src/mage/cards/d/DepthDefiler.java
index fbce9638857..95e39e487af 100644
--- a/Mage.Sets/src/mage/cards/d/DepthDefiler.java
+++ b/Mage.Sets/src/mage/cards/d/DepthDefiler.java
@@ -60,7 +60,7 @@ class DepthDefilerTriggeredAbility extends CastSourceTriggeredAbility {
         super(new ReturnToHandTargetEffect(), false);
         this.addTarget(new TargetCreaturePermanent());
         Mode mode = new Mode(new DrawCardTargetEffect(2));
-        mode.addEffect(new DiscardTargetEffect(1).concatBy(", then"));
+        mode.addEffect(new DiscardTargetEffect(1).setText(", then discards a card"));
         mode.addTarget(new TargetPlayer());
         this.addMode(mode);
         this.getModes().setChooseText(
diff --git a/Mage.Sets/src/mage/cards/e/EssenceReliquary.java b/Mage.Sets/src/mage/cards/e/EssenceReliquary.java
index 992b8e1d116..d7658e4fbee 100644
--- a/Mage.Sets/src/mage/cards/e/EssenceReliquary.java
+++ b/Mage.Sets/src/mage/cards/e/EssenceReliquary.java
@@ -61,7 +61,7 @@ class EssenceReliquaryTargetEffect extends OneShotEffect {
 
     EssenceReliquaryTargetEffect() {
         super(Outcome.ReturnToHand);
-        this.staticText = "Return target creature you control and all Auras you control attached to it to their owner's hand";
+        this.staticText = "Return another target permanent you control and all Auras you control attached to it to their owner's hand";
     }
 
     private EssenceReliquaryTargetEffect(final EssenceReliquaryTargetEffect effect) {
@@ -91,4 +91,4 @@ class EssenceReliquaryTargetEffect extends OneShotEffect {
                 .collect(Collectors.toList()));
         return player.moveCards(cards, Zone.HAND, source, game);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/h/HeartwoodStoryteller.java b/Mage.Sets/src/mage/cards/h/HeartwoodStoryteller.java
index e89ca557da5..44426a366da 100644
--- a/Mage.Sets/src/mage/cards/h/HeartwoodStoryteller.java
+++ b/Mage.Sets/src/mage/cards/h/HeartwoodStoryteller.java
@@ -50,7 +50,7 @@ class HeartwoodStorytellerEffect extends OneShotEffect {
 
     HeartwoodStorytellerEffect() {
         super(Outcome.DrawCard);
-        this.staticText = "Each of that player's opponents may draw a card";
+        this.staticText = "each of that player's opponents may draw a card";
     }
 
     private HeartwoodStorytellerEffect(final HeartwoodStorytellerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HydroelectricSpecimen.java b/Mage.Sets/src/mage/cards/h/HydroelectricSpecimen.java
index 2974f04a092..59bbd962f95 100644
--- a/Mage.Sets/src/mage/cards/h/HydroelectricSpecimen.java
+++ b/Mage.Sets/src/mage/cards/h/HydroelectricSpecimen.java
@@ -49,7 +49,7 @@ public final class HydroelectricSpecimen extends ModalDoubleFacedCard {
         // When Hydroelectric Specimen enters the battlefield, you may change the target of target instant or sorcery spell with a single target to Hydroelectric Specimen.
         Effect effect = new ChangeATargetOfTargetSpellAbilityToSourceEffect()
                 .setText("change the target of target instant or sorcery spell with a single target to {this}");
-        Ability ability = new EntersBattlefieldTriggeredAbility(effect, false);
+        Ability ability = new EntersBattlefieldTriggeredAbility(effect, true);
         ability.addTarget(new TargetSpell(filter));
         this.getLeftHalfCard().addAbility(ability);
 
@@ -75,4 +75,4 @@ public final class HydroelectricSpecimen extends ModalDoubleFacedCard {
     public HydroelectricSpecimen copy() {
         return new HydroelectricSpecimen(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java b/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java
index cc02571346f..4a58e83967c 100644
--- a/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java
+++ b/Mage.Sets/src/mage/cards/r/RuricTharTheUnbowed.java
@@ -42,7 +42,7 @@ public final class RuricTharTheUnbowed extends CardImpl {
 
         // Whenever a player casts a noncreature spell, Ruric Thar deals 6 damage to that player.
         this.addAbility(new SpellCastAllTriggeredAbility(
-                new DamageTargetEffect(6),
+                new DamageTargetEffect(6).withTargetDescription("that player"),
                 StaticFilters.FILTER_SPELL_A_NON_CREATURE,
                 false, SetTargetPointer.PLAYER
         ));
@@ -56,4 +56,4 @@ public final class RuricTharTheUnbowed extends CardImpl {
     public RuricTharTheUnbowed copy() {
         return new RuricTharTheUnbowed(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/t/ThrivingSkyclaw.java b/Mage.Sets/src/mage/cards/t/ThrivingSkyclaw.java
index 821bba8b198..ab218bbc117 100644
--- a/Mage.Sets/src/mage/cards/t/ThrivingSkyclaw.java
+++ b/Mage.Sets/src/mage/cards/t/ThrivingSkyclaw.java
@@ -37,7 +37,8 @@ public final class ThrivingSkyclaw extends CardImpl {
 
         // Whenever Thriving Skyclaw attacks, you may pay {E}{E}{E}. If you do, put a +1/+1 counter on it.
         this.addAbility(new AttacksTriggeredAbility(new DoIfCostPaid(
-                new AddCountersSourceEffect(CounterType.P1P1.createInstance()), new PayEnergyCost(3)
+                new AddCountersSourceEffect(CounterType.P1P1.createInstance()).setText("put a +1/+1 counter on it"),
+                new PayEnergyCost(3)
         )));
     }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
index ca47c62d81e..768462f1dd4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java
@@ -99,12 +99,9 @@ public class DamageTargetEffect extends OneShotEffect {
         this.sourceName = effect.sourceName;
     }
 
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
+    public DamageTargetEffect withTargetDescription(String targetDescription) {
+        this.targetDescription = targetDescription;
+        return this;
     }
 
     // TODO: this should most likely be refactored to not be needed and always use target pointer.