diff --git a/src/main/java/forge/PhaseUtil.java b/src/main/java/forge/PhaseUtil.java
index 669b44a79bc..9a10c03a243 100644
--- a/src/main/java/forge/PhaseUtil.java
+++ b/src/main/java/forge/PhaseUtil.java
@@ -645,7 +645,7 @@ public class PhaseUtil {
 
     // ***** Combat Utility **********
     // TODO: the below functions should be removed and the code blocks that use
-    // them should instead use SA_Restriction
+    // them should instead use SpellAbilityRestriction
     /**
      * <p>
      * isBeforeAttackersAreDeclared.
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
index baf17b68a0f..a919b09b497 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
@@ -1270,7 +1270,7 @@ public class AbilityFactory {
      *            a {@link forge.card.spellability.SpellAbility} object.
      */
     private void makeRestrictions(final SpellAbility sa) {
-        // SpellAbility_Restrictions should be added in here
+        // SpellAbilityRestrictions should be added in here
         final SpellAbilityRestriction restrict = sa.getRestrictions();
         if (this.mapParams.containsKey("Flashback")) {
             sa.setFlashBackAbility(true);
diff --git a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java
index e9ba282356c..c7cfe8cbc8a 100644
--- a/src/main/java/forge/card/spellability/SpellAbilityRestriction.java
+++ b/src/main/java/forge/card/spellability/SpellAbilityRestriction.java
@@ -33,7 +33,7 @@ import forge.card.cardfactory.CardFactoryUtil;
 
 /**
  * <p>
- * SpellAbility_Restriction class.
+ * SpellAbilityRestriction class.
  * </p>
  * 
  * @author Forge
@@ -51,7 +51,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
 
     /**
      * <p>
-     * Constructor for SpellAbility_Restriction.
+     * Constructor for SpellAbilityRestriction.
      * </p>
      */
     public SpellAbilityRestriction() {
@@ -208,7 +208,7 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
         Player activator = sa.getActivatingPlayer();
         if (activator == null) {
             activator = c.getController();
-            System.out.println(c.getName() + " Did not have activator set in SpellAbility_Restriction.canPlay()");
+            System.out.println(c.getName() + " Did not have activator set in SpellAbilityRestriction.canPlay()");
         }
 
         if (this.isSorcerySpeed() && !Phase.canCastSorcery(activator)) {
@@ -349,4 +349,4 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
         return true;
     } // canPlay()
 
-} // end class SpellAbility_Restriction
+} // end class SpellAbilityRestriction