diff --git a/lib/EventFlow b/lib/EventFlow
index f006fd2a..e1fd65f5 160000
--- a/lib/EventFlow
+++ b/lib/EventFlow
@@ -1 +1 @@
-Subproject commit f006fd2a13df04d921639f55e9ff0c772fd484ee
+Subproject commit e1fd65f555956d9254a749dad6090768752c7f14
diff --git a/src/Game/AI/Query/queryBranchByDyeColor.cpp b/src/Game/AI/Query/queryBranchByDyeColor.cpp
index 9b0abecc..085367f0 100644
--- a/src/Game/AI/Query/queryBranchByDyeColor.cpp
+++ b/src/Game/AI/Query/queryBranchByDyeColor.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryBranchByDyeColor.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryBranchByGameOver.cpp b/src/Game/AI/Query/queryBranchByGameOver.cpp
index 8ca4f1f4..20994930 100644
--- a/src/Game/AI/Query/queryBranchByGameOver.cpp
+++ b/src/Game/AI/Query/queryBranchByGameOver.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryBranchByGameOver.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCanCreateMakeItemList.cpp b/src/Game/AI/Query/queryCanCreateMakeItemList.cpp
index f98cbc34..d2970a74 100644
--- a/src/Game/AI/Query/queryCanCreateMakeItemList.cpp
+++ b/src/Game/AI/Query/queryCanCreateMakeItemList.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCanCreateMakeItemList.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCanMarkMapPin.cpp b/src/Game/AI/Query/queryCanMarkMapPin.cpp
index 536a45c3..2c57b0de 100644
--- a/src/Game/AI/Query/queryCanMarkMapPin.cpp
+++ b/src/Game/AI/Query/queryCanMarkMapPin.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCanMarkMapPin.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheck100EnemyActiveTiming.cpp b/src/Game/AI/Query/queryCheck100EnemyActiveTiming.cpp
index 5ce18a6c..9cc09b9a 100644
--- a/src/Game/AI/Query/queryCheck100EnemyActiveTiming.cpp
+++ b/src/Game/AI/Query/queryCheck100EnemyActiveTiming.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheck100EnemyActiveTiming.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckActorAction.cpp b/src/Game/AI/Query/queryCheckActorAction.cpp
index 038467c3..b0912233 100644
--- a/src/Game/AI/Query/queryCheckActorAction.cpp
+++ b/src/Game/AI/Query/queryCheckActorAction.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckActorAction.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckActorAction13.cpp b/src/Game/AI/Query/queryCheckActorAction13.cpp
index 1a34a5dd..e7e5bf23 100644
--- a/src/Game/AI/Query/queryCheckActorAction13.cpp
+++ b/src/Game/AI/Query/queryCheckActorAction13.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckActorAction13.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckActorAction14_2.cpp b/src/Game/AI/Query/queryCheckActorAction14_2.cpp
index 428606df..48307bc3 100644
--- a/src/Game/AI/Query/queryCheckActorAction14_2.cpp
+++ b/src/Game/AI/Query/queryCheckActorAction14_2.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckActorAction14_2.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckAddPorchItem.cpp b/src/Game/AI/Query/queryCheckAddPorchItem.cpp
index a76f739b..7a02322a 100644
--- a/src/Game/AI/Query/queryCheckAddPorchItem.cpp
+++ b/src/Game/AI/Query/queryCheckAddPorchItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckAddPorchItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckAppPoint.cpp b/src/Game/AI/Query/queryCheckAppPoint.cpp
index 013480d8..2cf9cceb 100644
--- a/src/Game/AI/Query/queryCheckAppPoint.cpp
+++ b/src/Game/AI/Query/queryCheckAppPoint.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckAppPoint.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckAppShopSelect.cpp b/src/Game/AI/Query/queryCheckAppShopSelect.cpp
index 3fff3d10..3aab27d1 100644
--- a/src/Game/AI/Query/queryCheckAppShopSelect.cpp
+++ b/src/Game/AI/Query/queryCheckAppShopSelect.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckAppShopSelect.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckAreaTransition.cpp b/src/Game/AI/Query/queryCheckAreaTransition.cpp
index a2a15714..c10b24be 100644
--- a/src/Game/AI/Query/queryCheckAreaTransition.cpp
+++ b/src/Game/AI/Query/queryCheckAreaTransition.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckAreaTransition.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckBalladOfHeroActiveTiming.cpp b/src/Game/AI/Query/queryCheckBalladOfHeroActiveTiming.cpp
index 36bd9351..f8607282 100644
--- a/src/Game/AI/Query/queryCheckBalladOfHeroActiveTiming.cpp
+++ b/src/Game/AI/Query/queryCheckBalladOfHeroActiveTiming.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckBalladOfHeroActiveTiming.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckContainerItem.cpp b/src/Game/AI/Query/queryCheckContainerItem.cpp
index 0089e306..2971aa20 100644
--- a/src/Game/AI/Query/queryCheckContainerItem.cpp
+++ b/src/Game/AI/Query/queryCheckContainerItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckContainerItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/ActorSystem/actActorUtil.h"
 #include "KingSystem/ActorSystem/actTag.h"
 
diff --git a/src/Game/AI/Query/queryCheckCookResultStatus.cpp b/src/Game/AI/Query/queryCheckCookResultStatus.cpp
index d7a5d864..444bba43 100644
--- a/src/Game/AI/Query/queryCheckCookResultStatus.cpp
+++ b/src/Game/AI/Query/queryCheckCookResultStatus.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckCookResultStatus.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckCurrentMap.cpp b/src/Game/AI/Query/queryCheckCurrentMap.cpp
index 727133ec..c87e67df 100644
--- a/src/Game/AI/Query/queryCheckCurrentMap.cpp
+++ b/src/Game/AI/Query/queryCheckCurrentMap.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckCurrentMap.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp b/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp
index a7cdd3c8..b1924e07 100644
--- a/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp
+++ b/src/Game/AI/Query/queryCheckCurseRRetryEverOnce.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckCurseRRetryEverOnce.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckDeadHorseResistered.cpp b/src/Game/AI/Query/queryCheckDeadHorseResistered.cpp
index 754b40e9..561059fc 100644
--- a/src/Game/AI/Query/queryCheckDeadHorseResistered.cpp
+++ b/src/Game/AI/Query/queryCheckDeadHorseResistered.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDeadHorseResistered.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckDeadlyQuestEscapeTiming.cpp b/src/Game/AI/Query/queryCheckDeadlyQuestEscapeTiming.cpp
index ae625e7b..8b733dea 100644
--- a/src/Game/AI/Query/queryCheckDeadlyQuestEscapeTiming.cpp
+++ b/src/Game/AI/Query/queryCheckDeadlyQuestEscapeTiming.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDeadlyQuestEscapeTiming.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckDieCnt.cpp b/src/Game/AI/Query/queryCheckDieCnt.cpp
index 865cee1c..5c9e8c9b 100644
--- a/src/Game/AI/Query/queryCheckDieCnt.cpp
+++ b/src/Game/AI/Query/queryCheckDieCnt.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDieCnt.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryCheckDistanceForWarp.cpp b/src/Game/AI/Query/queryCheckDistanceForWarp.cpp
index c8716246..3b615493 100644
--- a/src/Game/AI/Query/queryCheckDistanceForWarp.cpp
+++ b/src/Game/AI/Query/queryCheckDistanceForWarp.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDistanceForWarp.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckDistanceFromPlayer.cpp b/src/Game/AI/Query/queryCheckDistanceFromPlayer.cpp
index f7213a6e..f8107a2c 100644
--- a/src/Game/AI/Query/queryCheckDistanceFromPlayer.cpp
+++ b/src/Game/AI/Query/queryCheckDistanceFromPlayer.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDistanceFromPlayer.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckDownloadItemNum.cpp b/src/Game/AI/Query/queryCheckDownloadItemNum.cpp
index ae0fc93b..32a281dc 100644
--- a/src/Game/AI/Query/queryCheckDownloadItemNum.cpp
+++ b/src/Game/AI/Query/queryCheckDownloadItemNum.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDownloadItemNum.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckDuringBloodyMoon.cpp b/src/Game/AI/Query/queryCheckDuringBloodyMoon.cpp
index 6ae4f5f0..6133607d 100644
--- a/src/Game/AI/Query/queryCheckDuringBloodyMoon.cpp
+++ b/src/Game/AI/Query/queryCheckDuringBloodyMoon.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDuringBloodyMoon.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckDyeShopSelect.cpp b/src/Game/AI/Query/queryCheckDyeShopSelect.cpp
index 4410b2fb..d0cea451 100644
--- a/src/Game/AI/Query/queryCheckDyeShopSelect.cpp
+++ b/src/Game/AI/Query/queryCheckDyeShopSelect.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckDyeShopSelect.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckE3Mode.cpp b/src/Game/AI/Query/queryCheckE3Mode.cpp
index 695e137f..45617654 100644
--- a/src/Game/AI/Query/queryCheckE3Mode.cpp
+++ b/src/Game/AI/Query/queryCheckE3Mode.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckE3Mode.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckEatActor.cpp b/src/Game/AI/Query/queryCheckEatActor.cpp
index 123708d0..8142129c 100644
--- a/src/Game/AI/Query/queryCheckEatActor.cpp
+++ b/src/Game/AI/Query/queryCheckEatActor.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckEatActor.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckElapsedTimeOfMiniGame.cpp b/src/Game/AI/Query/queryCheckElapsedTimeOfMiniGame.cpp
index d240a1f9..9fbd0712 100644
--- a/src/Game/AI/Query/queryCheckElapsedTimeOfMiniGame.cpp
+++ b/src/Game/AI/Query/queryCheckElapsedTimeOfMiniGame.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckElapsedTimeOfMiniGame.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckEquipArmorSeriesType.cpp b/src/Game/AI/Query/queryCheckEquipArmorSeriesType.cpp
index bedc3eb1..fe08d6e5 100644
--- a/src/Game/AI/Query/queryCheckEquipArmorSeriesType.cpp
+++ b/src/Game/AI/Query/queryCheckEquipArmorSeriesType.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckEquipArmorSeriesType.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckEquipItemType.cpp b/src/Game/AI/Query/queryCheckEquipItemType.cpp
index 591f580e..c6448f36 100644
--- a/src/Game/AI/Query/queryCheckEquipItemType.cpp
+++ b/src/Game/AI/Query/queryCheckEquipItemType.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckEquipItemType.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckEquipment.cpp b/src/Game/AI/Query/queryCheckEquipment.cpp
index ebcf7d55..f4cc71f3 100644
--- a/src/Game/AI/Query/queryCheckEquipment.cpp
+++ b/src/Game/AI/Query/queryCheckEquipment.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckEquipment.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckEventCancel.cpp b/src/Game/AI/Query/queryCheckEventCancel.cpp
index 792e101c..29a94d55 100644
--- a/src/Game/AI/Query/queryCheckEventCancel.cpp
+++ b/src/Game/AI/Query/queryCheckEventCancel.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckEventCancel.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckExistActor.cpp b/src/Game/AI/Query/queryCheckExistActor.cpp
index 2a95b817..2221f38f 100644
--- a/src/Game/AI/Query/queryCheckExistActor.cpp
+++ b/src/Game/AI/Query/queryCheckExistActor.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckExistActor.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckExistArrow.cpp b/src/Game/AI/Query/queryCheckExistArrow.cpp
index 4dbf9c01..33b9918e 100644
--- a/src/Game/AI/Query/queryCheckExistArrow.cpp
+++ b/src/Game/AI/Query/queryCheckExistArrow.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckExistArrow.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckExtraEnergyOfPlayer.cpp b/src/Game/AI/Query/queryCheckExtraEnergyOfPlayer.cpp
index 38d7f879..787d95f7 100644
--- a/src/Game/AI/Query/queryCheckExtraEnergyOfPlayer.cpp
+++ b/src/Game/AI/Query/queryCheckExtraEnergyOfPlayer.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckExtraEnergyOfPlayer.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckExtraLifeOfPlayer.cpp b/src/Game/AI/Query/queryCheckExtraLifeOfPlayer.cpp
index 26d65359..43541980 100644
--- a/src/Game/AI/Query/queryCheckExtraLifeOfPlayer.cpp
+++ b/src/Game/AI/Query/queryCheckExtraLifeOfPlayer.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckExtraLifeOfPlayer.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckFadeState.cpp b/src/Game/AI/Query/queryCheckFadeState.cpp
index 5092b2c7..ae133732 100644
--- a/src/Game/AI/Query/queryCheckFadeState.cpp
+++ b/src/Game/AI/Query/queryCheckFadeState.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckFadeState.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckFame.cpp b/src/Game/AI/Query/queryCheckFame.cpp
index 55283f72..4b7bd6a9 100644
--- a/src/Game/AI/Query/queryCheckFame.cpp
+++ b/src/Game/AI/Query/queryCheckFame.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckFame.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryCheckFlag.cpp b/src/Game/AI/Query/queryCheckFlag.cpp
index 8549f3df..01c83c93 100644
--- a/src/Game/AI/Query/queryCheckFlag.cpp
+++ b/src/Game/AI/Query/queryCheckFlag.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckFlag.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryCheckGameDataFloat.cpp b/src/Game/AI/Query/queryCheckGameDataFloat.cpp
index 2b26dd4f..ea3bc1e6 100644
--- a/src/Game/AI/Query/queryCheckGameDataFloat.cpp
+++ b/src/Game/AI/Query/queryCheckGameDataFloat.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckGameDataFloat.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryCheckGameDataInt.cpp b/src/Game/AI/Query/queryCheckGameDataInt.cpp
index 080749a4..aeb01959 100644
--- a/src/Game/AI/Query/queryCheckGameDataInt.cpp
+++ b/src/Game/AI/Query/queryCheckGameDataInt.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckGameDataInt.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryCheckGetDemoTypeFromArg.cpp b/src/Game/AI/Query/queryCheckGetDemoTypeFromArg.cpp
index ca273197..38daac73 100644
--- a/src/Game/AI/Query/queryCheckGetDemoTypeFromArg.cpp
+++ b/src/Game/AI/Query/queryCheckGetDemoTypeFromArg.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckGetDemoTypeFromArg.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "Game/UI/uiPauseMenuDataMgr.h"
 #include "KingSystem/ActorSystem/actActorUtil.h"
 #include "KingSystem/ActorSystem/actTag.h"
diff --git a/src/Game/AI/Query/queryCheckGiveReward.cpp b/src/Game/AI/Query/queryCheckGiveReward.cpp
index 68a673ea..5ee12f6f 100644
--- a/src/Game/AI/Query/queryCheckGiveReward.cpp
+++ b/src/Game/AI/Query/queryCheckGiveReward.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckGiveReward.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckHasManifactureArmor.cpp b/src/Game/AI/Query/queryCheckHasManifactureArmor.cpp
index 8aaa3f39..8d4088e4 100644
--- a/src/Game/AI/Query/queryCheckHasManifactureArmor.cpp
+++ b/src/Game/AI/Query/queryCheckHasManifactureArmor.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckHasManifactureArmor.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckHorseCustomizeSelect.cpp b/src/Game/AI/Query/queryCheckHorseCustomizeSelect.cpp
index 6dd4d199..6244cffe 100644
--- a/src/Game/AI/Query/queryCheckHorseCustomizeSelect.cpp
+++ b/src/Game/AI/Query/queryCheckHorseCustomizeSelect.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckHorseCustomizeSelect.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckHorseDeadCause.cpp b/src/Game/AI/Query/queryCheckHorseDeadCause.cpp
index e83365fa..18847150 100644
--- a/src/Game/AI/Query/queryCheckHorseDeadCause.cpp
+++ b/src/Game/AI/Query/queryCheckHorseDeadCause.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckHorseDeadCause.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckHorseRegistered.cpp b/src/Game/AI/Query/queryCheckHorseRegistered.cpp
index fe631e10..ef37bd95 100644
--- a/src/Game/AI/Query/queryCheckHorseRegistered.cpp
+++ b/src/Game/AI/Query/queryCheckHorseRegistered.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckHorseRegistered.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckHorseTakenOut.cpp b/src/Game/AI/Query/queryCheckHorseTakenOut.cpp
index e0d23506..fbaa8bed 100644
--- a/src/Game/AI/Query/queryCheckHorseTakenOut.cpp
+++ b/src/Game/AI/Query/queryCheckHorseTakenOut.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckHorseTakenOut.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp b/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp
index c4ec4659..89d70996 100644
--- a/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp
+++ b/src/Game/AI/Query/queryCheckIsOpenItemCategory.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckIsOpenItemCategory.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/GameData/gdtCommonFlagsUtils.h"
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryCheckItemShopDecide.cpp b/src/Game/AI/Query/queryCheckItemShopDecide.cpp
index 6dc5e008..1cf568fc 100644
--- a/src/Game/AI/Query/queryCheckItemShopDecide.cpp
+++ b/src/Game/AI/Query/queryCheckItemShopDecide.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckItemShopDecide.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckItemShopPorchVacancy.cpp b/src/Game/AI/Query/queryCheckItemShopPorchVacancy.cpp
index 4e5739ed..04f06191 100644
--- a/src/Game/AI/Query/queryCheckItemShopPorchVacancy.cpp
+++ b/src/Game/AI/Query/queryCheckItemShopPorchVacancy.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckItemShopPorchVacancy.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckItemShopSelect.cpp b/src/Game/AI/Query/queryCheckItemShopSelect.cpp
index 7b207a96..c1e53618 100644
--- a/src/Game/AI/Query/queryCheckItemShopSelect.cpp
+++ b/src/Game/AI/Query/queryCheckItemShopSelect.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckItemShopSelect.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckItemShopSelectBuy.cpp b/src/Game/AI/Query/queryCheckItemShopSelectBuy.cpp
index 1b792e4a..9d28802c 100644
--- a/src/Game/AI/Query/queryCheckItemShopSelectBuy.cpp
+++ b/src/Game/AI/Query/queryCheckItemShopSelectBuy.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckItemShopSelectBuy.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckJustBeforeEventCancel.cpp b/src/Game/AI/Query/queryCheckJustBeforeEventCancel.cpp
index 1fccc53a..da4296b9 100644
--- a/src/Game/AI/Query/queryCheckJustBeforeEventCancel.cpp
+++ b/src/Game/AI/Query/queryCheckJustBeforeEventCancel.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckJustBeforeEventCancel.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckLastDamageAttacker.cpp b/src/Game/AI/Query/queryCheckLastDamageAttacker.cpp
index 662023a6..8ed6f4b5 100644
--- a/src/Game/AI/Query/queryCheckLastDamageAttacker.cpp
+++ b/src/Game/AI/Query/queryCheckLastDamageAttacker.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckLastDamageAttacker.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckManufactResult.cpp b/src/Game/AI/Query/queryCheckManufactResult.cpp
index 7658d17a..25bdf663 100644
--- a/src/Game/AI/Query/queryCheckManufactResult.cpp
+++ b/src/Game/AI/Query/queryCheckManufactResult.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckManufactResult.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckMapArea.cpp b/src/Game/AI/Query/queryCheckMapArea.cpp
index 1606c304..698d3a57 100644
--- a/src/Game/AI/Query/queryCheckMapArea.cpp
+++ b/src/Game/AI/Query/queryCheckMapArea.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckMapArea.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckMasterSwordState.cpp b/src/Game/AI/Query/queryCheckMasterSwordState.cpp
index 6cf8fd47..8b6b11b3 100644
--- a/src/Game/AI/Query/queryCheckMasterSwordState.cpp
+++ b/src/Game/AI/Query/queryCheckMasterSwordState.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckMasterSwordState.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckMaterialValue.cpp b/src/Game/AI/Query/queryCheckMaterialValue.cpp
index adfc0b45..0b0c9924 100644
--- a/src/Game/AI/Query/queryCheckMaterialValue.cpp
+++ b/src/Game/AI/Query/queryCheckMaterialValue.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckMaterialValue.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckMiniGameTime.cpp b/src/Game/AI/Query/queryCheckMiniGameTime.cpp
index d441219c..b5189aef 100644
--- a/src/Game/AI/Query/queryCheckMiniGameTime.cpp
+++ b/src/Game/AI/Query/queryCheckMiniGameTime.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckMiniGameTime.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckMiniGameTimeOver.cpp b/src/Game/AI/Query/queryCheckMiniGameTimeOver.cpp
index 80ae396e..7c68fe11 100644
--- a/src/Game/AI/Query/queryCheckMiniGameTimeOver.cpp
+++ b/src/Game/AI/Query/queryCheckMiniGameTimeOver.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckMiniGameTimeOver.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckNumOfBuyPicture.cpp b/src/Game/AI/Query/queryCheckNumOfBuyPicture.cpp
index 8c6e2192..6ea70ce7 100644
--- a/src/Game/AI/Query/queryCheckNumOfBuyPicture.cpp
+++ b/src/Game/AI/Query/queryCheckNumOfBuyPicture.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckNumOfBuyPicture.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckOwnedHorseFamiliarity.cpp b/src/Game/AI/Query/queryCheckOwnedHorseFamiliarity.cpp
index c543f162..63dd4572 100644
--- a/src/Game/AI/Query/queryCheckOwnedHorseFamiliarity.cpp
+++ b/src/Game/AI/Query/queryCheckOwnedHorseFamiliarity.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckOwnedHorseFamiliarity.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPictureBookVacancy.cpp b/src/Game/AI/Query/queryCheckPictureBookVacancy.cpp
index 1c269445..790254f1 100644
--- a/src/Game/AI/Query/queryCheckPictureBookVacancy.cpp
+++ b/src/Game/AI/Query/queryCheckPictureBookVacancy.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPictureBookVacancy.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlacedItemSaled.cpp b/src/Game/AI/Query/queryCheckPlacedItemSaled.cpp
index 1221020a..5abf174d 100644
--- a/src/Game/AI/Query/queryCheckPlacedItemSaled.cpp
+++ b/src/Game/AI/Query/queryCheckPlacedItemSaled.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlacedItemSaled.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerDeadCause.cpp b/src/Game/AI/Query/queryCheckPlayerDeadCause.cpp
index be4c8848..770fa985 100644
--- a/src/Game/AI/Query/queryCheckPlayerDeadCause.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerDeadCause.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerDeadCause.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerEquip.cpp b/src/Game/AI/Query/queryCheckPlayerEquip.cpp
index 465b4a12..39632883 100644
--- a/src/Game/AI/Query/queryCheckPlayerEquip.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerEquip.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerEquip.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerFastFadeDead.cpp b/src/Game/AI/Query/queryCheckPlayerFastFadeDead.cpp
index e4e52a5c..e2aa83c0 100644
--- a/src/Game/AI/Query/queryCheckPlayerFastFadeDead.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerFastFadeDead.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerFastFadeDead.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerHellType.cpp b/src/Game/AI/Query/queryCheckPlayerHellType.cpp
index df6cd555..8daa54e8 100644
--- a/src/Game/AI/Query/queryCheckPlayerHellType.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerHellType.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerHellType.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerPullSwordFailEnd.cpp b/src/Game/AI/Query/queryCheckPlayerPullSwordFailEnd.cpp
index 267f5881..542cf6e4 100644
--- a/src/Game/AI/Query/queryCheckPlayerPullSwordFailEnd.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerPullSwordFailEnd.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerPullSwordFailEnd.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerRideHorse.cpp b/src/Game/AI/Query/queryCheckPlayerRideHorse.cpp
index c8a324cc..fe8f9519 100644
--- a/src/Game/AI/Query/queryCheckPlayerRideHorse.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerRideHorse.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerRideHorse.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerRideSunazarashi.cpp b/src/Game/AI/Query/queryCheckPlayerRideSunazarashi.cpp
index 536fea7f..45835424 100644
--- a/src/Game/AI/Query/queryCheckPlayerRideSunazarashi.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerRideSunazarashi.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerRideSunazarashi.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerState.cpp b/src/Game/AI/Query/queryCheckPlayerState.cpp
index 84e546f9..f5412bf3 100644
--- a/src/Game/AI/Query/queryCheckPlayerState.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerState.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerState.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerTemperatureCondition.cpp b/src/Game/AI/Query/queryCheckPlayerTemperatureCondition.cpp
index 555c6b06..f9661819 100644
--- a/src/Game/AI/Query/queryCheckPlayerTemperatureCondition.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerTemperatureCondition.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerTemperatureCondition.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPlayerWeaponFired.cpp b/src/Game/AI/Query/queryCheckPlayerWeaponFired.cpp
index e3f69feb..acb240d5 100644
--- a/src/Game/AI/Query/queryCheckPlayerWeaponFired.cpp
+++ b/src/Game/AI/Query/queryCheckPlayerWeaponFired.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPlayerWeaponFired.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckPorchInItem.cpp b/src/Game/AI/Query/queryCheckPorchInItem.cpp
index 9c20d400..e848e0bf 100644
--- a/src/Game/AI/Query/queryCheckPorchInItem.cpp
+++ b/src/Game/AI/Query/queryCheckPorchInItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckPorchInItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckProConUse.cpp b/src/Game/AI/Query/queryCheckProConUse.cpp
index 6d16e107..8a0fd1f2 100644
--- a/src/Game/AI/Query/queryCheckProConUse.cpp
+++ b/src/Game/AI/Query/queryCheckProConUse.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckProConUse.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckRainRatio.cpp b/src/Game/AI/Query/queryCheckRainRatio.cpp
index 0f7d5eb4..388b9604 100644
--- a/src/Game/AI/Query/queryCheckRainRatio.cpp
+++ b/src/Game/AI/Query/queryCheckRainRatio.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckRainRatio.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckRankOfEnemyAttackedNPC.cpp b/src/Game/AI/Query/queryCheckRankOfEnemyAttackedNPC.cpp
index b9823f39..b2b82919 100644
--- a/src/Game/AI/Query/queryCheckRankOfEnemyAttackedNPC.cpp
+++ b/src/Game/AI/Query/queryCheckRankOfEnemyAttackedNPC.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckRankOfEnemyAttackedNPC.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckReceiveTerrorLevel.cpp b/src/Game/AI/Query/queryCheckReceiveTerrorLevel.cpp
index 3d22e447..ce18bfaa 100644
--- a/src/Game/AI/Query/queryCheckReceiveTerrorLevel.cpp
+++ b/src/Game/AI/Query/queryCheckReceiveTerrorLevel.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckReceiveTerrorLevel.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckResultOfNPCConflict.cpp b/src/Game/AI/Query/queryCheckResultOfNPCConflict.cpp
index ab0b78ee..405c0edf 100644
--- a/src/Game/AI/Query/queryCheckResultOfNPCConflict.cpp
+++ b/src/Game/AI/Query/queryCheckResultOfNPCConflict.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckResultOfNPCConflict.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckRoad.cpp b/src/Game/AI/Query/queryCheckRoad.cpp
index b5792da2..4ced5e8a 100644
--- a/src/Game/AI/Query/queryCheckRoad.cpp
+++ b/src/Game/AI/Query/queryCheckRoad.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckRoad.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckRupee.cpp b/src/Game/AI/Query/queryCheckRupee.cpp
index 69992c63..c0ae87b3 100644
--- a/src/Game/AI/Query/queryCheckRupee.cpp
+++ b/src/Game/AI/Query/queryCheckRupee.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckRupee.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckSelectPicture.cpp b/src/Game/AI/Query/queryCheckSelectPicture.cpp
index f649cfd5..03391197 100644
--- a/src/Game/AI/Query/queryCheckSelectPicture.cpp
+++ b/src/Game/AI/Query/queryCheckSelectPicture.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckSelectPicture.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckSellResult.cpp b/src/Game/AI/Query/queryCheckSellResult.cpp
index 9efc6d01..db9a2718 100644
--- a/src/Game/AI/Query/queryCheckSellResult.cpp
+++ b/src/Game/AI/Query/queryCheckSellResult.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckSellResult.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckShopSelectedItemName.cpp b/src/Game/AI/Query/queryCheckShopSelectedItemName.cpp
index 592f0a6b..85a4d04b 100644
--- a/src/Game/AI/Query/queryCheckShopSelectedItemName.cpp
+++ b/src/Game/AI/Query/queryCheckShopSelectedItemName.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckShopSelectedItemName.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckSiteBossDamageAnm.cpp b/src/Game/AI/Query/queryCheckSiteBossDamageAnm.cpp
index 8ed5e118..8fdc4e1f 100644
--- a/src/Game/AI/Query/queryCheckSiteBossDamageAnm.cpp
+++ b/src/Game/AI/Query/queryCheckSiteBossDamageAnm.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckSiteBossDamageAnm.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckStage.cpp b/src/Game/AI/Query/queryCheckStage.cpp
index 7ec81077..8c817abb 100644
--- a/src/Game/AI/Query/queryCheckStage.cpp
+++ b/src/Game/AI/Query/queryCheckStage.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckStage.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckStarter.cpp b/src/Game/AI/Query/queryCheckStarter.cpp
index d52e6b23..a8448346 100644
--- a/src/Game/AI/Query/queryCheckStarter.cpp
+++ b/src/Game/AI/Query/queryCheckStarter.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckStarter.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckTerrorLevel.cpp b/src/Game/AI/Query/queryCheckTerrorLevel.cpp
index b407340e..813f1ea3 100644
--- a/src/Game/AI/Query/queryCheckTerrorLevel.cpp
+++ b/src/Game/AI/Query/queryCheckTerrorLevel.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckTerrorLevel.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckTime.cpp b/src/Game/AI/Query/queryCheckTime.cpp
index 7bf98deb..cfc0e26b 100644
--- a/src/Game/AI/Query/queryCheckTime.cpp
+++ b/src/Game/AI/Query/queryCheckTime.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckTime.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckTimeType.cpp b/src/Game/AI/Query/queryCheckTimeType.cpp
index cffb331c..b66d2c06 100644
--- a/src/Game/AI/Query/queryCheckTimeType.cpp
+++ b/src/Game/AI/Query/queryCheckTimeType.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckTimeType.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckTypeOfOwnedHorseForEvent.cpp b/src/Game/AI/Query/queryCheckTypeOfOwnedHorseForEvent.cpp
index 6e733bb3..2b7d8211 100644
--- a/src/Game/AI/Query/queryCheckTypeOfOwnedHorseForEvent.cpp
+++ b/src/Game/AI/Query/queryCheckTypeOfOwnedHorseForEvent.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckTypeOfOwnedHorseForEvent.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckTypeOfWildHorseAssociated.cpp b/src/Game/AI/Query/queryCheckTypeOfWildHorseAssociated.cpp
index 75e33f56..f1c568a9 100644
--- a/src/Game/AI/Query/queryCheckTypeOfWildHorseAssociated.cpp
+++ b/src/Game/AI/Query/queryCheckTypeOfWildHorseAssociated.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckTypeOfWildHorseAssociated.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckVacancyItem.cpp b/src/Game/AI/Query/queryCheckVacancyItem.cpp
index f487a3a2..7e022a8a 100644
--- a/src/Game/AI/Query/queryCheckVacancyItem.cpp
+++ b/src/Game/AI/Query/queryCheckVacancyItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckVacancyItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckWarpMist.cpp b/src/Game/AI/Query/queryCheckWarpMist.cpp
index cb5e2448..7f129694 100644
--- a/src/Game/AI/Query/queryCheckWarpMist.cpp
+++ b/src/Game/AI/Query/queryCheckWarpMist.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckWarpMist.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckWeaponVacancyItem.cpp b/src/Game/AI/Query/queryCheckWeaponVacancyItem.cpp
index 75a324d4..28c3994e 100644
--- a/src/Game/AI/Query/queryCheckWeaponVacancyItem.cpp
+++ b/src/Game/AI/Query/queryCheckWeaponVacancyItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckWeaponVacancyItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCheckWeather.cpp b/src/Game/AI/Query/queryCheckWeather.cpp
index 21fb1bba..350be990 100644
--- a/src/Game/AI/Query/queryCheckWeather.cpp
+++ b/src/Game/AI/Query/queryCheckWeather.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCheckWeather.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCompareGameDataFloat.cpp b/src/Game/AI/Query/queryCompareGameDataFloat.cpp
index b0f8b0d5..6a87da4f 100644
--- a/src/Game/AI/Query/queryCompareGameDataFloat.cpp
+++ b/src/Game/AI/Query/queryCompareGameDataFloat.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCompareGameDataFloat.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include <functional>
 #include "KingSystem/GameData/gdtManager.h"
 
diff --git a/src/Game/AI/Query/queryCompareGameDataInt.cpp b/src/Game/AI/Query/queryCompareGameDataInt.cpp
index 89a596c6..e11ae6ef 100644
--- a/src/Game/AI/Query/queryCompareGameDataInt.cpp
+++ b/src/Game/AI/Query/queryCompareGameDataInt.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCompareGameDataInt.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include <functional>
 #include "KingSystem/GameData/gdtManager.h"
 
diff --git a/src/Game/AI/Query/queryCompareGameDataTime.cpp b/src/Game/AI/Query/queryCompareGameDataTime.cpp
index b65d01bb..4da0e164 100644
--- a/src/Game/AI/Query/queryCompareGameDataTime.cpp
+++ b/src/Game/AI/Query/queryCompareGameDataTime.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCompareGameDataTime.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryComparePlayerFireResistantLevel.cpp b/src/Game/AI/Query/queryComparePlayerFireResistantLevel.cpp
index 0a2a1c82..b1ce2e98 100644
--- a/src/Game/AI/Query/queryComparePlayerFireResistantLevel.cpp
+++ b/src/Game/AI/Query/queryComparePlayerFireResistantLevel.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryComparePlayerFireResistantLevel.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryComparePlayerHeart.cpp b/src/Game/AI/Query/queryComparePlayerHeart.cpp
index 17efbddf..10b81ba2 100644
--- a/src/Game/AI/Query/queryComparePlayerHeart.cpp
+++ b/src/Game/AI/Query/queryComparePlayerHeart.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryComparePlayerHeart.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp b/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp
index c36dc2a6..08b49cb7 100644
--- a/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp
+++ b/src/Game/AI/Query/queryComparePlayerMaxHeart.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryComparePlayerMaxHeart.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp b/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp
index f87c6485..44706d71 100644
--- a/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp
+++ b/src/Game/AI/Query/queryComparePlayerMaxStamina.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryComparePlayerMaxStamina.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp b/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp
index 4006ef81..8c0422dd 100644
--- a/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp
+++ b/src/Game/AI/Query/queryComparePlayerOriginalHeart.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryComparePlayerOriginalHeart.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryCountFlag4.cpp b/src/Game/AI/Query/queryCountFlag4.cpp
index 13395cdd..0b7210b4 100644
--- a/src/Game/AI/Query/queryCountFlag4.cpp
+++ b/src/Game/AI/Query/queryCountFlag4.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryCountFlag4.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryEnemyDieCheck.cpp b/src/Game/AI/Query/queryEnemyDieCheck.cpp
index 0984d092..6d52c5e5 100644
--- a/src/Game/AI/Query/queryEnemyDieCheck.cpp
+++ b/src/Game/AI/Query/queryEnemyDieCheck.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryEnemyDieCheck.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryEnemyRestLifeRate.cpp b/src/Game/AI/Query/queryEnemyRestLifeRate.cpp
index 4d1598d0..a119fd9a 100644
--- a/src/Game/AI/Query/queryEnemyRestLifeRate.cpp
+++ b/src/Game/AI/Query/queryEnemyRestLifeRate.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryEnemyRestLifeRate.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryGeneralChoice2.cpp b/src/Game/AI/Query/queryGeneralChoice2.cpp
index 405fe269..7ff555df 100644
--- a/src/Game/AI/Query/queryGeneralChoice2.cpp
+++ b/src/Game/AI/Query/queryGeneralChoice2.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryGeneralChoice2.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryGeneralChoice3.cpp b/src/Game/AI/Query/queryGeneralChoice3.cpp
index d0c429ac..e805e35a 100644
--- a/src/Game/AI/Query/queryGeneralChoice3.cpp
+++ b/src/Game/AI/Query/queryGeneralChoice3.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryGeneralChoice3.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryGeneralChoice4.cpp b/src/Game/AI/Query/queryGeneralChoice4.cpp
index 0b30f647..290602f4 100644
--- a/src/Game/AI/Query/queryGeneralChoice4.cpp
+++ b/src/Game/AI/Query/queryGeneralChoice4.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryGeneralChoice4.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryGeneralChoice8.cpp b/src/Game/AI/Query/queryGeneralChoice8.cpp
index 8aa55819..c6345b8f 100644
--- a/src/Game/AI/Query/queryGeneralChoice8.cpp
+++ b/src/Game/AI/Query/queryGeneralChoice8.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryGeneralChoice8.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasArmorAlreadyDyed.cpp b/src/Game/AI/Query/queryHasArmorAlreadyDyed.cpp
index 0bd17686..7ad39f2c 100644
--- a/src/Game/AI/Query/queryHasArmorAlreadyDyed.cpp
+++ b/src/Game/AI/Query/queryHasArmorAlreadyDyed.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasArmorAlreadyDyed.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasArmorDye.cpp b/src/Game/AI/Query/queryHasArmorDye.cpp
index 8bc2e197..20c209a4 100644
--- a/src/Game/AI/Query/queryHasArmorDye.cpp
+++ b/src/Game/AI/Query/queryHasArmorDye.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasArmorDye.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasCookResultInPorch.cpp b/src/Game/AI/Query/queryHasCookResultInPorch.cpp
index ad9b643d..581803ec 100644
--- a/src/Game/AI/Query/queryHasCookResultInPorch.cpp
+++ b/src/Game/AI/Query/queryHasCookResultInPorch.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasCookResultInPorch.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasEnoughPayment.cpp b/src/Game/AI/Query/queryHasEnoughPayment.cpp
index 17632459..5ef119da 100644
--- a/src/Game/AI/Query/queryHasEnoughPayment.cpp
+++ b/src/Game/AI/Query/queryHasEnoughPayment.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasEnoughPayment.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasItemDye.cpp b/src/Game/AI/Query/queryHasItemDye.cpp
index 34c2baa2..cdb5b6f0 100644
--- a/src/Game/AI/Query/queryHasItemDye.cpp
+++ b/src/Game/AI/Query/queryHasItemDye.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasItemDye.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasItemDyeSpecifiedColor.cpp b/src/Game/AI/Query/queryHasItemDyeSpecifiedColor.cpp
index 29bfde14..faabedbc 100644
--- a/src/Game/AI/Query/queryHasItemDyeSpecifiedColor.cpp
+++ b/src/Game/AI/Query/queryHasItemDyeSpecifiedColor.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasItemDyeSpecifiedColor.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasPorchArrow.cpp b/src/Game/AI/Query/queryHasPorchArrow.cpp
index 16517eb3..3d571d30 100644
--- a/src/Game/AI/Query/queryHasPorchArrow.cpp
+++ b/src/Game/AI/Query/queryHasPorchArrow.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasPorchArrow.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasPorchItem.cpp b/src/Game/AI/Query/queryHasPorchItem.cpp
index fee38fd2..dbfb4b46 100644
--- a/src/Game/AI/Query/queryHasPorchItem.cpp
+++ b/src/Game/AI/Query/queryHasPorchItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasPorchItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasPorchItemByCategory.cpp b/src/Game/AI/Query/queryHasPorchItemByCategory.cpp
index ce984ece..e9ac46a9 100644
--- a/src/Game/AI/Query/queryHasPorchItemByCategory.cpp
+++ b/src/Game/AI/Query/queryHasPorchItemByCategory.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasPorchItemByCategory.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasPouchItemByPouchCategory.cpp b/src/Game/AI/Query/queryHasPouchItemByPouchCategory.cpp
index ae0d193d..c38664ab 100644
--- a/src/Game/AI/Query/queryHasPouchItemByPouchCategory.cpp
+++ b/src/Game/AI/Query/queryHasPouchItemByPouchCategory.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasPouchItemByPouchCategory.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasSetItem.cpp b/src/Game/AI/Query/queryHasSetItem.cpp
index 090b61d5..aff0ede7 100644
--- a/src/Game/AI/Query/queryHasSetItem.cpp
+++ b/src/Game/AI/Query/queryHasSetItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasSetItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryHasSpecificArmorSeries.cpp b/src/Game/AI/Query/queryHasSpecificArmorSeries.cpp
index 5ba9f00d..2cd5ddd6 100644
--- a/src/Game/AI/Query/queryHasSpecificArmorSeries.cpp
+++ b/src/Game/AI/Query/queryHasSpecificArmorSeries.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryHasSpecificArmorSeries.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsAppAlreadyExchanged.cpp b/src/Game/AI/Query/queryIsAppAlreadyExchanged.cpp
index 2753d7ca..a70d5909 100644
--- a/src/Game/AI/Query/queryIsAppAlreadyExchanged.cpp
+++ b/src/Game/AI/Query/queryIsAppAlreadyExchanged.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsAppAlreadyExchanged.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsArriveAnchorForRain.cpp b/src/Game/AI/Query/queryIsArriveAnchorForRain.cpp
index cb3a9540..2309267e 100644
--- a/src/Game/AI/Query/queryIsArriveAnchorForRain.cpp
+++ b/src/Game/AI/Query/queryIsArriveAnchorForRain.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsArriveAnchorForRain.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsAwakened.cpp b/src/Game/AI/Query/queryIsAwakened.cpp
index 9aa11055..10d5b004 100644
--- a/src/Game/AI/Query/queryIsAwakened.cpp
+++ b/src/Game/AI/Query/queryIsAwakened.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsAwakened.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsBloodyMoonTrig.cpp b/src/Game/AI/Query/queryIsBloodyMoonTrig.cpp
index 5798ff07..81a31bcc 100644
--- a/src/Game/AI/Query/queryIsBloodyMoonTrig.cpp
+++ b/src/Game/AI/Query/queryIsBloodyMoonTrig.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsBloodyMoonTrig.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsCurrentAocFieldStage.cpp b/src/Game/AI/Query/queryIsCurrentAocFieldStage.cpp
index f2a0e2a6..58a52f3d 100644
--- a/src/Game/AI/Query/queryIsCurrentAocFieldStage.cpp
+++ b/src/Game/AI/Query/queryIsCurrentAocFieldStage.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsCurrentAocFieldStage.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsCurrentCDungeonStage.cpp b/src/Game/AI/Query/queryIsCurrentCDungeonStage.cpp
index 4ba07d6b..a2a6c1d9 100644
--- a/src/Game/AI/Query/queryIsCurrentCDungeonStage.cpp
+++ b/src/Game/AI/Query/queryIsCurrentCDungeonStage.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsCurrentCDungeonStage.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsCurrentMainFieldDungeonStage.cpp b/src/Game/AI/Query/queryIsCurrentMainFieldDungeonStage.cpp
index 412fef96..e3eedd18 100644
--- a/src/Game/AI/Query/queryIsCurrentMainFieldDungeonStage.cpp
+++ b/src/Game/AI/Query/queryIsCurrentMainFieldDungeonStage.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsCurrentMainFieldDungeonStage.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsCurrentMainFieldStage.cpp b/src/Game/AI/Query/queryIsCurrentMainFieldStage.cpp
index 4ecb1f0b..ca4bc4c4 100644
--- a/src/Game/AI/Query/queryIsCurrentMainFieldStage.cpp
+++ b/src/Game/AI/Query/queryIsCurrentMainFieldStage.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsCurrentMainFieldStage.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsEquipedDyedArmor.cpp b/src/Game/AI/Query/queryIsEquipedDyedArmor.cpp
index d87f573b..f2478579 100644
--- a/src/Game/AI/Query/queryIsEquipedDyedArmor.cpp
+++ b/src/Game/AI/Query/queryIsEquipedDyedArmor.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsEquipedDyedArmor.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsEquippedEnableDye.cpp b/src/Game/AI/Query/queryIsEquippedEnableDye.cpp
index 965230f3..9187fc66 100644
--- a/src/Game/AI/Query/queryIsEquippedEnableDye.cpp
+++ b/src/Game/AI/Query/queryIsEquippedEnableDye.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsEquippedEnableDye.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsEquippedWithLowerBody.cpp b/src/Game/AI/Query/queryIsEquippedWithLowerBody.cpp
index cee7e68c..7857a8ef 100644
--- a/src/Game/AI/Query/queryIsEquippedWithLowerBody.cpp
+++ b/src/Game/AI/Query/queryIsEquippedWithLowerBody.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsEquippedWithLowerBody.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsHorseFamiliarityPassedAlready.cpp b/src/Game/AI/Query/queryIsHorseFamiliarityPassedAlready.cpp
index 4ab9add0..39540a7e 100644
--- a/src/Game/AI/Query/queryIsHorseFamiliarityPassedAlready.cpp
+++ b/src/Game/AI/Query/queryIsHorseFamiliarityPassedAlready.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsHorseFamiliarityPassedAlready.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsHorseNumMax.cpp b/src/Game/AI/Query/queryIsHorseNumMax.cpp
index c5bf450a..c39ba4cb 100644
--- a/src/Game/AI/Query/queryIsHorseNumMax.cpp
+++ b/src/Game/AI/Query/queryIsHorseNumMax.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsHorseNumMax.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsIgnitionByArrowFire.cpp b/src/Game/AI/Query/queryIsIgnitionByArrowFire.cpp
index ae4ffd3b..9b7a4f9d 100644
--- a/src/Game/AI/Query/queryIsIgnitionByArrowFire.cpp
+++ b/src/Game/AI/Query/queryIsIgnitionByArrowFire.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsIgnitionByArrowFire.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsItemInStock.cpp b/src/Game/AI/Query/queryIsItemInStock.cpp
index aa33a5fe..9f957af8 100644
--- a/src/Game/AI/Query/queryIsItemInStock.cpp
+++ b/src/Game/AI/Query/queryIsItemInStock.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsItemInStock.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsNeedEquipWeapon.cpp b/src/Game/AI/Query/queryIsNeedEquipWeapon.cpp
index 6c00660f..3f103628 100644
--- a/src/Game/AI/Query/queryIsNeedEquipWeapon.cpp
+++ b/src/Game/AI/Query/queryIsNeedEquipWeapon.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsNeedEquipWeapon.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsNoEquipArmorAnyTarget.cpp b/src/Game/AI/Query/queryIsNoEquipArmorAnyTarget.cpp
index 19ef62c3..ab85598e 100644
--- a/src/Game/AI/Query/queryIsNoEquipArmorAnyTarget.cpp
+++ b/src/Game/AI/Query/queryIsNoEquipArmorAnyTarget.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsNoEquipArmorAnyTarget.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsOffLinkTag.cpp b/src/Game/AI/Query/queryIsOffLinkTag.cpp
index 158434f2..58f79b2f 100644
--- a/src/Game/AI/Query/queryIsOffLinkTag.cpp
+++ b/src/Game/AI/Query/queryIsOffLinkTag.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsOffLinkTag.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp b/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp
index f12fefbd..56f45800 100644
--- a/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp
+++ b/src/Game/AI/Query/queryIsOnEnterDungeonFlag.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsOnEnterDungeonFlag.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsOnInstEventFlag.cpp b/src/Game/AI/Query/queryIsOnInstEventFlag.cpp
index 716d43c9..e46a17e7 100644
--- a/src/Game/AI/Query/queryIsOnInstEventFlag.cpp
+++ b/src/Game/AI/Query/queryIsOnInstEventFlag.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsOnInstEventFlag.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsOwnedHorseAssociated.cpp b/src/Game/AI/Query/queryIsOwnedHorseAssociated.cpp
index 208cbeec..e92ac7d9 100644
--- a/src/Game/AI/Query/queryIsOwnedHorseAssociated.cpp
+++ b/src/Game/AI/Query/queryIsOwnedHorseAssociated.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsOwnedHorseAssociated.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsPlayerGrounded.cpp b/src/Game/AI/Query/queryIsPlayerGrounded.cpp
index 4e28bca6..a2510f2f 100644
--- a/src/Game/AI/Query/queryIsPlayerGrounded.cpp
+++ b/src/Game/AI/Query/queryIsPlayerGrounded.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsPlayerGrounded.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsRest.cpp b/src/Game/AI/Query/queryIsRest.cpp
index fe219c12..8eee1e11 100644
--- a/src/Game/AI/Query/queryIsRest.cpp
+++ b/src/Game/AI/Query/queryIsRest.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsRest.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsRideHorse.cpp b/src/Game/AI/Query/queryIsRideHorse.cpp
index 0b1a2383..430ca44f 100644
--- a/src/Game/AI/Query/queryIsRideHorse.cpp
+++ b/src/Game/AI/Query/queryIsRideHorse.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsRideHorse.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsSoldOut.cpp b/src/Game/AI/Query/queryIsSoldOut.cpp
index 86e19f66..cc0f1af7 100644
--- a/src/Game/AI/Query/queryIsSoldOut.cpp
+++ b/src/Game/AI/Query/queryIsSoldOut.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsSoldOut.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsSuccessEndLastDemoAction.cpp b/src/Game/AI/Query/queryIsSuccessEndLastDemoAction.cpp
index d306a292..a34df9e3 100644
--- a/src/Game/AI/Query/queryIsSuccessEndLastDemoAction.cpp
+++ b/src/Game/AI/Query/queryIsSuccessEndLastDemoAction.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsSuccessEndLastDemoAction.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsTerrorDisappeared.cpp b/src/Game/AI/Query/queryIsTerrorDisappeared.cpp
index 6e4bd832..58731f5c 100644
--- a/src/Game/AI/Query/queryIsTerrorDisappeared.cpp
+++ b/src/Game/AI/Query/queryIsTerrorDisappeared.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsTerrorDisappeared.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsWaitRevival.cpp b/src/Game/AI/Query/queryIsWaitRevival.cpp
index 6be00757..36881c07 100644
--- a/src/Game/AI/Query/queryIsWaitRevival.cpp
+++ b/src/Game/AI/Query/queryIsWaitRevival.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsWaitRevival.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryIsWeaponDrawn.cpp b/src/Game/AI/Query/queryIsWeaponDrawn.cpp
index 07ec45c9..f7ff3e9d 100644
--- a/src/Game/AI/Query/queryIsWeaponDrawn.cpp
+++ b/src/Game/AI/Query/queryIsWeaponDrawn.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryIsWeaponDrawn.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryKeyInputCheck.cpp b/src/Game/AI/Query/queryKeyInputCheck.cpp
index 0b4b3296..163c429b 100644
--- a/src/Game/AI/Query/queryKeyInputCheck.cpp
+++ b/src/Game/AI/Query/queryKeyInputCheck.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryKeyInputCheck.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryRandomChoice2.cpp b/src/Game/AI/Query/queryRandomChoice2.cpp
index c0c494ca..88732dc6 100644
--- a/src/Game/AI/Query/queryRandomChoice2.cpp
+++ b/src/Game/AI/Query/queryRandomChoice2.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryRandomChoice2.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include <random/seadGlobalRandom.h>
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryRandomChoice3.cpp b/src/Game/AI/Query/queryRandomChoice3.cpp
index da0f4e54..da279a7a 100644
--- a/src/Game/AI/Query/queryRandomChoice3.cpp
+++ b/src/Game/AI/Query/queryRandomChoice3.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryRandomChoice3.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include <random/seadGlobalRandom.h>
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryRandomChoice4.cpp b/src/Game/AI/Query/queryRandomChoice4.cpp
index 85bb52ff..cb049bf6 100644
--- a/src/Game/AI/Query/queryRandomChoice4.cpp
+++ b/src/Game/AI/Query/queryRandomChoice4.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryRandomChoice4.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include <random/seadGlobalRandom.h>
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryRandomChoice8.cpp b/src/Game/AI/Query/queryRandomChoice8.cpp
index 8151215a..95bb1430 100644
--- a/src/Game/AI/Query/queryRandomChoice8.cpp
+++ b/src/Game/AI/Query/queryRandomChoice8.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryRandomChoice8.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include <random/seadGlobalRandom.h>
 
 namespace uking::query {
diff --git a/src/Game/AI/Query/queryRandomChoiceExceptOnFlag.cpp b/src/Game/AI/Query/queryRandomChoiceExceptOnFlag.cpp
index 0dbf20c9..595dade7 100644
--- a/src/Game/AI/Query/queryRandomChoiceExceptOnFlag.cpp
+++ b/src/Game/AI/Query/queryRandomChoiceExceptOnFlag.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryRandomChoiceExceptOnFlag.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 #include <prim/seadBitFlag.h>
 #include <random/seadGlobalRandom.h>
 #include "KingSystem/GameData/gdtManager.h"
diff --git a/src/Game/AI/Query/queryWhatCurrentItem.cpp b/src/Game/AI/Query/queryWhatCurrentItem.cpp
index e1c9e052..08e8c575 100644
--- a/src/Game/AI/Query/queryWhatCurrentItem.cpp
+++ b/src/Game/AI/Query/queryWhatCurrentItem.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryWhatCurrentItem.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryWhatDayOfTheWeek.cpp b/src/Game/AI/Query/queryWhatDayOfTheWeek.cpp
index 543e667e..77da0090 100644
--- a/src/Game/AI/Query/queryWhatDayOfTheWeek.cpp
+++ b/src/Game/AI/Query/queryWhatDayOfTheWeek.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryWhatDayOfTheWeek.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryWhatDungeonType.cpp b/src/Game/AI/Query/queryWhatDungeonType.cpp
index b6d2d7f8..de51f151 100644
--- a/src/Game/AI/Query/queryWhatDungeonType.cpp
+++ b/src/Game/AI/Query/queryWhatDungeonType.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryWhatDungeonType.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {
 
diff --git a/src/Game/AI/Query/queryWhatMoonName.cpp b/src/Game/AI/Query/queryWhatMoonName.cpp
index 218ef705..df5cc2dd 100644
--- a/src/Game/AI/Query/queryWhatMoonName.cpp
+++ b/src/Game/AI/Query/queryWhatMoonName.cpp
@@ -1,5 +1,5 @@
 #include "Game/AI/Query/queryWhatMoonName.h"
-#include <evfl/query.h>
+#include <evfl/Query.h>
 
 namespace uking::query {