diff --git a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
index 2a91c974..1283bf48 100644
--- a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
+++ b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
@@ -242,14 +242,14 @@ public class DisguiseConfig {
     private static boolean hideTallSelfDisguises;
     @Getter
     @Setter
-    private static PlayerNameType playerNameType = PlayerNameType.ARMORSTANDS;
+    private static PlayerNameType playerNameType = PlayerNameType.TEAMS;
 
     public static boolean isArmorstandsName() {
         return getPlayerNameType() == PlayerNameType.ARMORSTANDS;
     }
 
     public static boolean isExtendedNames() {
-        return getPlayerNameType() == PlayerNameType.TEAMS_EXTENDED;
+        return getPlayerNameType() == PlayerNameType.EXTENDED;
     }
 
     public static void setAutoUpdate(boolean update) {
@@ -1094,11 +1094,11 @@ public class DisguiseConfig {
     public enum PlayerNameType {
         VANILLA,
         TEAMS,
-        TEAMS_EXTENDED,
+        EXTENDED,
         ARMORSTANDS;
 
         public boolean isTeams() {
-            return this == TEAMS || this == TEAMS_EXTENDED;
+            return this == TEAMS || this == EXTENDED;
         }
     }
 
diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
index 1b64ba2b..4cb6635c 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java
@@ -234,7 +234,7 @@ public class PlayerDisguise extends TargetedDisguise {
             case TEAMS:
                 cLimit = 16 * 2;
                 break;
-            case TEAMS_EXTENDED:
+            case EXTENDED:
                 cLimit = 16 * 3;
                 break;
             case ARMORSTANDS: