diff --git a/src/main/java/world/bentobox/challenges/panel/admin/ChallengesEditGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/ChallengeEditGUI.java
similarity index 99%
rename from src/main/java/world/bentobox/challenges/panel/admin/ChallengesEditGUI.java
rename to src/main/java/world/bentobox/challenges/panel/admin/ChallengeEditGUI.java
index 6452cc5..874d92a 100644
--- a/src/main/java/world/bentobox/challenges/panel/admin/ChallengesEditGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/admin/ChallengeEditGUI.java
@@ -23,7 +23,7 @@ import world.bentobox.challenges.panel.CommonGUI;
  * This class contains all necessary methods that creates GUI and allow to edit challenges
  * properties.
  */
-public class ChallengesEditGUI extends CommonGUI
+public class ChallengeEditGUI extends CommonGUI
 {
 // ---------------------------------------------------------------------
 // Section: Constructors
@@ -34,7 +34,7 @@ public class ChallengesEditGUI extends CommonGUI
 	 * {@inheritDoc}
 	 * @param challenge challenge that needs editing.
 	 */
-	public ChallengesEditGUI(ChallengesAddon addon,
+	public ChallengeEditGUI(ChallengesAddon addon,
 		World world,
 		User user,
 		Challenges challenge,
@@ -49,7 +49,7 @@ public class ChallengesEditGUI extends CommonGUI
 	 * {@inheritDoc}
 	 * @param challenge challenge that needs editing.
 	 */
-	public ChallengesEditGUI(ChallengesAddon addon,
+	public ChallengeEditGUI(ChallengesAddon addon,
 		World world,
 		User user,
 		Challenges challenge,
diff --git a/src/main/java/world/bentobox/challenges/panel/admin/LevelsEditGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/LevelEditGUI.java
similarity index 98%
rename from src/main/java/world/bentobox/challenges/panel/admin/LevelsEditGUI.java
rename to src/main/java/world/bentobox/challenges/panel/admin/LevelEditGUI.java
index 3532399..5dfc036 100644
--- a/src/main/java/world/bentobox/challenges/panel/admin/LevelsEditGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/admin/LevelEditGUI.java
@@ -21,7 +21,7 @@ import world.bentobox.challenges.panel.CommonGUI;
 /**
  * This class contains all necessary elements to create Levels Edit GUI.
  */
-public class LevelsEditGUI extends CommonGUI
+public class LevelEditGUI extends CommonGUI
 {
 // ---------------------------------------------------------------------
 // Section: Constructors
@@ -32,7 +32,7 @@ public class LevelsEditGUI extends CommonGUI
 	 * {@inheritDoc}
 	 * @param challengeLevel ChallengeLevel that must be edited.
 	 */
-	public LevelsEditGUI(ChallengesAddon addon,
+	public LevelEditGUI(ChallengesAddon addon,
 		World world,
 		User user,
 		ChallengeLevels challengeLevel,
@@ -47,7 +47,7 @@ public class LevelsEditGUI extends CommonGUI
 	 * {@inheritDoc}
 	 * @param challengeLevel ChallengeLevel that must be edited.
 	 */
-	public LevelsEditGUI(ChallengesAddon addon,
+	public LevelEditGUI(ChallengesAddon addon,
 		World world,
 		User user,
 		ChallengeLevels challengeLevel,
@@ -253,7 +253,7 @@ public class LevelsEditGUI extends CommonGUI
 			icon(challenge.getIcon()).
 			clickHandler((panel, user1, clickType, slot) -> {
 				// Open challenges edit screen.
-				new ChallengesEditGUI(this.addon,
+				new ChallengeEditGUI(this.addon,
 					this.world,
 					this.user,
 					challenge,
diff --git a/src/main/java/world/bentobox/challenges/panel/admin/ChallengesUserListGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/UserListGUI.java
similarity index 97%
rename from src/main/java/world/bentobox/challenges/panel/admin/ChallengesUserListGUI.java
rename to src/main/java/world/bentobox/challenges/panel/admin/UserListGUI.java
index 90d6306..3ee1232 100644
--- a/src/main/java/world/bentobox/challenges/panel/admin/ChallengesUserListGUI.java
+++ b/src/main/java/world/bentobox/challenges/panel/admin/UserListGUI.java
@@ -20,7 +20,7 @@ import world.bentobox.challenges.panel.CommonGUI;
 /**
  * This class contains methods that allows to select specific user.
  */
-public class ChallengesUserListGUI extends CommonGUI
+public class UserListGUI extends CommonGUI
 {
 // ---------------------------------------------------------------------
 // Section: Variables
@@ -56,7 +56,7 @@ public class ChallengesUserListGUI extends CommonGUI
 	/**
 	 * {@inheritDoc}
 	 */
-	public ChallengesUserListGUI(ChallengesAddon addon,
+	public UserListGUI(ChallengesAddon addon,
 		World world,
 		User user, String topLabel, String permissionPrefix)
 	{
@@ -67,7 +67,7 @@ public class ChallengesUserListGUI extends CommonGUI
 	/**
 	 * {@inheritDoc}
 	 */
-	public ChallengesUserListGUI(ChallengesAddon addon,
+	public UserListGUI(ChallengesAddon addon,
 		World world,
 		User user,
 		String topLabel,