diff --git a/Assets/Battle/CardsHeroes/CardCover.cs b/Assets/Battle/CardsHeroes/CoverHCard.cs
similarity index 88%
rename from Assets/Battle/CardsHeroes/CardCover.cs
rename to Assets/Battle/CardsHeroes/CoverHCard.cs
index 8789597..a229a62 100644
--- a/Assets/Battle/CardsHeroes/CardCover.cs
+++ b/Assets/Battle/CardsHeroes/CoverHCard.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CardCover : HeroCard
+public class CoverHCard : HeroCard
 {
-    public CardCover(BattleParticipant owner)
+    public CoverHCard(BattleParticipant owner)
         : base(owner, HCardId.Cover, "Cover", 1, CardType.Skill,
             "Block 3 damage on another target ally.") {
 
diff --git a/Assets/Battle/CardsHeroes/CardCover.cs.meta b/Assets/Battle/CardsHeroes/CoverHCard.cs.meta
similarity index 100%
rename from Assets/Battle/CardsHeroes/CardCover.cs.meta
rename to Assets/Battle/CardsHeroes/CoverHCard.cs.meta
diff --git a/Assets/Battle/CardsHeroes/CardCrashingPunch.cs b/Assets/Battle/CardsHeroes/CrashingPunchHCard.cs
similarity index 86%
rename from Assets/Battle/CardsHeroes/CardCrashingPunch.cs
rename to Assets/Battle/CardsHeroes/CrashingPunchHCard.cs
index 01bcdff..3591147 100644
--- a/Assets/Battle/CardsHeroes/CardCrashingPunch.cs
+++ b/Assets/Battle/CardsHeroes/CrashingPunchHCard.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CardCrashingPunch : HeroCard
+public class CrashingPunchHCard : HeroCard
 {
-    public CardCrashingPunch(BattleParticipant owner)
+    public CrashingPunchHCard(BattleParticipant owner)
         : base(owner, HCardId.CrashingPunch, "Crashing Punch", 3, CardType.Attack,
             "Deals 3 damage to target.") {
     }
diff --git a/Assets/Battle/CardsHeroes/CardCrashingPunch.cs.meta b/Assets/Battle/CardsHeroes/CrashingPunchHCard.cs.meta
similarity index 100%
rename from Assets/Battle/CardsHeroes/CardCrashingPunch.cs.meta
rename to Assets/Battle/CardsHeroes/CrashingPunchHCard.cs.meta
diff --git a/Assets/Battle/CardsHeroes/CardLightningStrike.cs b/Assets/Battle/CardsHeroes/LightningStrikeHCard.cs
similarity index 86%
rename from Assets/Battle/CardsHeroes/CardLightningStrike.cs
rename to Assets/Battle/CardsHeroes/LightningStrikeHCard.cs
index 5ac5348..2a61430 100644
--- a/Assets/Battle/CardsHeroes/CardLightningStrike.cs
+++ b/Assets/Battle/CardsHeroes/LightningStrikeHCard.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CardLightningStrike : HeroCard
+public class LightningStrikeHCard : HeroCard
 {
-    public CardLightningStrike(BattleParticipant owner)
+    public LightningStrikeHCard(BattleParticipant owner)
         : base(owner, HCardId.LightningStrike, "Lightning Strike", 2, CardType.Attack,
             "Deals 3 damage to target.") {
     }
diff --git a/Assets/Battle/CardsHeroes/CardLightningStrike.cs.meta b/Assets/Battle/CardsHeroes/LightningStrikeHCard.cs.meta
similarity index 100%
rename from Assets/Battle/CardsHeroes/CardLightningStrike.cs.meta
rename to Assets/Battle/CardsHeroes/LightningStrikeHCard.cs.meta
diff --git a/Assets/Battle/CardsHeroes/CardScarring.cs b/Assets/Battle/CardsHeroes/ScarringHCard.cs
similarity index 91%
rename from Assets/Battle/CardsHeroes/CardScarring.cs
rename to Assets/Battle/CardsHeroes/ScarringHCard.cs
index 4eb06ff..e66ddf4 100644
--- a/Assets/Battle/CardsHeroes/CardScarring.cs
+++ b/Assets/Battle/CardsHeroes/ScarringHCard.cs
@@ -2,9 +2,9 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CardScarring : HeroCard
+public class ScarringHCard : HeroCard
 {
-    public CardScarring(BattleParticipant owner)
+    public ScarringHCard(BattleParticipant owner)
         : base(owner, HCardId.Scarring, "Scarring", 2, CardType.Skill,
             "Block 4 damage. The next time damage is taken until next turn, gain 1 Max HP.") {
     }
diff --git a/Assets/Battle/CardsHeroes/CardScarring.cs.meta b/Assets/Battle/CardsHeroes/ScarringHCard.cs.meta
similarity index 100%
rename from Assets/Battle/CardsHeroes/CardScarring.cs.meta
rename to Assets/Battle/CardsHeroes/ScarringHCard.cs.meta
diff --git a/Assets/Battle/CardsHeroes/CardThunderstorm.cs b/Assets/Battle/CardsHeroes/ThunderstormHCard.cs
similarity index 86%
rename from Assets/Battle/CardsHeroes/CardThunderstorm.cs
rename to Assets/Battle/CardsHeroes/ThunderstormHCard.cs
index 6d1ffc8..3111db5 100644
--- a/Assets/Battle/CardsHeroes/CardThunderstorm.cs
+++ b/Assets/Battle/CardsHeroes/ThunderstormHCard.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-public class CardThunderstorm : HeroCard
+public class ThunderstormHCard : HeroCard
 {
-    public CardThunderstorm(BattleParticipant owner)
+    public ThunderstormHCard(BattleParticipant owner)
         : base(owner, HCardId.Thunderstorm, "Thunderstorm", 3, CardType.Enchantment,
             "Add 1 max energy. Acquire 2 Lightning Strike into draw pile.") {
     }
diff --git a/Assets/Battle/CardsHeroes/CardThunderstorm.cs.meta b/Assets/Battle/CardsHeroes/ThunderstormHCard.cs.meta
similarity index 100%
rename from Assets/Battle/CardsHeroes/CardThunderstorm.cs.meta
rename to Assets/Battle/CardsHeroes/ThunderstormHCard.cs.meta
diff --git a/Assets/Battle/HeroCardDatabase.cs b/Assets/Battle/HeroCardDatabase.cs
index 2998ba3..286f682 100644
--- a/Assets/Battle/HeroCardDatabase.cs
+++ b/Assets/Battle/HeroCardDatabase.cs
@@ -37,15 +37,15 @@ public class HeroCardDatabase : CardDatabase<HeroCard>
         switch (heroCardId)
         {
             case HCardId.CrashingPunch:
-                return new CardCrashingPunch(owner);
+                return new CrashingPunchHCard(owner);
             case HCardId.Cover:
-                return new CardCover(owner);
+                return new CoverHCard(owner);
             case HCardId.LightningStrike:
-                return new CardLightningStrike(owner);
+                return new LightningStrikeHCard(owner);
             case HCardId.Scarring:
-                return new CardScarring(owner);
+                return new ScarringHCard(owner);
             case HCardId.Thunderstorm:
-                return new CardThunderstorm(owner);
+                return new ThunderstormHCard(owner);
             case HCardId.Meditate:
                 return new MeditateHCard(owner);
             default:
diff --git a/TODO.txt b/TODO.txt
index cb77fed..2ad16b6 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -2,4 +2,3 @@
 - Make hero cards be used in sequence Coroutines, not in parallel
 - Do not Highlight unusable cards
 - Dim unusable cards
-- Rename HCard classes
\ No newline at end of file