diff --git a/crops/coffee.lua b/crops/coffee.lua
index 3cc6822..ba34506 100644
--- a/crops/coffee.lua
+++ b/crops/coffee.lua
@@ -36,7 +36,7 @@ minetest.register_alias("farming:drinking_cup", "vessels:drinking_glass")
 minetest.register_craft( {
 	output = "farming:coffee_cup",
 	recipe = {
-		{"group:food_coffee", "group:food_water_glass", a.saucepan}
+		{"group:food_coffee", "group:food_glass_water", a.saucepan}
 	},
 	replacements = {
 		{"group:food_saucepan", "farming:saucepan"}
diff --git a/crops/mint.lua b/crops/mint.lua
index 8b7f7b4..6dc78d6 100644
--- a/crops/mint.lua
+++ b/crops/mint.lua
@@ -35,7 +35,7 @@ minetest.register_craftitem("farming:mint_leaf", {
 minetest.register_craftitem("farming:mint_tea", {
 	description = S("Mint Tea"),
 	inventory_image = "farming_mint_tea.png",
-	on_use = minetest.item_eat(2, "vessels:drinking_glass"),
+	on_use = minetest.item_eat(2, a.drinking_glass),
 	groups = {flammable = 4}
 })
 
@@ -43,7 +43,7 @@ minetest.register_craft({
 	output = "farming:mint_tea",
 	recipe = {
 		{"group:food_mint", "group:food_mint", "group:food_mint"},
-		{"group:food_water_glass", a.juicer, ""}
+		{"group:food_glass_water", a.juicer, ""}
 	},
 	replacements = {
 		{"group:food_juicer", "farming:juicer"}
diff --git a/crops/vanilla.lua b/crops/vanilla.lua
index 2c1b90d..0d03bde 100644
--- a/crops/vanilla.lua
+++ b/crops/vanilla.lua
@@ -53,10 +53,10 @@ minetest.register_craft( {
 	output = "farming:vanilla_extract",
 	recipe = {
 		{"group:food_vanilla", "group:food_vanilla", "group:food_vanilla"},
-		{"group:food_vanilla", "farming:bottle_ethanol", "group:food_water_glass"},
+		{"group:food_vanilla", "farming:bottle_ethanol", "group:food_glass_water"},
 	},
 	replacements = {
-		{"group:food_water_glass", a.drinking_glass}
+		{"group:food_glass_water", a.drinking_glass}
 	}
 })
 
@@ -64,7 +64,7 @@ minetest.register_craft({
 	type = "fuel",
 	recipe = "farming:vanilla_extract",
 	burntime = 25,
-	replacements = {{"farming:vanilla_extract", "vessels:glass_bottle"}}
+	replacements = {{"farming:vanilla_extract", a.glass_bottle}}
 })
 
 -- stage 1
diff --git a/food.lua b/food.lua
index 2af67fb..15728e5 100644
--- a/food.lua
+++ b/food.lua
@@ -62,12 +62,23 @@ minetest.register_craft({
 	}
 })
 
+if farming.mcl then
+
+	minetest.register_craft({
+		output = "mcl_potions:river_water",
+		recipe = {
+			{"farming:hemp_fibre"},
+			{"mcl_potions:water"}
+		}
+	})
+end
+
 -- glass of water
 
 minetest.register_craftitem("farming:glass_water", {
 	description = S("Glass of Water"),
 	inventory_image = "farming_water_glass.png",
-	groups = {food_water_glass = 1, flammable = 3, vessel = 1}
+	groups = {food_glass_water = 1, flammable = 3, vessel = 1}
 })
 
 minetest.register_craft({
@@ -319,10 +330,10 @@ minetest.register_craft({
 	recipe = {
 		{a.rose, a.rose, a.rose},
 		{a.rose, a.rose, a.rose},
-		{"group:food_water_glass", a.pot, a.glass_bottle}
+		{"group:food_glass_water", a.pot, a.glass_bottle}
 	},
 	replacements = {
-		{"group:food_water_glass", a.drinking_glass},
+		{"group:food_glass_water", a.drinking_glass},
 		{"group:food_pot", "farming:pot"}
 	}
 })
@@ -822,11 +833,11 @@ minetest.register_craft({
 	recipe = {
 		{"", a.mortar_pestle, ""},
 		{"group:food_rice", "group:food_sugar", "group:food_rice"},
-		{"", "farming:glass_water", ""}
+		{"", "group:food_glass_water", ""}
 	},
 	replacements = {
 		{"group:food_mortar_pestle", "farming:mortar_pestle"},
-		{"farming:glass_water", a.drinking_glass}
+		{"group:food_glass_water", a.drinking_glass}
 	}
 })
 
diff --git a/items.lua b/items.lua
index d73ed35..b8c1c14 100644
--- a/items.lua
+++ b/items.lua
@@ -99,7 +99,7 @@ if farming.mcl then
 
 	add_groups("mcl_core:sugar", {food_sugar = 1})
 	add_groups("mcl_throwing:egg", {food_egg = 1})
-	add_groups("mcl_farming:wheat", {food_wheat = 1})
+	add_groups("mcl_farming:wheat_item", {food_wheat = 1})
 	add_groups("mcl_cocoas:cocoa_beans", {food_cocoa = 1})
 	add_groups("mcl_core:apple", {food_apple = 1})
 	add_groups("mcl_core:bowl", {food_bowl = 1})
@@ -113,7 +113,7 @@ if farming.mcl then
 	add_groups("mcl_farming:bread", {food_bread = 1})
 	add_groups("mcl_mobitems:milk_bucket", {food_milk = 1})
 	add_groups("mcl_ocean:dried_kelp", {food_seaweed = 1})
-	add_groups("mcl_potions:river_water", {food_water_glass = 1})
+	add_groups("mcl_potions:river_water", {food_glass_water = 1})
 
 	-- add missing food groups to current items so recipes work
 	add_groups("mcl_dye:yellow", {food_lemon = 1, food_banana = 1})