diff --git a/mods/ITEMS/mcl_farming/soil.lua b/mods/ITEMS/mcl_farming/soil.lua
index b89ae4025..0b38a5ed9 100644
--- a/mods/ITEMS/mcl_farming/soil.lua
+++ b/mods/ITEMS/mcl_farming/soil.lua
@@ -1,5 +1,5 @@
 minetest.register_node("mcl_farming:soil", {
-	tiles = {"farming_soil.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png"},
+	tiles = {"mcl_farming_farmland_dry.png", "default_dirt.png"},
 	description = "Farmland",
 	_doc_items_longdesc = "Farmland is used for farming, a necessary surface to plant crops. It is created when a hoe is used on dirt or a similar block. Plants are able to grow on farmland, but slowly. Farmland will become hydrated farmland (on which plants grow faster) when it rains or a water source is nearby. This block will turn back to dirt when a solid block appears above it or a piston arm extends above it.",
 	drop = "mcl_core:dirt",
@@ -23,7 +23,7 @@ minetest.register_node("mcl_farming:soil", {
 })
 
 minetest.register_node("mcl_farming:soil_wet", {
-	tiles = {"farming_soil_wet.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png", "default_dirt.png"},
+	tiles = {"mcl_farming_farmland_wet.png", "default_dirt.png"},
 	description = "Hydrated Farmland",
 	_doc_items_longdesc = "Hydrated farmland is used in farming, this is where you can plant and grow some plants. It is created when farmlands is under rain or near water. Without water, this block will dry out eventually. This block will turn back to dirt when a solid block appears above it or a piston arm extends above it.",
 	drop = "mcl_core:dirt",
diff --git a/mods/ITEMS/mcl_farming/textures/farming_soil.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_farmland_dry.png
similarity index 100%
rename from mods/ITEMS/mcl_farming/textures/farming_soil.png
rename to mods/ITEMS/mcl_farming/textures/mcl_farming_farmland_dry.png
diff --git a/mods/ITEMS/mcl_farming/textures/farming_soil_wet.png b/mods/ITEMS/mcl_farming/textures/mcl_farming_farmland_wet.png
similarity index 100%
rename from mods/ITEMS/mcl_farming/textures/farming_soil_wet.png
rename to mods/ITEMS/mcl_farming/textures/mcl_farming_farmland_wet.png
diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv
index 4871c7d22..a01d38f2d 100644
--- a/tools/Conversion_Table.csv
+++ b/tools/Conversion_Table.csv
@@ -359,8 +359,8 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
 /assets/minecraft/textures/items,seeds_pumpkin.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_pumpkin_seeds.png,,,,,,,
 /assets/minecraft/textures/blocks,pumpkin_side.png,/mods/ITEMS/mcl_farming/textures,farming_pumpkin_side.png,,,,,,,
 /assets/minecraft/textures/blocks,pumpkin_top.png,/mods/ITEMS/mcl_farming/textures,farming_pumpkin_top.png,,,,,,,
-/assets/minecraft/textures/blocks,farmland_dry.png,/mods/ITEMS/mcl_farming/textures,farming_soil.png,,,,,,,
-/assets/minecraft/textures/blocks,farmland_wet.png,/mods/ITEMS/mcl_farming/textures,farming_soil_wet.png,,,,,,,
+/assets/minecraft/textures/blocks,farmland_dry.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_farmland_dry.png,,,,,,,
+/assets/minecraft/textures/blocks,farmland_wet.png,/mods/ITEMS/mcl_farming/textures,mcl_farming_farmland_wet.png,,,,,,,
 /assets/minecraft/textures/items,diamond_hoe.png,/mods/ITEMS/mcl_farming/textures,farming_tool_diamondhoe.png,,,,,,,
 /assets/minecraft/textures/items,gold_hoe.png,/mods/ITEMS/mcl_farming/textures,farming_tool_goldhoe.png,,,,,,,
 /assets/minecraft/textures/items,iron_hoe.png,/mods/ITEMS/mcl_farming/textures,farming_tool_steelhoe.png,,,,,,,