diff --git a/data/mods/Magiclysm/items/potion_fruits.json b/data/mods/Magiclysm/items/potion_fruits.json
index b97ebc9f728ba..0cc519a886911 100644
--- a/data/mods/Magiclysm/items/potion_fruits.json
+++ b/data/mods/Magiclysm/items/potion_fruits.json
@@ -9,11 +9,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "66 days 16 hours",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the apple potion fruit.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_APPLE" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_APPLE" ]
   },
   {
     "type": "effect_on_condition",
@@ -30,11 +26,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "30 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the peach potion fruit.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_PEACH" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_PEACH" ]
   },
   {
     "type": "effect_on_condition",
@@ -51,11 +43,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "40 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the pear potion fruit.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_PEAR" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_PEAR" ]
   },
   {
     "type": "effect_on_condition",
@@ -72,11 +60,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of blackberry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_BLACKBERRY" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_BLACKBERRY" ]
   },
   {
     "type": "effect_on_condition",
@@ -93,11 +77,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of raspberry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_RASPBERRY" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_RASPBERRY" ]
   },
   {
     "type": "effect_on_condition",
@@ -114,11 +94,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of strawberry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_STRAWBERRY" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_STRAWBERRY" ]
   },
   {
     "type": "effect_on_condition",
@@ -135,11 +111,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of elderberry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_ELDERBERRY" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_ELDERBERRY" ]
   },
   {
     "type": "effect_on_condition",
@@ -168,11 +140,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of cranberry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_CRANBERRY" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_CRANBERRY" ]
   },
   {
     "type": "effect_on_condition",
@@ -189,11 +157,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of huckleberry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_HUCKLEBERRY" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_HUCKLEBERRY" ]
   },
   {
     "type": "effect_on_condition",
@@ -210,11 +174,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of wintergreen berry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_WINTERGREEN" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_WINTERGREEN" ]
   },
   {
     "type": "effect_on_condition",
@@ -231,11 +191,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "25 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of cherry potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_CHERRY" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_CHERRY" ]
   },
   {
     "type": "effect_on_condition",
@@ -252,11 +208,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "20 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of apricot potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_APRICOT" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_APRICOT" ]
   },
   {
     "type": "effect_on_condition",
@@ -273,11 +225,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "20 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the handful of grape potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_GRAPE" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_GRAPE" ]
   },
   {
     "type": "effect_on_condition",
@@ -297,11 +245,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "20 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the mayapple potion fruit.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_MAYAPPLE" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_MAYAPPLE" ]
   },
   {
     "type": "effect_on_condition",
@@ -321,11 +265,7 @@
     "proportional": { "quench": 0.5, "calories": 0.5 },
     "spoils_in": "30 days",
     "extend": { "flags": [ "NO_AUTO_CONSUME" ] },
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the starry false Solomon's seal potion fruits.",
-      "effect_on_conditions": [ "EOC_POTION_FRUIT_SOLOMON_SEAL" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_POTION_FRUIT_SOLOMON_SEAL" ]
   },
   {
     "type": "effect_on_condition",
diff --git a/data/mods/MindOverMatter/items/comestibles.json b/data/mods/MindOverMatter/items/comestibles.json
index 7fc3e6286e8ba..228d6fcea913e 100644
--- a/data/mods/MindOverMatter/items/comestibles.json
+++ b/data/mods/MindOverMatter/items/comestibles.json
@@ -19,11 +19,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_BIOKIN_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_BIOKIN_POTION" ]
   },
   {
     "id": "matrix_crystal_clair_dust_potion",
@@ -45,11 +41,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_CLAIR_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_CLAIR_POTION" ]
   },
   {
     "id": "matrix_crystal_electrokin_dust_potion",
@@ -71,11 +63,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_ELECTROKIN_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_ELECTROKIN_POTION" ]
   },
   {
     "id": "matrix_crystal_photokin_dust_potion",
@@ -97,11 +85,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_PHOTOKIN_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_PHOTOKIN_POTION" ]
   },
   {
     "id": "matrix_crystal_pyrokin_dust_potion",
@@ -123,11 +107,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_PYROKIN_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_PYROKIN_POTION" ]
   },
   {
     "id": "matrix_crystal_telekin_dust_potion",
@@ -149,11 +129,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_TELEKIN_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_TELEKIN_POTION" ]
   },
   {
     "id": "matrix_crystal_telepath_dust_potion",
@@ -175,11 +151,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_TELEPATH_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_TELEPATH_POTION" ]
   },
   {
     "id": "matrix_crystal_teleport_dust_potion",
@@ -201,11 +173,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_TELEPORT_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_TELEPORT_POTION" ]
   },
   {
     "id": "matrix_crystal_vitakin_dust_potion",
@@ -227,11 +195,7 @@
     "quench": 50,
     "ammo_data": { "ammo_type": "water" },
     "flags": [ "EATEN_COLD", "NUTRIENT_OVERRIDE", "NO_AUTO_CONSUME" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Drink the concoction.",
-      "effect_on_conditions": [ "EOC_VITAKIN_POTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_VITAKIN_POTION" ]
   },
   {
     "type": "COMESTIBLE",
@@ -294,11 +258,7 @@
     "volume": "250 ml",
     "fun": 1,
     "flags": [ "EDIBLE_FROZEN" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the berries.",
-      "effect_on_conditions": [ "EOC_ALIEN_MEADOW_BUSH_2_BERRIES" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_ALIEN_MEADOW_BUSH_2_BERRIES" ]
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json
index 7725f4d80d26e..b3db88b16c154 100644
--- a/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json
+++ b/data/mods/Xedra_Evolved/items/comestibles/goblin_fruits.json
@@ -62,11 +62,7 @@
     "color": "red_yellow",
     "weight": "210 g",
     "volume": "273 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the sweet goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_HEALING" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_HEALING" ]
   },
   {
     "type": "effect_on_condition",
@@ -84,11 +80,7 @@
     "weight": "155 g",
     "volume": "174 ml",
     "fun": 3,
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the iridescent goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_ILLNESS" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_ILLNESS" ]
   },
   {
     "type": "effect_on_condition",
@@ -105,11 +97,7 @@
     "color": "light_gray",
     "weight": "218 g",
     "volume": "278 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the silvery goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_ATTACK_SPEED" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_ATTACK_SPEED" ]
   },
   {
     "type": "effect_on_condition",
@@ -127,11 +115,7 @@
     "weight": "173 g",
     "volume": "209 ml",
     "fun": -2,
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the spicy goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_THORNS" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_THORNS" ]
   },
   {
     "type": "effect_on_condition",
@@ -149,11 +133,7 @@
     "weight": "227 g",
     "volume": "290 ml",
     "fun": 2,
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the savory goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_PAIN" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_PAIN" ]
   },
   {
     "type": "effect_on_condition",
@@ -170,11 +150,7 @@
     "color": "red",
     "weight": "136 g",
     "volume": "174 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the rinded goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_WARMTH" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_WARMTH" ]
   },
   {
     "type": "effect_on_condition",
@@ -192,11 +168,7 @@
     "weight": "150 g",
     "volume": "191 ml",
     "fun": 0,
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the minty goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_AWAKE" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_AWAKE" ]
   },
   {
     "type": "effect_on_condition",
@@ -226,11 +198,7 @@
     "color": "light_red",
     "weight": "182 g",
     "volume": "232 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the smoky goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_PURGE_BLOOD" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_PURGE_BLOOD" ]
   },
   {
     "type": "effect_on_condition",
@@ -247,11 +215,7 @@
     "color": "black",
     "weight": "273 g",
     "volume": "348 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the inky goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_DODGE" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_DODGE" ]
   },
   {
     "type": "effect_on_condition",
@@ -268,11 +232,7 @@
     "color": "yellow",
     "weight": "118 g",
     "volume": "151 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the toroid goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NIGHT_VISION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NIGHT_VISION" ]
   },
   {
     "type": "effect_on_condition",
@@ -292,11 +252,7 @@
     "color": "blue_red",
     "weight": "191 g",
     "volume": "244 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the dolm goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NO_BLEED" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NO_BLEED" ]
   },
   {
     "type": "effect_on_condition",
@@ -313,11 +269,7 @@
     "color": "dark_gray",
     "weight": "182 g",
     "volume": "232 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the spikey goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_PERCEPTION" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_PERCEPTION" ]
   },
   {
     "type": "effect_on_condition",
@@ -335,11 +287,7 @@
     "weight": "146 g",
     "volume": "186 ml",
     "fun": -3,
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the sanguine goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NO_DRUNK" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NO_DRUNK" ]
   },
   {
     "type": "effect_on_condition",
@@ -356,11 +304,7 @@
     "color": "white",
     "weight": "209 g",
     "volume": "267 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the translucent goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NO_ROTTEN_FOOD" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_NO_ROTTEN_FOOD" ]
   },
   {
     "type": "effect_on_condition",
@@ -377,11 +321,7 @@
     "color": "green_yellow",
     "weight": "146 g",
     "volume": "187 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the inconspicuous goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_FEATHERFALL" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_FEATHERFALL" ]
   },
   {
     "type": "effect_on_condition",
@@ -399,11 +339,7 @@
     "weight": "263 g",
     "volume": "300 ml",
     "fun": -3,
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the crumbly goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_FEATHERFALL" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_SUPER_CLAIRVOYANCE" ]
   },
   {
     "type": "effect_on_condition",
@@ -421,15 +357,11 @@
     "weight": "210 g",
     "volume": "240 ml",
     "fun": -3,
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the star-shaped goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_WATER_BREATHING" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_WATER_BREATHING" ]
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_GOBLIN_WATER_BREATHING",
+    "id": "EOC_GOBLIN_FRUIT_WATER_BREATHING",
     "effect": [ { "u_add_effect": "effect_goblin_fruit_water_breathing", "duration": { "math": [ "500 + rand(5000)" ] } } ]
   },
   {
@@ -442,11 +374,7 @@
     "color": "dark_gray",
     "weight": "118 g",
     "volume": "151 ml",
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the shadowy goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_SHADOW" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_SHADOW" ]
   },
   {
     "type": "effect_on_condition",
@@ -464,11 +392,7 @@
     "weight": "199 g",
     "volume": "228 ml",
     "flags": [ "FREEZERBURN", "NO_AUTO_CONSUME", "LIGHT_10" ],
-    "use_action": {
-      "type": "effect_on_conditions",
-      "description": "Eat the shiny goblin fruit.",
-      "effect_on_conditions": [ "EOC_GOBLIN_FRUIT_GIANT_GROWTH" ]
-    }
+    "consumption_effect_on_conditions": [ "EOC_GOBLIN_FRUIT_GIANT_GROWTH" ]
   },
   {
     "type": "effect_on_condition",
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
index 47949fa62a211..6daf49c232fca 100644
--- a/src/iuse_actor.cpp
+++ b/src/iuse_actor.cpp
@@ -5701,7 +5701,7 @@ std::optional<int> effect_on_conditons_actor::use( Character *p, item &it,
         const tripoint_bub_ms &point ) const
 {
     if( it.type->comestible ) {
-        debugmsg( "Comestibles are not properly consumed via effect_on_conditions and effect_on_conditions should not be used on items of type comestible until/unless this is resolved." );
+        debugmsg( "Comestibles are not properly consumed via effect_on_conditions and effect_on_conditions should not be used on items of type comestible until/unless this is resolved.  Rather than a use_action, use the consumption_effect_on_conditions JSON parameter on the comestible" );
         return 0;
     }