diff --git a/mods/mesecons/mesecons/oldwires.lua b/mods/mesecons/mesecons/oldwires.lua
index 9e54b1bb..b3b09e53 100644
--- a/mods/mesecons/mesecons/oldwires.lua
+++ b/mods/mesecons/mesecons/oldwires.lua
@@ -30,7 +30,7 @@ minetest.register_node("mesecons:mesecon_on", {
 	},
 	groups = {dig_immediate=3, not_in_creaive_inventory=1, mesecon=1},
 	drop = "mesecons:mesecon_off 1",
-	light_source = LIGHT_MAX-11,
+	light_source = default.LIGHT_MAX-11,
 	mesecons = {conductor={
 		state = mesecon.state.on,
 		offstate = "mesecons:mesecon_off"
diff --git a/mods/mesecons/mesecons_button/init.lua b/mods/mesecons/mesecons_button/init.lua
index f147d8f5..ead688ee 100644
--- a/mods/mesecons/mesecons_button/init.lua
+++ b/mods/mesecons/mesecons_button/init.lua
@@ -67,7 +67,7 @@ minetest.register_node("mesecons_button:button_on", {
 	paramtype2 = "facedir",
 	legacy_wallmounted = true,
 	walkable = false,
-	light_source = LIGHT_MAX-7,
+	light_source = default.LIGHT_MAX-7,
 	sunlight_propagates = true,
 	selection_box = {
 		type = "fixed",
diff --git a/mods/mesecons/mesecons_doors/init.lua b/mods/mesecons/mesecons_doors/init.lua
index 74aca188..9b79dcab 100644
--- a/mods/mesecons/mesecons_doors/init.lua
+++ b/mods/mesecons/mesecons_doors/init.lua
@@ -56,22 +56,12 @@ meseconify_door("doors:door_obsidian_glass")
 local function trapdoor_switch(pos, node)
 	local state = minetest.get_meta(pos):get_int("state")
 
-	if node.name:split(":")[2] == "trapdoor" or node.name:split(":")[2] == "trapdoor_open" then
-		if state == 1 then
-			minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
-			minetest.set_node(pos, {name="doors:trapdoor", param2 = node.param2})
-		else
-			minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
-			minetest.set_node(pos, {name="doors:trapdoor_open", param2 = node.param2})
-		end
+	if state == 1 then
+		minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.set_node(pos, {name="doors:trapdoor", param2 = node.param2})
 	else
-		if state == 1 then
-			minetest.sound_play("doors_door_close", {pos = pos, gain = 0.3, max_hear_distance = 10})
-			minetest.set_node(pos, {name="doors:trapdoor_cherry", param2 = node.param2})
-		else
-			minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
-			minetest.set_node(pos, {name="doors:trapdoor_cherry_open", param2 = node.param2})
-		end
+		minetest.sound_play("doors_door_open", {pos = pos, gain = 0.3, max_hear_distance = 10})
+		minetest.set_node(pos, {name="doors:trapdoor_open", param2 = node.param2})
 	end
 
 	minetest.get_meta(pos):set_int("state", state == 1 and 0 or 1)
diff --git a/mods/mesecons/mesecons_lamp/init.lua b/mods/mesecons/mesecons_lamp/init.lua
index 6cdae2da..362453ca 100644
--- a/mods/mesecons/mesecons_lamp/init.lua
+++ b/mods/mesecons/mesecons_lamp/init.lua
@@ -17,7 +17,7 @@ minetest.register_node("mesecons_lamp:lamp_on", {
 	legacy_wallmounted = true,
 	sunlight_propagates = true,
 	walkable = true,
-	light_source = LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = mesecon_lamp_box,
 	selection_box = mesecon_lamp_box,
 	groups = {dig_immediate=3,not_in_creative_inventory=1, mesecon_effector_on = 1},
diff --git a/mods/mesecons/mesecons_lightstone/init.lua b/mods/mesecons/mesecons_lightstone/init.lua
index db34249e..da7cc41e 100644
--- a/mods/mesecons/mesecons_lightstone/init.lua
+++ b/mods/mesecons/mesecons_lightstone/init.lua
@@ -31,7 +31,7 @@ function mesecon.lightstone_add(name, base_item, texture_off, texture_on)
 	tiles = {texture_on},
 	groups = {cracky=2,not_in_creative_inventory=1, mesecon = 2},
 	drop = "mesecons_lightstone:lightstone_" .. name .. "_off",
-	light_source = LIGHT_MAX-2,
+	light_source = default.LIGHT_MAX-2,
 	sounds = default.node_sound_stone_defaults(),
 	mesecons = {effector = {
 		rules = lightstone_rules,
diff --git a/mods/mesecons/mesecons_powerplant/init.lua b/mods/mesecons/mesecons_powerplant/init.lua
index 33cedffc..a5e33272 100644
--- a/mods/mesecons/mesecons_powerplant/init.lua
+++ b/mods/mesecons/mesecons_powerplant/init.lua
@@ -9,7 +9,7 @@ minetest.register_node("mesecons_powerplant:power_plant", {
 	paramtype = "light",
 	walkable = false,
 	groups = {dig_immediate=3, mesecon = 2},
-	light_source = LIGHT_MAX-9,
+	light_source = default.LIGHT_MAX-9,
     	description="Power Plant",
 	selection_box = {
 		type = "fixed",
diff --git a/mods/mesecons/mesecons_torch/init.lua b/mods/mesecons/mesecons_torch/init.lua
index 91f8e65b..5d1ad8f0 100644
--- a/mods/mesecons/mesecons_torch/init.lua
+++ b/mods/mesecons/mesecons_torch/init.lua
@@ -76,7 +76,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
 	paramtype2 = "wallmounted",
 	selection_box = torch_selectionbox,
 	groups = {dig_immediate=3},
-	light_source = LIGHT_MAX-5,
+	light_source = default.LIGHT_MAX-5,
 	description="Mesecon Torch",
 	mesecons = {receptor = {
 		state = mesecon.state.on,