diff --git a/pom.xml b/pom.xml
index f283fc7..c9f7680 100755
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
com.github.TBMCPlugins.ButtonCore
ButtonCore
- master-SNAPSHOT
+ ${env.TRAVIS_BRANCH}-SNAPSHOT
provided
diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
index 14c7fc4..ea2f1a7 100755
--- a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java
@@ -1,13 +1,13 @@
package buttondevteam.discordplugin;
import buttondevteam.lib.TBMCCoreAPI;
-import buttondevteam.lib.chat.IDiscordSender;
import org.bukkit.Bukkit;
+import org.bukkit.command.CommandSender;
import org.bukkit.scheduler.BukkitTask;
import sx.blah.discord.handle.obj.IChannel;
import sx.blah.discord.handle.obj.IUser;
-public abstract class DiscordSenderBase implements IDiscordSender {
+public abstract class DiscordSenderBase implements CommandSender {
/**
* May be null.
*/
diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
index 4d73c83..5f1792d 100755
--- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
+++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java
@@ -81,7 +81,7 @@ public class MCChatListener implements Listener, IListener
time = se.getValue();
final String authorPlayer = "[" + DPUtils.sanitizeStringNoEscape(e.getChannel().DisplayName) + "] " //
- + (e.getSender() instanceof DiscordSenderBase ? "[D]" : "") //
+ + ("Minecraft".equals(e.getOrigin()) ? "" : "[" + e.getOrigin() + "]") //
+ (DPUtils.sanitizeStringNoEscape(e.getSender() instanceof Player //
? ((Player) e.getSender()).getDisplayName() //
: e.getSender().getName()));