diff --git a/data/ai/function/call/condition/condition/function.mcfunction b/data/ai/function/call/condition/condition/function.mcfunction
index cdc822f051..07218c1732 100644
--- a/data/ai/function/call/condition/condition/function.mcfunction
+++ b/data/ai/function/call/condition/condition/function.mcfunction
@@ -5,6 +5,6 @@
 data modify storage mob_data: Tags set from entity @s Tags
 data modify entity @s Tags set from storage mob_data: Condition.Tags
 #function呼び出し
-execute store success score _ Calc run function settings:enemy/
+execute store success score _ Calc run function #entity:spawn_data
 #Tagsを復元
 data modify entity @s Tags set from storage mob_data: Tags
diff --git a/data/player/function/trigger/talk/update_offers.mcfunction b/data/player/function/trigger/talk/update_offers.mcfunction
index c14e864b6d..11d0e4574d 100644
--- a/data/player/function/trigger/talk/update_offers.mcfunction
+++ b/data/player/function/trigger/talk/update_offers.mcfunction
@@ -4,6 +4,6 @@
 data remove storage tusb_mob: "即時ステータス"
 data modify entity 0-0-0-0-0 Tags set value []
 data modify entity 0-0-0-0-0 Tags set from entity @s ArmorItems[0].components."minecraft:custom_data".SpawnTags
-execute as 0-0-0-0-0 run function settings:enemy/
+execute as 0-0-0-0-0 run function #entity:spawn_data
 data modify entity @s Offers set from storage tusb_mob: "即時ステータス"."ベース".Offers
 execute at @s facing entity @a[limit=1,sort=nearest] eyes rotated ~ 0 run tp @s ~ ~ ~ ~ ~
diff --git a/data/skill/functions/act/summoner/summon_wolf/act1.mcfunction b/data/skill/functions/act/summoner/summon_wolf/act1.mcfunction
index f0b511feef..288aed7887 100644
--- a/data/skill/functions/act/summoner/summon_wolf/act1.mcfunction
+++ b/data/skill/functions/act/summoner/summon_wolf/act1.mcfunction
@@ -13,7 +13,7 @@ execute store result entity @e[tag=!Initialized,distance=0,limit=1] CollarColor
 #演出
 function makeup:skill/act/summoner/summon_wolf/act1
 #AI付与
-function settings:enemy/global/friendly/blow/friend_wolf/main
+function settings:entity/global/friendly/blow/friend_wolf/main
 scoreboard players set @e[tag=!Initialized,distance=0,limit=1] Level 15
 data modify entity @e[tag=!Initialized,distance=0,limit=1] Tags set from storage tusb_mob: "即時ステータス"."ベース".Tags
 tag @e[tag=!Initialized,distance=0,limit=1] remove DelayedData