diff --git a/eggwatch.lua b/nestboxes.lua
similarity index 98%
rename from eggwatch.lua
rename to nestboxes.lua
index 2abb4dbf6..fcead75c5 100644
--- a/eggwatch.lua
+++ b/nestboxes.lua
@@ -4,7 +4,7 @@ local argparse = require("argparse")
 local eventful = require("plugins.eventful")
 local utils = require("utils")
 
-local GLOBAL_KEY = "eggwatch"
+local GLOBAL_KEY = "nestboxes"
 local default_table = {10, false, false}
 local string_or_int_to_boolean = {["true"] = true, ["false"] = false, ["1"] = true, ["0"] = false, ["Y"] = true, ["N"] = false, [1] = true, [0] = false}
 
@@ -168,10 +168,6 @@ dfhack.onStateChange[GLOBAL_KEY] = function(sc)
     update_event_listener()
 end
 
-if dfhack_flags.module then
-    return
-end
-
 local function is_egg(item)
     return df.item_type.EGG == item:getType()
 end
@@ -501,6 +497,9 @@ end
 
 load_state()
 local args, opts = {...}, {}
+if dfhack_flags and dfhack_flags.enable then
+    args = {dfhack_flags.enable_state and "enable" or "disable"}
+end
 local positionals =
     argparse.processArgsGetopt(
     args,
@@ -515,18 +514,18 @@ local positionals =
     }
 )
 
-if dfhack_flags.enable then
-    if dfhack_flags.enable_state then
-        do_enable()
-    else
-        do_disable()
-    end
+if dfhack_flags.module then
+    return
 end
 
 local command = positionals[1]
 
 if command == "help" or opts.help then
     print(dfhack.script_help())
+elseif command == "enable" then
+    do_enable()
+elseif command == "disable" then
+    do_disable()
 elseif command == "target" then
     set_target(positionals[2], positionals[3], positionals[4], positionals[5])
     print_status()