diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp
index a7cf2569..50ff05a6 100644
--- a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp
+++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp
@@ -4,6 +4,7 @@
 
 #include "Manager/EventMgr.h"
 #include <Actor/Player.h>
+#include <Actor/BNpc.h>
 #include <ScriptObject.h>
 #include <Service.h>
 
@@ -122,9 +123,9 @@ public:
     }
   }
 
-  void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override
+  void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override
   {
-    switch( entityId )
+    switch( bnpc.getLayoutId() )
     {
       case Enemy0:
       case Enemy1:
@@ -200,9 +201,9 @@ private:
 
     if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8BL() < 3 )
     {
-      auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
-      auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
-      auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
 
       enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
       enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp
index 5a4603a0..4c0f2949 100644
--- a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp
+++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp
@@ -4,6 +4,7 @@
 
 #include "Manager/EventMgr.h"
 #include <Actor/Player.h>
+#include <Actor/BNpc.h>
 #include <ScriptObject.h>
 #include <Service.h>
 
@@ -74,9 +75,9 @@ public:
     }
   }
 
-  void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override
+  void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override
   {
-    switch( entityId )
+    switch( bnpc.getLayoutId() )
     {
       case Enemy0:
       case Enemy1:
@@ -143,9 +144,9 @@ private:
 
     if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8AL() < 3 )
     {
-      auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
-      auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
-      auto enemy2 = instance->createBNpcFromInstanceId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy2 = instance->createBNpcFromLayoutId( Enemy2, 1220 /*Find the right value*/, Common::BNpcType::Enemy, player.getId() );
 
       enemy0->hateListAdd( player.getAsPlayer(), 1 );
       enemy1->hateListAdd( player.getAsPlayer(), 1 );
diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp
index c7067d19..00cc68dc 100644
--- a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp
+++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp
@@ -4,6 +4,7 @@
 
 #include "Manager/EventMgr.h"
 #include <Actor/Player.h>
+#include <Actor/BNpc.h>
 #include <ScriptObject.h>
 #include <Service.h>
 
@@ -122,9 +123,9 @@ public:
     }
   }
 
-  void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override
+  void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override
   {
-    switch( entityId )
+    switch( bnpc.getLayoutId() )
     {
       case Enemy0:
       {
@@ -190,7 +191,7 @@ private:
 
     if( !enemySpawned  )
     {
-      auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
       enemy->hateListAdd( player.getAsPlayer(), 1 );
     //  quest.setBitFlag8( 1, true );
     }
diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb902.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb902.cpp
index 45e254c9..3e0ccbb1 100644
--- a/src/scripts/quest/subquest/coerthas_central/GaiUsb902.cpp
+++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb902.cpp
@@ -4,6 +4,7 @@
 
 #include "Manager/EventMgr.h"
 #include <Actor/Player.h>
+#include <Actor/BNpc.h>
 #include <ScriptObject.h>
 #include <Service.h>
 
@@ -63,9 +64,9 @@ public:
     }
   }
 
-  void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override
+  void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override
   {
-    switch( nameId )
+    switch( bnpc.getBNpcNameId() )
     {
       case Enemy0:
       {
diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp
index 7ee02ea5..906ea263 100644
--- a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp
+++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp
@@ -4,6 +4,7 @@
 
 #include "Manager/EventMgr.h"
 #include <Actor/Player.h>
+#include <Actor/BNpc.h>
 #include <ScriptObject.h>
 #include <Service.h>
 
@@ -92,9 +93,9 @@ public:
     }
   }
 
-  void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override
+  void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override
   {
-    switch( entityId )
+    switch( bnpc.getLayoutId() )
     {
       case Enemy0:
       case Enemy1:
@@ -157,8 +158,8 @@ private:
 
     if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2)
     {
-      auto enemy0 = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
-      auto enemy1 = instance->createBNpcFromInstanceId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy0 = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy1 = instance->createBNpcFromLayoutId( Enemy1, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
       enemy0->hateListAddDelayed( player.getAsPlayer(), 1 );
       enemy1->hateListAddDelayed( player.getAsPlayer(), 1 );
     }
diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp
index f569d01a..cbf7fa5f 100644
--- a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp
+++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp
@@ -4,6 +4,7 @@
 
 #include "Manager/EventMgr.h"
 #include <Actor/Player.h>
+#include <Actor/BNpc.h>
 #include <ScriptObject.h>
 #include <Service.h>
 
@@ -121,15 +122,15 @@ public:
     }
   }
 
-  void onBNpcKill( World::Quest& quest, uint16_t nameId, uint32_t entityId, Entity::Player& player ) override
+  void onBNpcKill( World::Quest& quest, Entity::BNpc& bnpc, Entity::Player& player ) override
   {
-    if( entityId == Enemy0 )
+    if( bnpc.getLayoutId() == Enemy0 )
     {
       eventMgr().sendEventNotice( player, getId(), 0, 0 );
       quest.setSeq( Seq2 );
       quest.setUI8BH( 1 );
     }
-    else if( nameId == Enemy1 )
+    else if( bnpc.getBNpcNameId() == Enemy1 )
     {
     }
   }
@@ -202,7 +203,7 @@ private:
 
     if( !enemySpawned )
     {
-      auto enemy = instance->createBNpcFromInstanceId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
+      auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );
       enemy->hateListAdd( player.getAsPlayer(), 1 );
     }
   }