diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua
index 0317b6f3..1600c0fc 100644
--- a/mods/mobs/api.lua
+++ b/mods/mobs/api.lua
@@ -125,7 +125,7 @@ local mob_class = {
 	attack_chance = 5,
 	passive = false,
 	blood_amount = 5,
-	blood_texture = "mobs_blood.png",
+	blood_texture = "blood.png",
 	shoot_offset = 0,
 	floats = 1, -- floats in water by default
 	replace_offset = 0,
@@ -931,7 +931,7 @@ function mob_class:check_for_death(cmi_cause)
 
 		remove_mob(self, true)
 
-		effect(pos, 20, "tnt_smoke.png")
+		effect(pos, 20, "smoke.png")
 	end
 
 	return true
@@ -1069,7 +1069,7 @@ function mob_class:do_env_damage()
 
 			self.health = self.health - self.lava_damage
 
-			effect(pos, 15, "fire_basic_flame.png", 1, 5, 1, 0.2, 15, true)
+			effect(pos, 15, "fire_basic.png", 1, 5, 1, 0.2, 15, true)
 
 			if self:check_for_death({type = "environment", pos = pos,
 					node = self.standing_in, hot = true}) then
@@ -1082,7 +1082,7 @@ function mob_class:do_env_damage()
 
 		self.health = self.health - nodef.damage_per_second
 
-		effect(pos, 5, "tnt_smoke.png")
+		effect(pos, 5, "smoke.png")
 
 		if self:check_for_death({type = "environment",
 				pos = pos, node = self.standing_in}) then
@@ -1100,7 +1100,7 @@ function mob_class:do_env_damage()
 
 			self.health = self.health - self.light_damage
 
-			effect(pos, 5, "tnt_smoke.png")
+			effect(pos, 5, "smoke.png")
 
 			if self:check_for_death({type = "light"}) then
 				return true
@@ -1423,7 +1423,7 @@ function mob_class:breed()
 								return
 						end
 					else
-						effect(pos, 15, "tnt_smoke.png", 1, 2, 2, 15, 5)
+						effect(pos, 15, "smoke.png", 1, 2, 2, 15, 5)
 					end
 
 					local mob = minetest.add_entity(pos, self.name)
@@ -2398,7 +2398,7 @@ function mob_class:do_states(dtime)
 
 						entity_physics(pos, entity_damage_radius)
 
-						effect(pos, 32, "tnt_smoke.png", nil, nil,
+						effect(pos, 32, "smoke.png", nil, nil,
 								node_break_radius, 1, 0)
 					end
 
@@ -2666,7 +2666,7 @@ function mob_class:falling(pos)
 
 				self.health = self.health - floor(d - 5)
 
-				effect(pos, 5, "tnt_smoke.png", 1, 2, 2, nil)
+				effect(pos, 5, "smoke.png", 1, 2, 2, nil)
 
 				if self:check_for_death({type = "fall"}) then
 					return true
@@ -3240,7 +3240,7 @@ function mob_class:mob_expire(pos, dtime)
 --			minetest.log("action",
 --				S("lifetimer expired, removed @1", self.name))
 
-			effect(pos, 15, "tnt_smoke.png", 2, 4, 2, 0)
+			effect(pos, 15, "smoke.png", 2, 4, 2, 0)
 
 			remove_mob(self, true)
 
@@ -4160,7 +4160,7 @@ function mobs:safe_boom(self, pos, radius)
 
 	entity_physics(pos, radius)
 
-	effect(pos, 32, "tnt_smoke.png", radius * 3, radius * 5, radius, 1, 0)
+	effect(pos, 32, "smoke.png", radius * 3, radius * 5, radius, 1, 0)
 end