diff --git a/mods/boats/init.lua b/mods/boats/init.lua
index a7e62e43..a85f6e1e 100644
--- a/mods/boats/init.lua
+++ b/mods/boats/init.lua
@@ -36,7 +36,7 @@ local boat = {
 	physical = true,
 	collisionbox = {-0.5, -0.35, -0.5, 0.5, 0.3, 0.5},
 	visual = "mesh",
-	mesh = "boat.obj",
+	mesh = "boats_boat.obj",
 	textures = {"default_wood.png"},
 
 	driver = nil,
@@ -215,8 +215,8 @@ minetest.register_entity("boats:boat", boat)
 
 minetest.register_craftitem("boats:boat", {
 	description = "Boat",
-	inventory_image = "boat_inventory.png",
-	wield_image = "boat_wield.png",
+	inventory_image = "boats_inventory.png",
+	wield_image = "boats_wield.png",
 	wield_scale = {x = 2, y = 2, z = 1},
 	liquids_pointable = true,
 
diff --git a/mods/boats/models/boat.obj b/mods/boats/models/boats_boat.obj
similarity index 100%
rename from mods/boats/models/boat.obj
rename to mods/boats/models/boats_boat.obj
diff --git a/mods/boats/textures/boat_inventory.png b/mods/boats/textures/boats_inventory.png
similarity index 100%
rename from mods/boats/textures/boat_inventory.png
rename to mods/boats/textures/boats_inventory.png
diff --git a/mods/boats/textures/boat_wield.png b/mods/boats/textures/boats_wield.png
similarity index 100%
rename from mods/boats/textures/boat_wield.png
rename to mods/boats/textures/boats_wield.png