diff --git a/Penumbra.GameData/Data/BNpcNames.cs b/Penumbra.GameData/Data/BNpcNames.cs
index f2ab962f..c28396f1 100644
--- a/Penumbra.GameData/Data/BNpcNames.cs
+++ b/Penumbra.GameData/Data/BNpcNames.cs
@@ -5,10 +5,7 @@ namespace Penumbra.GameData.Data;
 
 public static class NpcNames
 {
-    /// <summary>
-    ///     Generated from https://gubal.hasura.app/api/rest/bnpc on 2023-01-17</summary>
-    ///     and https://raw.githubusercontent.com/ffxiv-teamcraft/ffxiv-teamcraft/staging/libs/data/src/lib/json/gubal-bnpcs-index.json on 2023-06-13.
-    /// </summary>
+    /// <summary>Generated from https://api.ffxivteamcraft.com/gubal on 2023-06-23.</summary>
     public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
         => new IReadOnlyList<uint>[]
         {
@@ -16099,10 +16096,10 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             new uint[]{11297},
             new uint[]{12369},
             new uint[]{12372},
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
+            new uint[]{12369},
+            new uint[]{12370},
+            new uint[]{12371},
+            new uint[]{12372},
             Array.Empty<uint>(),
             Array.Empty<uint>(),
             Array.Empty<uint>(),
@@ -16126,14 +16123,14 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             new uint[]{12390},
             Array.Empty<uint>(),
             new uint[]{12391},
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
+            new uint[]{12388},
+            new uint[]{12389},
+            new uint[]{12389},
+            new uint[]{12390},
+            new uint[]{12390},
+            new uint[]{12390},
+            new uint[]{12390},
+            new uint[]{12391},
             Array.Empty<uint>(),
             Array.Empty<uint>(),
             Array.Empty<uint>(),
@@ -16169,12 +16166,12 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             new uint[]{12355},
             new uint[]{12426},
             new uint[]{108},
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
+            new uint[]{12354},
+            new uint[]{12355},
+            new uint[]{12426},
+            new uint[]{12427},
+            new uint[]{108},
+            new uint[]{12356},
             new uint[]{12377},
             new uint[]{12378},
             new uint[]{12379},
@@ -16183,22 +16180,22 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             new uint[]{12377},
             new uint[]{12377},
             new uint[]{12377},
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
+            new uint[]{12377},
+            new uint[]{12378},
+            new uint[]{12379},
+            new uint[]{12380},
+            new uint[]{12381},
+            new uint[]{12377},
+            new uint[]{12377},
+            new uint[]{12377},
+            new uint[]{12377},
+            new uint[]{12377},
+            new uint[]{12382},
+            new uint[]{12383},
+            new uint[]{12384},
+            new uint[]{12385},
+            new uint[]{12386},
+            new uint[]{12387},
             new uint[]{12392},
             Array.Empty<uint>(),
             Array.Empty<uint>(),
@@ -16255,8 +16252,8 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             new uint[]{5239},
             new uint[]{4130},
             new uint[]{4392},
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
+            new uint[]{4130},
+            new uint[]{4392},
             new uint[]{4130},
             new uint[]{9350},
             new uint[]{12464},
@@ -16266,7 +16263,7 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             new uint[]{12467},
             new uint[]{12468},
             new uint[]{12469},
-            Array.Empty<uint>(),
+            new uint[]{12470},
             new uint[]{5964},
             new uint[]{4133},
             Array.Empty<uint>(),
@@ -16313,6 +16310,7 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             Array.Empty<uint>(),
             Array.Empty<uint>(),
             Array.Empty<uint>(),
+            new uint[]{12382},
             Array.Empty<uint>(),
             Array.Empty<uint>(),
             Array.Empty<uint>(),
@@ -16330,18 +16328,17 @@ public static IReadOnlyList<IReadOnlyList<uint>> CreateNames()
             Array.Empty<uint>(),
             Array.Empty<uint>(),
             Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
+            new uint[]{12436},
             new uint[]{12437},
             Array.Empty<uint>(),
             new uint[]{12439},
+            new uint[]{12440},
+            new uint[]{12441},
             Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
-            Array.Empty<uint>(),
+            new uint[]{12443},
             Array.Empty<uint>(),
             new uint[]{12445},
-            Array.Empty<uint>(),
+            new uint[]{12446},
             Array.Empty<uint>(),
             Array.Empty<uint>(),
             new uint[]{12455},