diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 1b4c34b6..63eb538d 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -70,7 +70,19 @@ std::string Core::Event::getEventName( uint32_t eventId )
 
    case Event::EventHandler::EventHandlerType::Warp:
    {
-      return "ChocoboTaxi";
+      auto warpInfo = pExdData->get< Core::Data::Warp >( eventId );
+      if( warpInfo )
+         return "WarpTaxi";
+      return unknown + "ChocoboWarp"; //who know
+   }
+   case Event::EventHandler::EventHandlerType::Shop:
+   {
+      auto shopInfo = pExdData->get< Core::Data::GilShop >( eventId );
+      std::string name = shopInfo->name;
+
+      if( shopInfo )
+         return name;
+      return unknown + "GilShop";
    }
    default:
    {