diff --git a/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java b/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java
index 7dd7a1aec94..5fa5be0c106 100644
--- a/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java
+++ b/src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java
@@ -33,7 +33,7 @@
 public class CondIsInvulnerable extends PropertyCondition<Entity> {
 	
 	static {
-		register(CondIsInvulnerable.class, PropertyType.BE, "invulnerable", "entities");
+		register(CondIsInvulnerable.class, PropertyType.BE, "(invulnerable|invincible)", "entities");
 	}
 	
 	@Override
diff --git a/src/main/java/ch/njol/skript/effects/EffInvulnerability.java b/src/main/java/ch/njol/skript/effects/EffInvulnerability.java
index 0e9d32d415b..33acd611202 100644
--- a/src/main/java/ch/njol/skript/effects/EffInvulnerability.java
+++ b/src/main/java/ch/njol/skript/effects/EffInvulnerability.java
@@ -40,8 +40,8 @@ public class EffInvulnerability extends Effect {
 	
 	static {
 		Skript.registerEffect(EffInvulnerability.class,
-			"make %entities% invulnerable",
-			"make %entities% (not invulnerable|vulnerable)");
+			"make %entities% (invulnerable|invincible)",
+			"make %entities% (not (invulnerable|invincible)|vulnerable|vincible)");
 	}
 	
 	@SuppressWarnings("null")
@@ -57,15 +57,15 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
 	}
 	
 	@Override
-	protected void execute(Event e) {
-		for (Entity entity : entities.getArray(e)) {
+	protected void execute(Event event) {
+		for (Entity entity : entities.getArray(event)) {
 			entity.setInvulnerable(invulnerable);
 		}
 	}
 	
 	@Override
-	public String toString(@Nullable Event e, boolean debug) {
-		return "make " + entities.toString(e, debug) + (invulnerable ? " invulnerable" : " not invulnerable");
+	public String toString(@Nullable Event event, boolean debug) {
+		return "make " + entities.toString(event, debug) + (invulnerable ? " invulnerable" : " not invulnerable");
 	}
 	
 }
diff --git a/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java b/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java
index ed902133e1e..ab0c5128d96 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprNoDamageTicks.java
@@ -38,7 +38,7 @@
 public class ExprNoDamageTicks extends SimplePropertyExpression<LivingEntity, Long> {
 	
 	static {
-		register(ExprNoDamageTicks.class, Long.class, "(invulnerability|no damage) tick[s]", "livingentities");
+		register(ExprNoDamageTicks.class, Long.class, "(invulnerability|invincibility|no damage) tick[s]", "livingentities");
 	}
 
 	@Override