diff --git a/src/common/Common.h b/src/common/Common.h
index 5f27478d..993d8efe 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -319,33 +319,6 @@ namespace Common {
 
    };
 
-   enum EventType : uint16_t
-   {
-      Quest = 0x0001,
-      Warp = 0x0002,
-      Shop = 0x0004,
-      Aetheryte = 0x0005,
-      GuildLeveAssignment = 0x0006,
-      DefaultTalk = 0x0009,
-      CustomTalk = 0x000B,
-      CompanyLeveOfficer = 0x000C,
-      CraftLeve = 0x000E,
-      GimmickAccessor = 0x000F,
-      GimmickBill = 0x0010,
-      GimmickRect = 0x0011,
-      ChocoboTaxiStand = 0x0012,
-      Opening = 0x0013,
-      ExitRange = 0x0014,
-      GCShop = 0x0016,
-      GuildOrderGuide = 0x0017,
-      GuildOrderOfficer = 0x0018,
-      ContentNpc = 0x0019,
-      Story = 0x001A,
-      SpecialShop = 0x001B,
-      BahamutGuide = 0x001C,
-      FcTalk = 0x001F,
-   };
-
    enum struct ActionAspect : uint8_t
    {
       None = 0,   // Doesn't imply unaspected
diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 6438ab6f..01ad969d 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -15,7 +15,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
 
    switch( eventType )
    {
-   case EventType::Quest:
+   case Event::EventHandler::EventHandlerType::Quest:
    {
       auto questInfo = g_exdData.getQuestInfo( eventId );
       if( !questInfo )
@@ -26,7 +26,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
 
       return questInfo->name_intern.substr( 0, pos );
    }
-   case EventType::CustomTalk:
+   case Event::EventHandler::EventHandlerType::CustomTalk:
    {
       auto customTalkInfo = g_exdData.getCustomTalkInfo( eventId );
       if( !customTalkInfo )
@@ -37,21 +37,21 @@ std::string Core::Event::getEventName( uint32_t eventId )
 
       return customTalkInfo->name_intern.substr( 0, pos );
    }
-   case EventType::Opening:
+   case Event::EventHandler::EventHandlerType::Opening:
    {
       auto openingInfo = g_exdData.getOpeningInfo( eventId );
       if( openingInfo )
          return openingInfo->name;
       return unknown + "Opening";
    }
-   case EventType::Aetheryte:
+   case Event::EventHandler::EventHandlerType::Aetheryte:
    {
       auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF );
       if( aetherInfo->isAetheryte )
          return "Aetheryte";
       return "Aethernet";
    }
-   case EventType::Warp:
+   case Event::EventHandler::EventHandlerType::Warp:
    {
       return "ChocoboTaxi";
    }
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 3073c2e5..ae5361c1 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -158,7 +158,7 @@ bool Core::Scripting::ScriptManager::onTalk( Entity::Player& player, uint64_t ac
    uint32_t scriptId = eventId;
 
    // aethernet/aetherytes need to be handled separately
-   if( eventType == Common::EventType::Aetheryte )
+   if( eventType == Event::EventHandler::EventHandlerType::Aetheryte )
    {
       auto aetherInfo = g_exdData.getAetheryteInfo( eventId & 0xFFFF );
       scriptId = EVENTSCRIPT_AETHERYTE_ID;
@@ -179,7 +179,7 @@ bool Core::Scripting::ScriptManager::onTalk( Entity::Player& player, uint64_t ac
    }
    else
    {
-      if ( eventType == Common::EventType::Quest )
+      if ( eventType == Event::EventHandler::EventHandlerType::Quest )
       {
          auto questInfo = g_exdData.getQuestInfo( eventId );
          if ( questInfo )
@@ -284,7 +284,7 @@ bool Core::Scripting::ScriptManager::onEmote( Entity::Player& player, uint64_t a
    {
       uint16_t eventType = eventId >> 16;
 
-      if( eventType == Common::EventType::Quest )
+      if( eventType == Event::EventHandler::EventHandlerType::Quest )
       {
          auto questInfo = g_exdData.getQuestInfo( eventId );
          if( questInfo )