diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
index 851db585..4496aed9 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeEntityType.java
@@ -14,5 +14,30 @@ public TypeEntityType()
 	{
 		super(EntityType.class);
 	}
+	
+	// -------------------------------------------- //
+	// OVERRIDE
+	// -------------------------------------------- //
+	
+	@Override
+	public Set<String> getNamesInner(EntityType value)
+	{
+		Set<String> ret = new MassiveSet<>(super.getNamesInner(value));
+		
+		if (value == EntityType.ZOMBIFIED_PIGLIN)
+		{
+			ret.add("pigzombie");
+			ret.add("zombiepig");
+			ret.add("zombiepiglin");
+		}
+		else if (value == EntityType.PIGLIN)
+		{
+			ret.add("piglin");
+			ret.add("manpig");
+			ret.add("pigman");
+		}
+		
+		return ret;
+	}
 
 }
diff --git a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
index ea147fd8..b1e269bb 100644
--- a/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
+++ b/src/com/massivecraft/massivecore/command/type/enumeration/TypeWorldType.java
@@ -32,6 +32,10 @@ public Set<String> getNamesInner(WorldType value)
 			ret.add("normal");
 			ret.add("default");
 		}
+		else if (value == WorldType.AMPLIFIED)
+		{
+			ret.add("amplified");
+		}
 		
 		return ret;
 	}