diff --git a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
index cc585de8b..57330da55 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/Essentials.java
@@ -197,7 +197,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
     }
 
     public Essentials(final Server server) {
-        super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials", "", "com.earth2me.essentials.Essentials"), null, null);
+        super(new JavaPluginLoader(server), new PluginDescriptionFile("Essentials-OG", "", "com.earth2me.essentials.Essentials"), null, null);
     }
 
     @Override
@@ -766,7 +766,7 @@ public class Essentials extends JavaPlugin implements net.ess3.api.IEssentials {
 
             //Print version even if admin command is not available #easteregg
             if (commandLabel.equalsIgnoreCase("essversion")) {
-                sender.sendMessage("This server is running Essentials " + getDescription().getVersion());
+                sender.sendMessage("This server is running " + getDescription().getName() + " " + getDescription().getVersion());
                 return true;
             }
 
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
index f32cc655a..a7178e05a 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandessentials.java
@@ -315,7 +315,7 @@ public class Commandessentials extends EssentialsCommand {
             }
             pluginData.add("authors", authors);
 
-            if (name.startsWith("Essentials") && !name.equals("Essentials")) {
+            if (name.startsWith("Essentials") && !name.equals(ess.getDescription().getName())) {
                 addons.add(pluginData);
             }
             plugins.add(pluginData);
@@ -727,7 +727,8 @@ public class Commandessentials extends EssentialsCommand {
         boolean isUnsupported = false;
         final VersionUtil.SupportStatus supportStatus = VersionUtil.getServerSupportStatus();
         final PluginManager pm = server.getPluginManager();
-        final String essVer = pm.getPlugin("Essentials").getDescription().getVersion();
+        final Plugin essPlugin = pm.getPlugin(ess.getDescription().getName());
+        final String essVer = essPlugin == null ? ess.getDescription().getVersion() : essPlugin.getDescription().getVersion();
 
         final String serverMessageKey;
         if (supportStatus.isSupported()) {
@@ -740,16 +741,16 @@ public class Commandessentials extends EssentialsCommand {
 
         sender.sendMessage(tl(serverMessageKey, "Server", server.getBukkitVersion() + " " + server.getVersion()));
         sender.sendMessage(tl(serverMessageKey, "Brand", server.getName()));
-        sender.sendMessage(tl("versionOutputFine", "EssentialsX", essVer));
+        sender.sendMessage(tl("versionOutputFine", ess.getDescription().getName(), essVer));
 
         for (final Plugin plugin : pm.getPlugins()) {
             final PluginDescriptionFile desc = plugin.getDescription();
             String name = desc.getName();
             final String version = desc.getVersion();
 
-            if (name.startsWith("Essentials") && !name.equalsIgnoreCase("Essentials")) {
+            if (name.startsWith("Essentials") && !name.equalsIgnoreCase(ess.getDescription().getName())) {
                 if (officialPlugins.contains(name)) {
-                    name = name.replace("Essentials", "EssentialsX");
+                    name = name.replace("Essentials", ess.getDescription().getName());
 
                     if (!version.equalsIgnoreCase(essVer)) {
                         isMismatched = true;
diff --git a/Essentials/src/main/resources/messages.properties b/Essentials/src/main/resources/messages.properties
index 1e347af75..3fbf0b2fd 100644
--- a/Essentials/src/main/resources/messages.properties
+++ b/Essentials/src/main/resources/messages.properties
@@ -364,7 +364,7 @@ essentialsCommandUsage8=/<command> dump [all] [config] [discord] [kits] [log]
 essentialsCommandUsage8Description=Generates a server dump with the requested information
 essentialsHelp1=The file is broken and Essentials can''t open it. Essentials is now disabled. If you can''t fix the file yourself, go to http\://tiny.cc/EssentialsChat
 essentialsHelp2=The file is broken and Essentials can''t open it. Essentials is now disabled. If you can''t fix the file yourself, either type /essentialshelp in game or go to http\://tiny.cc/EssentialsChat
-essentialsReload=\u00a76Essentials reloaded\u00a7c {0}.
+essentialsReload=\u00a76Essentials-OG reloaded\u00a7c {0}.
 exp=\u00a7c{0} \u00a76has\u00a7c {1} \u00a76exp (level\u00a7c {2}\u00a76) and needs\u00a7c {3} \u00a76more exp to level up.
 expCommandDescription=Give, set, reset, or look at a players experience.
 expCommandUsage=/<command> [reset|show|set|give] [playername [amount]]
diff --git a/Essentials/src/main/resources/messages_en.properties b/Essentials/src/main/resources/messages_en.properties
index 93af118e7..f449ab14c 100644
--- a/Essentials/src/main/resources/messages_en.properties
+++ b/Essentials/src/main/resources/messages_en.properties
@@ -364,7 +364,7 @@ essentialsCommandUsage8=/<command> dump [all] [config] [discord] [kits] [log]
 essentialsCommandUsage8Description=Generates a server dump with the requested information
 essentialsHelp1=The file is broken and Essentials can''t open it. Essentials is now disabled. If you can''t fix the file yourself, go to http\://tiny.cc/EssentialsChat
 essentialsHelp2=The file is broken and Essentials can''t open it. Essentials is now disabled. If you can''t fix the file yourself, either type /essentialshelp in game or go to http\://tiny.cc/EssentialsChat
-essentialsReload=§6Essentials reloaded§c {0}.
+essentialsReload=§6Essentials-OG reloaded§c {0}.
 exp=§c{0} §6has§c {1} §6exp (level§c {2}§6) and needs§c {3} §6more exp to level up.
 expCommandDescription=Give, set, reset, or look at a players experience.
 expCommandUsage=/<command> [reset|show|set|give] [playername [amount]]
diff --git a/Essentials/src/main/resources/plugin.yml b/Essentials/src/main/resources/plugin.yml
index 51af179a9..9a382e432 100644
--- a/Essentials/src/main/resources/plugin.yml
+++ b/Essentials/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 # This determines the command prefix when there are conflicts (/name:home, /name:help, etc.)
-name: Essentials
+name: Essentials-OG
 main: com.earth2me.essentials.Essentials
 # Note to developers: This next line cannot change, or the automatic versioning system will break.
 version: ${full.version}