diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholderValue.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholderValue.java
index c4e1ea1..cd9fc2b 100644
--- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholderValue.java
+++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprPlaceholderValue.java
@@ -20,7 +20,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-@Name("Value of Placeholder")
+@Name("Placeholder Value")
 @Description("An expression to obtain the value of a placeholder from a supported plugin.")
 @Examples({
 	"command /ping <player>:",
diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprRelationalPlayers.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprRelationalPlaceholderPlayers.java
similarity index 90%
rename from src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprRelationalPlayers.java
rename to src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprRelationalPlaceholderPlayers.java
index acb39e8..86f5d3c 100644
--- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprRelationalPlayers.java
+++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/ExprRelationalPlaceholderPlayers.java
@@ -27,10 +27,10 @@
 				"\t\t\tset the result to the name of the second player"
 })
 @Since("1.7.0")
-public class ExprRelationalPlayers extends SimpleExpression<Player> {
+public class ExprRelationalPlaceholderPlayers extends SimpleExpression<Player> {
 
 	static {
-		Skript.registerExpression(ExprRelationalPlayers.class, Player.class, ExpressionType.SIMPLE,
+		Skript.registerExpression(ExprRelationalPlaceholderPlayers.class, Player.class, ExpressionType.SIMPLE,
 				"[the] first player",
 				"[the] second player"
 		);
diff --git a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/StructPlaceholder.java b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/StructCustomPlaceholder.java
similarity index 95%
rename from src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/StructPlaceholder.java
rename to src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/StructCustomPlaceholder.java
index 9d60df3..aafd8a6 100644
--- a/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/StructPlaceholder.java
+++ b/src/main/java/io/github/apickledwalrus/skriptplaceholders/skript/elements/StructCustomPlaceholder.java
@@ -50,10 +50,10 @@
 		"\tset the result to \"APickledWalrus\""
 })
 @Since("1.0.0, 1.3.0 (MVdWPlaceholderAPI support), 1.7.0 (relational placeholder support)")
-public class StructPlaceholder extends Structure implements PlaceholderEvaluator {
+public class StructCustomPlaceholder extends Structure implements PlaceholderEvaluator {
 
 	static {
-		Skript.registerStructure(StructPlaceholder.class,
+		Skript.registerStructure(StructCustomPlaceholder.class,
 				"(placeholder[ ]api|papi) [:relational] placeholder (with|for) [the] prefix %*string%",
 				"(mvdw[ ]placeholder[ ]api|mvdw) placeholder [with [the] name|named] %*string%"
 		);