diff --git a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java
index bab93c72206..8606501f5c8 100644
--- a/Mage.Sets/src/mage/cards/a/AquamorphEntity.java
+++ b/Mage.Sets/src/mage/cards/a/AquamorphEntity.java
@@ -69,7 +69,7 @@ class AquamorphEntityReplacementEffect extends ReplacementEffectImpl {
     public boolean checksEventType(GameEvent event, Game game) {
         switch (event.getType()) {
             case ENTERS_THE_BATTLEFIELD:
-            case TURNFACEUP:
+            case TURN_FACE_UP:
                 return true;
             default:
                 return false;
@@ -86,7 +86,7 @@ class AquamorphEntityReplacementEffect extends ReplacementEffectImpl {
                 }
             }
         }
-        if (event.getType() == GameEvent.EventType.TURNFACEUP) {
+        if (event.getType() == GameEvent.EventType.TURN_FACE_UP) {
             return event.getTargetId().equals(source.getSourceId());
         }
         return false;
diff --git a/Mage.Sets/src/mage/cards/f/FatalMutation.java b/Mage.Sets/src/mage/cards/f/FatalMutation.java
index 989229771bc..26c12c41d45 100644
--- a/Mage.Sets/src/mage/cards/f/FatalMutation.java
+++ b/Mage.Sets/src/mage/cards/f/FatalMutation.java
@@ -67,7 +67,7 @@ class FatalMutationAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.TURNEDFACEUP;
+        return event.getType() == GameEvent.EventType.TURNED_FACE_UP;
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java
index 02e5b1a900c..e52291659be 100644
--- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOrTurnedFaceUpTriggeredAbility.java
@@ -35,7 +35,7 @@ public class EntersBattlefieldOrTurnedFaceUpTriggeredAbility extends TriggeredAb
 
     @Override
     public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.TURNEDFACEUP
+        return event.getType() == GameEvent.EventType.TURNED_FACE_UP
                 || event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD;
     }
 
@@ -45,7 +45,7 @@ public class EntersBattlefieldOrTurnedFaceUpTriggeredAbility extends TriggeredAb
             return false;
         }
         switch (event.getType()) {
-            case TURNEDFACEUP:
+            case TURNED_FACE_UP:
                 return true;
             case ENTERS_THE_BATTLEFIELD:
                 return Optional
diff --git a/Mage/src/main/java/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java
index e4a11d9ea9a..aae368985d7 100644
--- a/Mage/src/main/java/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpAllTriggeredAbility.java
@@ -50,7 +50,7 @@ public class TurnedFaceUpAllTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.TURNEDFACEUP;
+        return event.getType() == GameEvent.EventType.TURNED_FACE_UP;
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java
index 145ca173a35..235ccbfc870 100644
--- a/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/TurnedFaceUpSourceTriggeredAbility.java
@@ -44,7 +44,7 @@ public class TurnedFaceUpSourceTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.TURNEDFACEUP;
+        return event.getType() == GameEvent.EventType.TURNED_FACE_UP;
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/effects/AsTurnedFaceUpEffect.java b/Mage/src/main/java/mage/abilities/effects/AsTurnedFaceUpEffect.java
index 1866ed88049..40ac0292c4f 100644
--- a/Mage/src/main/java/mage/abilities/effects/AsTurnedFaceUpEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/AsTurnedFaceUpEffect.java
@@ -35,7 +35,7 @@ public class AsTurnedFaceUpEffect extends ReplacementEffectImpl {
 
     @Override
     public boolean checksEventType(GameEvent event, Game game) {
-        return event.getType() == GameEvent.EventType.TURNFACEUP;
+        return event.getType() == GameEvent.EventType.TURN_FACE_UP;
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java
index 3155dab1b59..4d4cde3bbf7 100644
--- a/Mage/src/main/java/mage/cards/CardImpl.java
+++ b/Mage/src/main/java/mage/cards/CardImpl.java
@@ -571,7 +571,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
 
     @Override
     public boolean turnFaceUp(Ability source, Game game, UUID playerId) {
-        GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURNFACEUP, getId(), source, playerId);
+        GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURN_FACE_UP, getId(), source, playerId);
         if (!game.replaceEvent(event)) {
             setFaceDown(false, game);
             for (Ability ability : abilities) { // abilities that were set to not visible face down must be set to visible again
@@ -579,7 +579,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
                     ability.setRuleVisible(true);
                 }
             }
-            game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNEDFACEUP, getId(), source, playerId));
+            game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNED_FACE_UP, getId(), source, playerId));
             return true;
         }
         return false;
@@ -587,10 +587,10 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
 
     @Override
     public boolean turnFaceDown(Ability source, Game game, UUID playerId) {
-        GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURNFACEDOWN, getId(), source, playerId);
+        GameEvent event = GameEvent.getEvent(GameEvent.EventType.TURN_FACE_DOWN, getId(), source, playerId);
         if (!game.replaceEvent(event)) {
             setFaceDown(true, game);
-            game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNEDFACEDOWN, getId(), source, playerId));
+            game.fireEvent(GameEvent.getEvent(GameEvent.EventType.TURNED_FACE_DOWN, getId(), source, playerId));
             return true;
         }
         return false;
diff --git a/Mage/src/main/java/mage/game/events/GameEvent.java b/Mage/src/main/java/mage/game/events/GameEvent.java
index ec2889e7d4a..f4c1016a948 100644
--- a/Mage/src/main/java/mage/game/events/GameEvent.java
+++ b/Mage/src/main/java/mage/game/events/GameEvent.java
@@ -430,8 +430,8 @@ public class GameEvent implements Serializable {
         MEDITATED,
         PHASE_OUT, PHASED_OUT,
         PHASE_IN, PHASED_IN,
-        TURNFACEUP, TURNEDFACEUP,
-        TURNFACEDOWN, TURNEDFACEDOWN,
+        TURN_FACE_UP, TURNED_FACE_UP,
+        TURN_FACE_DOWN, TURNED_FACE_DOWN,
         /* OPTION_USED
          targetId    originalId of the ability that triggered the event
          sourceId    sourceId of the ability that triggered the event