diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java
index 962a248a1f..61f8fec18d 100644
--- a/runelite-api/src/main/java/net/runelite/api/NpcID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java
@@ -368,8 +368,8 @@ public final class NpcID
 	public static final int PHEASANT_374 = 374;
 	public static final int RICK_TURPENTINE = 375;
 	public static final int RICK_TURPENTINE_376 = 376;
-	public static final int RICK_377 = 377;
-	public static final int RICK_378 = 378;
+	public static final int PHOSANIS_NIGHTMARE = 377;
+	public static final int THE_NIGHTMARE = 378;
 	public static final int QUIZ_MASTER = 379;
 	public static final int PILLORY_GUARD = 380;
 	public static final int TRAMP = 381;
@@ -5547,6 +5547,7 @@ public final class NpcID
 	public static final int AGILITY_TRAINER_5927 = 5927;
 	public static final int WEREWOLF_5928 = 5928;
 	public static final int KNIGHT_5929 = 5929;
+	public static final int RICK_5931 = 5931;
 	public static final int EGG_5932 = 5932;
 	public static final int EGG_5933 = 5933;
 	public static final int EGG_5934 = 5934;
@@ -8398,7 +8399,7 @@ public final class NpcID
 	public static final int SHURA = 9413;
 	public static final int SHURA_9414 = 9414;
 	public static final int ACORN = 9415;
-	public static final int PHOSANIS_NIGHTMARE = 9416;
+	public static final int PHOSANIS_NIGHTMARE_9416 = 9416;
 	public static final int PHOSANIS_NIGHTMARE_9417 = 9417;
 	public static final int PHOSANIS_NIGHTMARE_9418 = 9418;
 	public static final int PHOSANIS_NIGHTMARE_9419 = 9419;
@@ -8407,7 +8408,7 @@ public final class NpcID
 	public static final int PHOSANIS_NIGHTMARE_9422 = 9422;
 	public static final int PHOSANIS_NIGHTMARE_9423 = 9423;
 	public static final int PHOSANIS_NIGHTMARE_9424 = 9424;
-	public static final int THE_NIGHTMARE = 9425;
+	public static final int THE_NIGHTMARE_9425 = 9425;
 	public static final int THE_NIGHTMARE_9426 = 9426;
 	public static final int THE_NIGHTMARE_9427 = 9427;
 	public static final int THE_NIGHTMARE_9428 = 9428;
@@ -8827,25 +8828,8 @@ public final class NpcID
 	public static final int SPIDER_10442 = 10442;
 	public static final int SPIDER_10443 = 10443;
 	public static final int BEES = 10444;
-	public static final int RICK_10445 = 10445;
-	public static final int RICK_10446 = 10446;
-	public static final int RICK_10447 = 10447;
-	public static final int EVE_10448 = 10448;
 	public static final int EVE_10449 = 10449;
-	public static final int YELDIVE = 10450;
-	public static final int YELDIVE_10451 = 10451;
-	public static final int YANES = 10452;
-	public static final int YANES_10453 = 10453;
-	public static final int HOGST = 10454;
-	public static final int HOGST_10455 = 10455;
-	public static final int POUNCER = 10456;
-	public static final int POUNCER_10457 = 10457;
-	public static final int GHOSTLY_FIGURE = 10458;
-	public static final int GHOSTLY_FIGURE_10459 = 10459;
 	public static final int JACKOLANTERN = 10460;
-	public static final int RICK_10461 = 10461;
-	public static final int RICK_10462 = 10462;
-	public static final int RICK_10463 = 10463;
 	public static final int LEAGUES_ASSISTANT = 10476;
 	public static final int THESSALIA = 10477;
 	public static final int THESSALIA_10478 = 10478;
diff --git a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java
index bfb27b5a2c..d01e542110 100644
--- a/runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+++ b/runelite-api/src/main/java/net/runelite/api/NullNpcID.java
@@ -1600,16 +1600,6 @@ public final class NullNpcID
 	public static final int NULL_10431 = 10431;
 	public static final int NULL_10440 = 10440;
 	public static final int NULL_10441 = 10441;
-	public static final int NULL_10464 = 10464;
-	public static final int NULL_10465 = 10465;
-	public static final int NULL_10466 = 10466;
-	public static final int NULL_10467 = 10467;
-	public static final int NULL_10468 = 10468;
-	public static final int NULL_10469 = 10469;
-	public static final int NULL_10470 = 10470;
-	public static final int NULL_10471 = 10471;
-	public static final int NULL_10472 = 10472;
-	public static final int NULL_10473 = 10473;
 	public static final int NULL_10474 = 10474;
 	public static final int NULL_10475 = 10475;
 	/* This file is automatically generated. Do not edit. */