diff --git a/echidna.lua b/echidna.lua
index ee0b2bd..ba5d18a 100644
--- a/echidna.lua
+++ b/echidna.lua
@@ -37,7 +37,7 @@ mobs:register_mob("nssm:echidna", {
 	light_damage = 0,
 	on_rightclick = nil,
 	attack_type = "dogshoot",
-	dogshoot_stop = true,
+	dogshoot_switch = true,
 	arrow = "nssm:super_gas";
 	reach = 5,
 	shoot_interval=3,
diff --git a/init.lua b/init.lua
index fba1c73..f11d765 100644
--- a/init.lua
+++ b/init.lua
@@ -8,7 +8,7 @@ dofile(path.."/ant_soldier.lua")
 dofile(path.."/ant_worker.lua")
 dofile(path.."/black_widow.lua")
 dofile(path.."/bloco.lua")
---dofile(path.."/pupumolle.lua")
+dofile(path.."/pupumolle.lua")
 dofile(path.."/crab.lua")
 dofile(path.."/crocodile.lua")
 dofile(path.."/daddy_long_legs.lua")
@@ -29,6 +29,12 @@ dofile(path.."/mantis_beast.lua")
 dofile(path.."/mantis.lua")
 dofile(path.."/masticone.lua")
 dofile(path.."/moonheron.lua")
+dofile(path.."/mordain.lua")
+dofile(path.."/morgre.lua")
+dofile(path.."/morde.lua")
+dofile(path.."/morgut.lua")
+dofile(path.."/morvy.lua")
+dofile(path.."/morwa.lua")
 dofile(path.."/night_master.lua")
 dofile(path.."/octopus.lua")
 dofile(path.."/phoenix.lua")
@@ -50,15 +56,6 @@ dofile(path.."/white_werewolf.lua")
 --Final Boss
 dofile(path.."/mese_dragon.lua")
 
---Morlavala Mobs
-dofile(path.."/mordain.lua")
-dofile(path.."/morgre.lua")
-dofile(path.."/morde.lua")
-dofile(path.."/morgut.lua")
-dofile(path.."/morvy.lua")
-dofile(path.."/morwa.lua")
---dofile(path.."/morlu.lua")
-
 --Others
 dofile(path.."/rainbow_staff.lua")
 dofile(path.."/darts.lua")
diff --git a/manticore.lua b/manticore.lua
index bdd971a..c3fbfee 100644
--- a/manticore.lua
+++ b/manticore.lua
@@ -35,7 +35,7 @@ mobs:register_mob("nssm:manticore", {
 	light_damage = 0,
 	on_rightclick = nil,
 	attack_type = "dogshoot",
-	dogshoot_stop = true,
+	dogshoot_switch = true,
     arrow = "nssm:spine",
     shoot_interval = 2,
     shoot_offset = 1,
diff --git a/morwa.lua b/morwa.lua
index 0105a6c..aaea7e0 100644
--- a/morwa.lua
+++ b/morwa.lua
@@ -32,7 +32,7 @@ mobs:register_mob("nssm:morwa", {
 	light_damage = 0,
 	on_rightclick = nil,
 	attack_type = "dogshoot",
-	dogshoot_stop = true,
+	dogshoot_switch = true,
     arrow = "nssm:morarrow",
     shoot_interval = 2,
     shoot_offset = 0,