diff --git a/Mage.Sets/src/mage/cards/d/DimirGuildgate.java b/Mage.Sets/src/mage/cards/d/DimirGuildgate.java
index 6be45aacc1..be2a38b196 100644
--- a/Mage.Sets/src/mage/cards/d/DimirGuildgate.java
+++ b/Mage.Sets/src/mage/cards/d/DimirGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.d;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.BlackManaAbility;
 import mage.abilities.mana.BlueManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  *
@@ -43,7 +45,7 @@ public class DimirGuildgate extends CardImpl {
 
     public DimirGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Dimir Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
diff --git a/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java b/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java
index 6ba1e862ec..4702f6568f 100644
--- a/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java
+++ b/Mage.Sets/src/mage/cards/g/GolgariGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.g;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.BlackManaAbility;
 import mage.abilities.mana.GreenManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  * @author LevelX2
@@ -42,7 +44,7 @@ public class GolgariGuildgate extends CardImpl {
 
     public GolgariGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Golgari Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
diff --git a/Mage.Sets/src/mage/cards/g/GruulGuildgate.java b/Mage.Sets/src/mage/cards/g/GruulGuildgate.java
index 2faf13325c..71fecec224 100644
--- a/Mage.Sets/src/mage/cards/g/GruulGuildgate.java
+++ b/Mage.Sets/src/mage/cards/g/GruulGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.g;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.GreenManaAbility;
 import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  *
@@ -43,7 +45,7 @@ public class GruulGuildgate extends CardImpl {
 
     public GruulGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Gruul Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
diff --git a/Mage.Sets/src/mage/cards/i/IzzetGuildgate.java b/Mage.Sets/src/mage/cards/i/IzzetGuildgate.java
index 9c811da171..02c75bca7e 100644
--- a/Mage.Sets/src/mage/cards/i/IzzetGuildgate.java
+++ b/Mage.Sets/src/mage/cards/i/IzzetGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.i;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.BlueManaAbility;
 import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  * @author LevelX2
@@ -42,7 +44,7 @@ public class IzzetGuildgate extends CardImpl {
 
     public IzzetGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Izzet Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
diff --git a/Mage.Sets/src/mage/cards/o/OrzhovGuildgate.java b/Mage.Sets/src/mage/cards/o/OrzhovGuildgate.java
index 4297368568..c1d5c1f5e9 100644
--- a/Mage.Sets/src/mage/cards/o/OrzhovGuildgate.java
+++ b/Mage.Sets/src/mage/cards/o/OrzhovGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.o;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.BlackManaAbility;
 import mage.abilities.mana.WhiteManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  *
@@ -43,7 +45,7 @@ public class OrzhovGuildgate extends CardImpl {
 
     public OrzhovGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Orzhov Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
diff --git a/Mage.Sets/src/mage/cards/r/RakdosGuildgate.java b/Mage.Sets/src/mage/cards/r/RakdosGuildgate.java
index 6d1aee381f..ce7af88541 100644
--- a/Mage.Sets/src/mage/cards/r/RakdosGuildgate.java
+++ b/Mage.Sets/src/mage/cards/r/RakdosGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.r;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.BlackManaAbility;
 import mage.abilities.mana.RedManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  * @author LevelX2
@@ -42,7 +44,7 @@ public class RakdosGuildgate extends CardImpl {
 
     public RakdosGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Rakdos Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
diff --git a/Mage.Sets/src/mage/cards/s/SelesnyaGuildgate.java b/Mage.Sets/src/mage/cards/s/SelesnyaGuildgate.java
index c3ad3cd860..27b5d2b3d5 100644
--- a/Mage.Sets/src/mage/cards/s/SelesnyaGuildgate.java
+++ b/Mage.Sets/src/mage/cards/s/SelesnyaGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.s;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.GreenManaAbility;
 import mage.abilities.mana.WhiteManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  * @author LevelX2
@@ -42,7 +44,7 @@ public class SelesnyaGuildgate extends CardImpl {
 
     public SelesnyaGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Selesnya Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
diff --git a/Mage.Sets/src/mage/cards/s/SimicGuildgate.java b/Mage.Sets/src/mage/cards/s/SimicGuildgate.java
index abb2a98a57..4f230b7cb1 100644
--- a/Mage.Sets/src/mage/cards/s/SimicGuildgate.java
+++ b/Mage.Sets/src/mage/cards/s/SimicGuildgate.java
@@ -27,13 +27,15 @@
  */
 package mage.cards.s;
 
-import java.util.UUID;
 import mage.abilities.common.EntersBattlefieldTappedAbility;
 import mage.abilities.mana.BlueManaAbility;
 import mage.abilities.mana.GreenManaAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
+
+import java.util.UUID;
 
 /**
  *
@@ -43,7 +45,7 @@ public class SimicGuildgate extends CardImpl {
 
     public SimicGuildgate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
-        this.subtype.add("Gate");
+        this.subtype.add(SubType.GATE);
 
         // Simic Guildgate enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());