diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java
index dece432f253..536d24883d8 100644
--- a/forge-game/src/main/java/forge/game/card/Card.java
+++ b/forge-game/src/main/java/forge/game/card/Card.java
@@ -2350,7 +2350,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
                         || keyword.equals("Double team") || keyword.equals("Living metal")
                         || keyword.equals("Suspend") // for the ones without amount
                         || keyword.equals("Foretell") // for the ones without cost
-                        || keyword.equals("Ascend") || keyword.equals("Totem armor")
+                        || keyword.equals("Ascend") || keyword.equals("Umbra armor")
                         || keyword.equals("Battle cry") || keyword.equals("Devoid") || keyword.equals("Riot")
                         || keyword.equals("Daybound") || keyword.equals("Nightbound")
                         || keyword.equals("Friends forever") || keyword.equals("Choose a Background")
diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
index 47d275444ab..be8089b5eb6 100644
--- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
+++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
@@ -2454,10 +2454,20 @@ public class CardFactoryUtil {
             re.getOverridingAbility().setSVar("Sunburst", "Count$Converge");
 
             inst.addReplacement(re);
-        } else if (keyword.equals("Totem armor")) {
-            String repeffstr = "Event$ Destroy | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy"
-                    + " | Secondary$ True | TotemArmor$ True"
-                    + " | Description$ Totem armor (" + inst.getReminderText() + ")";
+        } else if (keyword.startsWith("Tribute")) {
+            final String[] k = keyword.split(":");
+            final String tributeAmount = k[1];
+
+            final String effect = "DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ " + tributeAmount
+                    + " | ETB$ True | SpellDescription$ Tribute " + tributeAmount
+                    + " (" + inst.getReminderText() + ")";
+
+            ReplacementEffect cardre = createETBReplacement(card, ReplacementLayer.Other, effect, false, true, intrinsic, "Card.Self", "");
+
+            inst.addReplacement(cardre);
+        } else if (keyword.equals("Umbra armor")) {
+            String repeffstr = "Event$ Destroy | ActiveZones$ Battlefield | ValidCard$ Card.EnchantedBy | Secondary$ True"
+                    + " | Description$ Umbra armor (" + inst.getReminderText() + ")";
 
             String abprevDamage = "DB$ DealDamage | Defined$ ReplacedCard | Remove$ All ";
             String abdestroy = "DB$ Destroy | Defined$ Self";
@@ -2477,17 +2487,6 @@ public class CardFactoryUtil {
             re.setOverridingAbility(sa);
 
             inst.addReplacement(re);
-        } else if (keyword.startsWith("Tribute")) {
-            final String[] k = keyword.split(":");
-            final String tributeAmount = k[1];
-
-            final String effect = "DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | CounterNum$ " + tributeAmount
-                    + " | ETB$ True | SpellDescription$ Tribute " + tributeAmount
-                    + " (" + inst.getReminderText() + ")";
-
-            ReplacementEffect cardre = createETBReplacement(card, ReplacementLayer.Other, effect, false, true, intrinsic, "Card.Self", "");
-
-            inst.addReplacement(cardre);
         } else if (keyword.equals("Unleash")) {
             String effect = "DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | ETB$ True | CounterNum$ 1 | SpellDescription$ Unleash (" + inst.getReminderText() + ")";
 
diff --git a/forge-game/src/main/java/forge/game/keyword/Keyword.java b/forge-game/src/main/java/forge/game/keyword/Keyword.java
index d71ef92ecd6..153fc8f364b 100644
--- a/forge-game/src/main/java/forge/game/keyword/Keyword.java
+++ b/forge-game/src/main/java/forge/game/keyword/Keyword.java
@@ -180,7 +180,6 @@ public enum Keyword {
     SUNBURST("Sunburst", SimpleKeyword.class, false, "This enters the battlefield with either a +1/+1 or charge counter on it for each color of mana spent to cast it based on whether it's a creature."),
     SURGE("Surge", KeywordWithCost.class, false, "You may cast this spell for its surge cost if you or a teammate has cast another spell this turn."),
     SUSPEND("Suspend", Suspend.class, false, "If you could begin to cast this card by putting it onto the stack from your hand, you may pay %s and exile it with {%d:time counter} on it. At the beginning of your upkeep, remove a time counter. When the last is removed, play it without paying its mana cost. If you cast a creature spell this way, it gains haste until you lose control of the spell or the permanent it becomes."),
-    TOTEM_ARMOR("Totem armor", SimpleKeyword.class, true, "If enchanted permanent would be destroyed, instead remove all damage marked on it and destroy this Aura."),
     TOXIC("Toxic", KeywordWithAmount.class, false, "Players dealt combat damage by this creature also get {%d:poison counter}."),
     TRAINING("Training", SimpleKeyword.class, false, "Whenever this creature attacks with another creature with greater power, put a +1/+1 counter on this creature."),
     TRAMPLE("Trample", Trample.class, true, "This creature can deal excess combat damage to the player or planeswalker it's attacking."),
@@ -188,6 +187,7 @@ public enum Keyword {
     TRANSMUTE("Transmute", KeywordWithCost.class, false, "%s, Discard this card: Search your library for a card with the same mana value as this card, reveal it, and put it into your hand, then shuffle. Transmute only as a sorcery."),
     TRIBUTE("Tribute", KeywordWithAmount.class, false, "As this creature enters the battlefield, an opponent of your choice may put {%d:+1/+1 counter} on it."),
     TYPECYCLING("TypeCycling", KeywordWithCostAndType.class, false, "%s, Discard this card: Search your library for a %s card, reveal it, put it into your hand, then shuffle."),
+    UMBRA_ARMOR("Umbra armor", SimpleKeyword.class, true, "If enchanted permanent would be destroyed, instead remove all damage marked on it and destroy this Aura."),
     UNDAUNTED("Undaunted", SimpleKeyword.class, false, "This spell costs {1} less to cast for each opponent."),
     UNDYING("Undying", SimpleKeyword.class, false, "When this creature dies, if it had no +1/+1 counters on it, return it to the battlefield under its owner's control with a +1/+1 counter on it."),
     UNEARTH("Unearth", KeywordWithCost.class, false, "%s: Return this card from your graveyard to the battlefield. It gains haste. Exile it at the beginning of the next end step or if it would leave the battlefield. Unearth only as a sorcery."),
diff --git a/forge-gui/res/cardsfolder/b/bear_umbra.txt b/forge-gui/res/cardsfolder/b/bear_umbra.txt
index 3ffb9bbe6b8..9e13909834c 100644
--- a/forge-gui/res/cardsfolder/b/bear_umbra.txt
+++ b/forge-gui/res/cardsfolder/b/bear_umbra.txt
@@ -2,10 +2,10 @@ Name:Bear Umbra
 ManaCost:2 G G
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 2 G G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddTrigger$ TrigUntap | AddSVar$ BearUmbraUntap & HasAttackEffect | Description$ Enchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control."
 SVar:TrigUntap:Mode$ Attacks | ValidCard$ Card.Self | Execute$ BearUmbraUntap | TriggerDescription$ Whenever this creature attacks, untap all lands you control.
 SVar:BearUmbraUntap:DB$ UntapAll | ValidCards$ Land.YouCtrl
 SVar:HasAttackEffect:TRUE
-Oracle:Enchant creature\nEnchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control."\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +2/+2 and has "Whenever this creature attacks, untap all lands you control."\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/b/boar_umbra.txt b/forge-gui/res/cardsfolder/b/boar_umbra.txt
index ee12ed64467..42240589f5b 100644
--- a/forge-gui/res/cardsfolder/b/boar_umbra.txt
+++ b/forge-gui/res/cardsfolder/b/boar_umbra.txt
@@ -2,7 +2,7 @@ Name:Boar Umbra
 ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | Description$ Enchanted creature gets +3/+3.
-Oracle:Enchant creature\nEnchanted creature gets +3/+3.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +3/+3.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/c/crab_umbra.txt b/forge-gui/res/cardsfolder/c/crab_umbra.txt
index e055e401660..1dc8afded32 100644
--- a/forge-gui/res/cardsfolder/c/crab_umbra.txt
+++ b/forge-gui/res/cardsfolder/c/crab_umbra.txt
@@ -2,8 +2,8 @@ Name:Crab Umbra
 ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
 A:AB$ Untap | Cost$ 2 U | Defined$ Enchanted | SpellDescription$ Untap enchanted creature.
 SVar:NonStackingAttachEffect:True
-Oracle:Enchant creature\n{2}{U}: Untap enchanted creature.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\n{2}{U}: Untap enchanted creature.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/d/drake_umbra.txt b/forge-gui/res/cardsfolder/d/drake_umbra.txt
index effe7bb4830..fb77b372d5f 100644
--- a/forge-gui/res/cardsfolder/d/drake_umbra.txt
+++ b/forge-gui/res/cardsfolder/d/drake_umbra.txt
@@ -2,7 +2,7 @@ Name:Drake Umbra
 ManaCost:4 U
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 4 U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Flying | Description$ Enchanted creature gets +3/+3 and has flying.
-Oracle:Enchant creature\nEnchanted creature gets +3/+3 and has flying.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +3/+3 and has flying.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/e/eel_umbra.txt b/forge-gui/res/cardsfolder/e/eel_umbra.txt
index 09fb5b1a6b8..fd150c8c38a 100644
--- a/forge-gui/res/cardsfolder/e/eel_umbra.txt
+++ b/forge-gui/res/cardsfolder/e/eel_umbra.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Enchantment Aura
 K:Enchant creature
 K:Flash
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | Description$ Enchanted creature gets +1/+1.
-Oracle:Flash (You may cast this spell any time you could cast an instant.)\nEnchant creature\nEnchanted creature gets +1/+1.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Flash (You may cast this spell any time you could cast an instant.)\nEnchant creature\nEnchanted creature gets +1/+1.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/e/eland_umbra.txt b/forge-gui/res/cardsfolder/e/eland_umbra.txt
index 3bb27a6193f..6f3214301e1 100644
--- a/forge-gui/res/cardsfolder/e/eland_umbra.txt
+++ b/forge-gui/res/cardsfolder/e/eland_umbra.txt
@@ -2,7 +2,7 @@ Name:Eland Umbra
 ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 4 | Description$ Enchanted creature gets +0/+4.
-Oracle:Enchant creature\nEnchanted creature gets +0/+4.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +0/+4.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/e/estrid_the_masked.txt b/forge-gui/res/cardsfolder/e/estrid_the_masked.txt
index b3feba8fa04..757faf9c0ce 100644
--- a/forge-gui/res/cardsfolder/e/estrid_the_masked.txt
+++ b/forge-gui/res/cardsfolder/e/estrid_the_masked.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Estrid
 Loyalty:3
 A:AB$ UntapAll | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | ValidCards$ Permanent.enchanted+YouCtrl | SpellDescription$ Untap each enchanted permanent you control.
 SVar:BuffedBy:Permanent.enchanted
-A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ mask | TokenOwner$ You | AttachedTo$ Targeted | ValidTgts$ Permanent.Other | TgtPrompt$ Select target permanent to attach Mask Token | SpellDescription$ Create a white Aura enchantment token named Mask attached to another target permanent. The token has enchant permanent and totem armor.
+A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ mask | TokenOwner$ You | AttachedTo$ Targeted | ValidTgts$ Permanent.Other | TgtPrompt$ Select target permanent to attach Mask Token | SpellDescription$ Create a white Aura enchantment token named Mask attached to another target permanent. The token has enchant permanent and umbra armor.
 DeckHas:Ability$Token
 A:AB$ Mill | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | NumCards$ 7 | Defined$ You | SubAbility$ DBChangeZone | SpellDescription$ Mill seven cards. Return all non-Aura enchantment cards from your graveyard to the battlefield, then do the same for Aura cards.
 SVar:DBChangeZone:DB$ ChangeZoneAll | ChangeType$ Enchantment.nonAura+YouCtrl | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBChangeZone2
diff --git a/forge-gui/res/cardsfolder/f/felidar_umbra.txt b/forge-gui/res/cardsfolder/f/felidar_umbra.txt
index 1acada36049..cb6a4ec33a0 100644
--- a/forge-gui/res/cardsfolder/f/felidar_umbra.txt
+++ b/forge-gui/res/cardsfolder/f/felidar_umbra.txt
@@ -2,8 +2,8 @@ Name:Felidar Umbra
 ManaCost:1 W
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 1 W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddKeyword$ Lifelink | Description$ Enchanted creature has lifelink.
 A:AB$ Attach | Cost$ 1 W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SpellDescription$ Attach CARDNAME to target creature you control.
-Oracle:Enchant creature\nEnchanted creature has lifelink.\n{1}{W}: Attach Felidar Umbra to target creature you control.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature has lifelink.\n{1}{W}: Attach Felidar Umbra to target creature you control.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/h/hyena_umbra.txt b/forge-gui/res/cardsfolder/h/hyena_umbra.txt
index 67abaab012f..eff054c720d 100644
--- a/forge-gui/res/cardsfolder/h/hyena_umbra.txt
+++ b/forge-gui/res/cardsfolder/h/hyena_umbra.txt
@@ -2,7 +2,7 @@ Name:Hyena Umbra
 ManaCost:W
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ First Strike | Description$ Enchanted creature gets +1/+1 and has first strike.
-Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has first strike.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has first strike.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/i/indrik_umbra.txt b/forge-gui/res/cardsfolder/i/indrik_umbra.txt
index 090da54e3d5..d7b6b8ac102 100644
--- a/forge-gui/res/cardsfolder/i/indrik_umbra.txt
+++ b/forge-gui/res/cardsfolder/i/indrik_umbra.txt
@@ -2,7 +2,7 @@ Name:Indrik Umbra
 ManaCost:4 G W
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 4 G W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 4 | AddToughness$ 4 | AddKeyword$ First Strike | AddHiddenKeyword$ All creatures able to block CARDNAME do so. | Description$ Enchanted creature gets +4/+4 and has first strike, and all creatures able to block it do so.
-Oracle:Enchant creature\nEnchanted creature gets +4/+4 and has first strike, and all creatures able to block it do so.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +4/+4 and has first strike, and all creatures able to block it do so.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/m/mammoth_umbra.txt b/forge-gui/res/cardsfolder/m/mammoth_umbra.txt
index 0cc77d5baa8..24821c87d7d 100644
--- a/forge-gui/res/cardsfolder/m/mammoth_umbra.txt
+++ b/forge-gui/res/cardsfolder/m/mammoth_umbra.txt
@@ -2,7 +2,7 @@ Name:Mammoth Umbra
 ManaCost:4 W
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 4 W | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 3 | AddToughness$ 3 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +3/+3 and has vigilance.
-Oracle:Enchant creature\nEnchanted creature gets +3/+3 and has vigilance.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +3/+3 and has vigilance.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/o/octopus_umbra.txt b/forge-gui/res/cardsfolder/o/octopus_umbra.txt
index 4ebe25c2bf5..28f10583469 100644
--- a/forge-gui/res/cardsfolder/o/octopus_umbra.txt
+++ b/forge-gui/res/cardsfolder/o/octopus_umbra.txt
@@ -1,10 +1,10 @@
 Name:Octopus Umbra
 ManaCost:3 U U
 Types:Enchantment Aura
-K:Totem Armor
+K:Umbra armor
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 U U | ValidTgts$ Creature | AILogic$ Animate
 S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetPower$ 8 | SetToughness$ 8 | AddTrigger$ AttackTrigger | AddSVar$ TrigTap | Description$ Enchanted creature has base power and toughness 8/8 and has "Whenever this creature attacks, you may tap target creature with power 8 or less."
 SVar:AttackTrigger:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap target creature with power 8 or less.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.powerLE8 | TgtPrompt$ Select target creature
-Oracle:Enchant creature\nEnchanted creature has base power and toughness 8/8 and has "Whenever this creature attacks, you may tap target creature with power 8 or less."\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature has base power and toughness 8/8 and has "Whenever this creature attacks, you may tap target creature with power 8 or less."\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/s/snake_umbra.txt b/forge-gui/res/cardsfolder/s/snake_umbra.txt
index 30e07fe97d9..e608d40c303 100644
--- a/forge-gui/res/cardsfolder/s/snake_umbra.txt
+++ b/forge-gui/res/cardsfolder/s/snake_umbra.txt
@@ -2,9 +2,9 @@ Name:Snake Umbra
 ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Curiosity
 S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddPower$ 1 | AddToughness$ 1 | AddTrigger$ TriggerDamageDone | AddSVar$ SnakeUmbraDraw | Description$ Enchanted creature gets +1/+1 and has "Whenever this creature deals damage to an opponent, you may draw a card."
 SVar:TriggerDamageDone:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | OptionalDecider$ You | Execute$ SnakeUmbraDraw | TriggerDescription$ Whenever this creature deals damage to an opponent, you may draw a card.
 SVar:SnakeUmbraDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has "Whenever this creature deals damage to an opponent, you may draw a card."\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has "Whenever this creature deals damage to an opponent, you may draw a card."\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/s/spider_umbra.txt b/forge-gui/res/cardsfolder/s/spider_umbra.txt
index 094a2ec1506..ff9a85d37d4 100644
--- a/forge-gui/res/cardsfolder/s/spider_umbra.txt
+++ b/forge-gui/res/cardsfolder/s/spider_umbra.txt
@@ -2,7 +2,7 @@ Name:Spider Umbra
 ManaCost:G
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Reach | Description$ Enchanted creature gets +1/+1 and has reach. (It can block creatures with flying.)
-Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has reach. (It can block creatures with flying.)\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +1/+1 and has reach. (It can block creatures with flying.)\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/t/treefolk_umbra.txt b/forge-gui/res/cardsfolder/t/treefolk_umbra.txt
index c1809410686..343c9d829e1 100644
--- a/forge-gui/res/cardsfolder/t/treefolk_umbra.txt
+++ b/forge-gui/res/cardsfolder/t/treefolk_umbra.txt
@@ -2,8 +2,8 @@ Name:Treefolk Umbra
 ManaCost:2 G
 Types:Enchantment Aura
 K:Enchant creature
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddToughness$ 2 | Description$ Enchanted creature gets +0/+2 and assigns combat damage equal to its toughness rather than its power.
 S:Mode$ CombatDamageToughness | ValidCard$ Creature.EnchantedBy | Secondary$ True | Description$ Enchanted creature gets +0/+2 and assigns combat damage equal to its toughness rather than its power.
-Oracle:Enchant creature\nEnchanted creature gets +0/+2 and assigns combat damage equal to its toughness rather than its power.\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
+Oracle:Enchant creature\nEnchanted creature gets +0/+2 and assigns combat damage equal to its toughness rather than its power.\nUmbra armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.)
diff --git a/forge-gui/res/cardsfolder/u/umbra_mystic.txt b/forge-gui/res/cardsfolder/u/umbra_mystic.txt
index 30f70e13246..c6eddeb69a6 100644
--- a/forge-gui/res/cardsfolder/u/umbra_mystic.txt
+++ b/forge-gui/res/cardsfolder/u/umbra_mystic.txt
@@ -2,6 +2,6 @@ Name:Umbra Mystic
 ManaCost:2 W
 Types:Creature Human Wizard
 PT:2/2
-S:Mode$ Continuous | Affected$ Aura.AttachedTo Permanent.YouCtrl | AddKeyword$ Totem armor | Description$ Auras attached to permanents you control have totem armor. (If an enchanted permanent you control would be destroyed, instead remove all damage from it and destroy an Aura attached to it.)
+S:Mode$ Continuous | Affected$ Aura.AttachedTo Permanent.YouCtrl | AddKeyword$ Umbra armor | Description$ Auras attached to permanents you control have umbra armor. (If an enchanted permanent you control would be destroyed, instead remove all damage from it and destroy an Aura attached to it.)
 SVar:PlayMain1:TRUE
-Oracle:Auras attached to permanents you control have totem armor. (If an enchanted permanent you control would be destroyed, instead remove all damage from it and destroy an Aura attached to it.)
+Oracle:Auras attached to permanents you control have umbra armor. (If an enchanted permanent you control would be destroyed, instead remove all damage from it and destroy an Aura attached to it.)
diff --git a/forge-gui/res/tokenscripts/mask.txt b/forge-gui/res/tokenscripts/mask.txt
index da706d2b692..7d6e3dc1b71 100644
--- a/forge-gui/res/tokenscripts/mask.txt
+++ b/forge-gui/res/tokenscripts/mask.txt
@@ -3,6 +3,6 @@ ManaCost:no cost
 Colors:white
 Types:Enchantment Aura
 K:Enchant permanent
-K:Totem armor
+K:Umbra armor
 A:SP$ Attach | Cost$ 0 | ValidTgts$ Permanent | AILogic$ Pump
-Oracle:Enchant permanent\nTotem armor
+Oracle:Enchant permanent\nUmbra armor