diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua
index ead688e..a61e5e3 100644
--- a/mesecons_button/init.lua
+++ b/mesecons_button/init.lua
@@ -40,7 +40,7 @@ minetest.register_node("mesecons_button:button_off", {
 	},
 	groups = {dig_immediate=2, mesecon_needs_receiver = 1},
 	description = "Button",
-	on_punch = function (pos, node)
+	on_rightclick = function (pos, node)
 		minetest.swap_node(pos, {name = "mesecons_button:button_on", param2=node.param2})
 		mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
 		minetest.sound_play("mesecons_button_push", {pos=pos})
diff --git a/mesecons_switch/init.lua b/mesecons_switch/init.lua
index 2b3c3ee..f52f083 100644
--- a/mesecons_switch/init.lua
+++ b/mesecons_switch/init.lua
@@ -4,7 +4,7 @@ mesecon.register_node("mesecons_switch:mesecon_switch", {
 	paramtype2="facedir",
 	description="Switch",
 	sounds = default.node_sound_stone_defaults(),
-	on_punch = function (pos, node)
+	on_rightclick = function (pos, node)
 		if(mesecon.flipstate(pos, node) == "on") then
 			mesecon.receptor_on(pos)
 		else
diff --git a/mesecons_walllever/init.lua b/mesecons_walllever/init.lua
index 5ebb6f8..9ae0655 100644
--- a/mesecons_walllever/init.lua
+++ b/mesecons_walllever/init.lua
@@ -15,7 +15,7 @@ mesecon.register_node("mesecons_walllever:wall_lever", {
 		fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 },
 	},
 	sounds = default.node_sound_wood_defaults(),
-	on_punch = function (pos, node)
+	on_rightclick = function (pos, node)
 		if(mesecon.flipstate(pos, node) == "on") then
 			mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))
 		else