diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
index aefc689e..02ddf3f8 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -61,7 +61,7 @@ import net.md_5.bungee.protocol.packet.Packet3Chat;
 import net.md_5.bungee.protocol.packet.PacketFAPluginMessage;
 import net.md_5.bungee.protocol.Vanilla;
 import net.md_5.bungee.scheduler.BungeeThreadPool;
-import net.md_5.bungee.tablist.Custom;
+import net.md_5.bungee.tab.Custom;
 import net.md_5.bungee.util.CaseInsensitiveMap;
 
 /**
diff --git a/proxy/src/main/java/net/md_5/bungee/config/Configuration.java b/proxy/src/main/java/net/md_5/bungee/config/Configuration.java
index 428f8de9..e03a4593 100644
--- a/proxy/src/main/java/net/md_5/bungee/config/Configuration.java
+++ b/proxy/src/main/java/net/md_5/bungee/config/Configuration.java
@@ -10,9 +10,9 @@ import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.config.ConfigurationAdapter;
 import net.md_5.bungee.api.config.ListenerInfo;
 import net.md_5.bungee.api.config.ServerInfo;
-import net.md_5.bungee.tablist.GlobalPing;
-import net.md_5.bungee.tablist.Global;
-import net.md_5.bungee.tablist.ServerUnique;
+import net.md_5.bungee.tab.GlobalPing;
+import net.md_5.bungee.tab.Global;
+import net.md_5.bungee.tab.ServerUnique;
 import net.md_5.bungee.util.CaseInsensitiveMap;
 
 /**
diff --git a/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java
index 31d332af..c99d53ff 100644
--- a/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java
@@ -23,9 +23,9 @@ import net.md_5.bungee.api.config.ListenerInfo;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.config.TexturePackInfo;
 import net.md_5.bungee.api.tab.TabListHandler;
-import net.md_5.bungee.tablist.Global;
-import net.md_5.bungee.tablist.GlobalPing;
-import net.md_5.bungee.tablist.ServerUnique;
+import net.md_5.bungee.tab.Global;
+import net.md_5.bungee.tab.GlobalPing;
+import net.md_5.bungee.tab.ServerUnique;
 import net.md_5.bungee.util.CaseInsensitiveMap;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/Custom.java b/proxy/src/main/java/net/md_5/bungee/tab/Custom.java
similarity index 99%
rename from proxy/src/main/java/net/md_5/bungee/tablist/Custom.java
rename to proxy/src/main/java/net/md_5/bungee/tab/Custom.java
index 2e2a2b1e..afc09257 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/Custom.java
+++ b/proxy/src/main/java/net/md_5/bungee/tab/Custom.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.tablist;
+package net.md_5.bungee.tab;
 
 import com.google.common.base.Preconditions;
 import java.util.Collection;
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/Global.java b/proxy/src/main/java/net/md_5/bungee/tab/Global.java
similarity index 97%
rename from proxy/src/main/java/net/md_5/bungee/tablist/Global.java
rename to proxy/src/main/java/net/md_5/bungee/tab/Global.java
index 269d6d61..ccc4f014 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/Global.java
+++ b/proxy/src/main/java/net/md_5/bungee/tab/Global.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.tablist;
+package net.md_5.bungee.tab;
 
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.ProxyServer;
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/GlobalPing.java b/proxy/src/main/java/net/md_5/bungee/tab/GlobalPing.java
similarity index 95%
rename from proxy/src/main/java/net/md_5/bungee/tablist/GlobalPing.java
rename to proxy/src/main/java/net/md_5/bungee/tab/GlobalPing.java
index dc9e005b..c7233a2a 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/GlobalPing.java
+++ b/proxy/src/main/java/net/md_5/bungee/tab/GlobalPing.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.tablist;
+package net.md_5.bungee.tab;
 
 import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/ServerUnique.java b/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
similarity index 96%
rename from proxy/src/main/java/net/md_5/bungee/tablist/ServerUnique.java
rename to proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
index 2757a17c..722987b1 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/ServerUnique.java
+++ b/proxy/src/main/java/net/md_5/bungee/tab/ServerUnique.java
@@ -1,4 +1,4 @@
-package net.md_5.bungee.tablist;
+package net.md_5.bungee.tab;
 
 import java.util.Collection;
 import java.util.HashSet;