diff --git a/src/CommandFormats.hh b/src/CommandFormats.hh
index e7ba5129..84b8762d 100644
--- a/src/CommandFormats.hh
+++ b/src/CommandFormats.hh
@@ -4909,7 +4909,7 @@ struct G_SyncPlayerDispAndInventory_BB_6x70 {
   // Offsets in this struct are relative to the overall command header
   /* 0008 */ G_ExtendedHeader<G_ClientIDHeader> header = {{0x70, 0x00, 0x0000}, sizeof(G_SyncPlayerDispAndInventory_BB_6x70)};
   /* 0010 */ G_SyncPlayerDispAndInventory_BaseV1 base;
-  /* 0128 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x0C> name;
+  /* 0128 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x10> name;
   /* 0140 */ parray<uint8_t, 0x08> unknown_a1; // Probably actually unused
   /* 0148 */ PlayerStats stats;
   /* 016C */ le_uint32_t num_items = 0;
diff --git a/src/PlayerSubordinates.cc b/src/PlayerSubordinates.cc
index f4b6606c..510a7d5a 100644
--- a/src/PlayerSubordinates.cc
+++ b/src/PlayerSubordinates.cc
@@ -165,6 +165,7 @@ void PlayerVisualConfig::enforce_lobby_join_limits_for_version(Version v) {
     this->name_color_checksum = 0;
   }
   this->class_flags = class_flags_for_class(this->char_class);
+  this->name.clear_after_bytes(0x0C);
 }
 
 void PlayerDispDataDCPCV3::enforce_lobby_join_limits_for_version(Version v) {
@@ -173,6 +174,7 @@ void PlayerDispDataDCPCV3::enforce_lobby_join_limits_for_version(Version v) {
 
 void PlayerDispDataBB::enforce_lobby_join_limits_for_version(Version v) {
   this->visual.enforce_lobby_join_limits_for_version(v);
+  this->name.clear_after_bytes(0x18); // 12 characters
 }
 
 PlayerDispDataBB PlayerDispDataDCPCV3::to_bb(uint8_t to_language, uint8_t from_language) const {
diff --git a/src/PlayerSubordinates.hh b/src/PlayerSubordinates.hh
index c607dce6..71362c6b 100644
--- a/src/PlayerSubordinates.hh
+++ b/src/PlayerSubordinates.hh
@@ -183,8 +183,7 @@ struct PlayerDispDataBBPreview {
 struct PlayerDispDataBB {
   /* 0000 */ PlayerStats stats;
   /* 0024 */ PlayerVisualConfig visual;
-  /* 0074 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x0C> name;
-  /* 008C */ parray<uint8_t, 0x08> unknown_a1; // Probably actually unused
+  /* 0074 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x10> name;
   /* 0094 */ parray<uint8_t, 0xE8> config;
   /* 017C */ parray<uint8_t, 0x14> technique_levels_v1;
   /* 0190 */
diff --git a/src/SaveFileFormats.hh b/src/SaveFileFormats.hh
index 3a2913ca..a70ff71b 100644
--- a/src/SaveFileFormats.hh
+++ b/src/SaveFileFormats.hh
@@ -142,7 +142,7 @@ struct PSOBBTeamMembership {
   /* 0011 */ uint8_t unknown_a7 = 0;
   /* 0012 */ uint8_t unknown_a8 = 0;
   /* 0013 */ uint8_t unknown_a9 = 0;
-  /* 0014 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x0010> team_name;
+  /* 0014 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x10> team_name;
   /* 0034 */ parray<le_uint16_t, 0x20 * 0x20> flag_data;
   /* 0834 */ le_uint32_t reward_flags = 0;
   /* 0838 */
@@ -786,6 +786,6 @@ struct LegacySavedAccountDataBB { // .nsa file format
   /* E13C */ le_uint32_t option_flags;
   /* E140 */ parray<uint8_t, 0x0A40> shortcuts;
   /* EB80 */ parray<PSOBBCharacterFile::SymbolChatEntry, 12> symbol_chats;
-  /* F060 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x0010> team_name;
+  /* F060 */ pstring<TextEncoding::UTF16_ALWAYS_MARKED, 0x10> team_name;
   /* F080 */
 } __attribute__((packed));