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 aacff219..1355bae5 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
@@ -9,9 +9,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.GlobalPingTabList;
-import net.md_5.bungee.tablist.GlobalTabList;
-import net.md_5.bungee.tablist.ServerUniqueTabList;
+import net.md_5.bungee.tablist.GlobalPing;
+import net.md_5.bungee.tablist.Global;
+import net.md_5.bungee.tablist.ServerUnique;
 
 /**
  * Core configuration for the proxy.
@@ -68,13 +68,13 @@ public class Configuration
         switch ( tab )
         {
             case GLOBAL:
-                ProxyServer.getInstance().setTabListHandler( new GlobalTabList() );
+                ProxyServer.getInstance().setTabListHandler( new Global() );
                 break;
             case GLOBAL_PING:
-                ProxyServer.getInstance().setTabListHandler( new GlobalPingTabList() );
+                ProxyServer.getInstance().setTabListHandler( new GlobalPing() );
                 break;
             case SERVER:
-                ProxyServer.getInstance().setTabListHandler( new ServerUniqueTabList() );
+                ProxyServer.getInstance().setTabListHandler( new ServerUnique() );
                 break;
         }
 
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/GlobalTabList.java b/proxy/src/main/java/net/md_5/bungee/tablist/Global.java
similarity index 97%
rename from proxy/src/main/java/net/md_5/bungee/tablist/GlobalTabList.java
rename to proxy/src/main/java/net/md_5/bungee/tablist/Global.java
index 30a17d94..f83a49d0 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/GlobalTabList.java
+++ b/proxy/src/main/java/net/md_5/bungee/tablist/Global.java
@@ -10,7 +10,7 @@ import net.md_5.bungee.api.TabListHandler;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.packet.PacketC9PlayerListItem;
 
-public class GlobalTabList implements TabListHandler
+public class Global implements TabListHandler
 {
 
     private final Set<ProxiedPlayer> sentPings = Collections.newSetFromMap( new ConcurrentHashMap<ProxiedPlayer, Boolean>() );
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/GlobalPingTabList.java b/proxy/src/main/java/net/md_5/bungee/tablist/GlobalPing.java
similarity index 94%
rename from proxy/src/main/java/net/md_5/bungee/tablist/GlobalPingTabList.java
rename to proxy/src/main/java/net/md_5/bungee/tablist/GlobalPing.java
index a73842f9..2d414e1b 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/GlobalPingTabList.java
+++ b/proxy/src/main/java/net/md_5/bungee/tablist/GlobalPing.java
@@ -6,7 +6,7 @@ import net.md_5.bungee.BungeeCord;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.packet.PacketC9PlayerListItem;
 
-public class GlobalPingTabList extends GlobalTabList
+public class GlobalPing extends Global
 {
 
     private static final int PING_THRESHOLD = 20;
diff --git a/proxy/src/main/java/net/md_5/bungee/tablist/ServerUniqueTabList.java b/proxy/src/main/java/net/md_5/bungee/tablist/ServerUnique.java
similarity index 96%
rename from proxy/src/main/java/net/md_5/bungee/tablist/ServerUniqueTabList.java
rename to proxy/src/main/java/net/md_5/bungee/tablist/ServerUnique.java
index 2cf3fdc5..acf610b7 100644
--- a/proxy/src/main/java/net/md_5/bungee/tablist/ServerUniqueTabList.java
+++ b/proxy/src/main/java/net/md_5/bungee/tablist/ServerUnique.java
@@ -9,7 +9,7 @@ import net.md_5.bungee.api.TabListHandler;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.packet.PacketC9PlayerListItem;
 
-public class ServerUniqueTabList implements TabListHandler
+public class ServerUnique implements TabListHandler
 {
 
     private final Map<ProxiedPlayer, Set<String>> sentUsernames = new ConcurrentHashMap<>();