diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1e6e84e..518cd91 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,7 +37,7 @@ When actually implementing stuff, here are a few guidelines that I recommend to
 -- ██  ██ ██ ██   ██ ██  ██  ██ ██
 -- ██   ████ ██   ██ ██      ██ ███████
 local wea = worldeditadditions
-worldedit.register_command("{name}", {
+worldeditadditions_core.register_command("{name}", {
 	params = "<argument> <argument=default> <option1|option2|...> [<optional_argument> <optional_argument2> ...] | [<optional_argument> [<optional_argument2>]]",
 	description = "A **brief** description of what this command does",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/bonemeal.lua b/worldeditadditions_commands/commands/bonemeal.lua
index e4b8f67..daa170b 100644
--- a/worldeditadditions_commands/commands/bonemeal.lua
+++ b/worldeditadditions_commands/commands/bonemeal.lua
@@ -6,7 +6,7 @@ local wea = worldeditadditions
 -- ██████  ██    ██ ██ ██  ██ █████   ██ ████ ██ █████   ███████ ██
 -- ██   ██ ██    ██ ██  ██ ██ ██      ██  ██  ██ ██      ██   ██ ██
 -- ██████   ██████  ██   ████ ███████ ██      ██ ███████ ██   ██ ███████
-worldedit.register_command("bonemeal", {
+worldeditadditions_core.register_command("bonemeal", {
 	params = "[<strength> [<chance> [<node_name> [<node_name> ...]]]]",
 	description = "Bonemeals everything that's bonemeal-able that has an air node directly above it. Optionally takes a strength value to use (default: 1, maximum: 4), and a chance to actually bonemeal an eligible node (positive integer; nodes have a 1-in-<chance> chance to be bonemealed; higher values mean a lower chance; default: 1 - 100% chance).",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/convolve.lua b/worldeditadditions_commands/commands/convolve.lua
index 878e7d8..21de435 100644
--- a/worldeditadditions_commands/commands/convolve.lua
+++ b/worldeditadditions_commands/commands/convolve.lua
@@ -6,7 +6,7 @@ local Vector3 = wea.Vector3
 -- ██      ██    ██ ██ ██  ██ ██    ██ ██    ██ ██     ██    ██ █████
 -- ██      ██    ██ ██  ██ ██  ██  ██  ██    ██ ██      ██  ██  ██
 --  ██████  ██████  ██   ████   ████    ██████  ███████  ████   ███████
-worldedit.register_command("convolve", {
+worldeditadditions_core.register_command("convolve", {
 	params = "<kernel> [<width>[,<height>]] [<sigma>]",
 	description = "Advanced version of //smooth from we_env. Convolves over the defined region with the given kernel. Possible kernels: box, pascal, gaussian. The width & height (if specified) must be odd integers. If the height is not specified, it defaults to the width. gaussian should give the smoothest result, but the width & height must be identical. The sigma value is only applicable to gaussian kernels, and can be thought of as the 'smoothness' to apply.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/copy.lua b/worldeditadditions_commands/commands/copy.lua
index bbcc554..801256f 100644
--- a/worldeditadditions_commands/commands/copy.lua
+++ b/worldeditadditions_commands/commands/copy.lua
@@ -24,7 +24,7 @@ end
 -- ██      ██    ██ ██████    ████
 -- ██      ██    ██ ██         ██
 --  ██████  ██████  ██         ██
-worldedit.register_command("copy+", { -- TODO: Make this an override
+worldeditadditions_core.register_command("copy+", { -- TODO: Make this an override
 	params = "<axis:x|y|z|-x|-y|-z|?|front|back|left|right|up|down> <count> [<axis> <count> [...]]",
 	description = "Copies the defined region to another location - potentially across multiple axes at once.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/count.lua b/worldeditadditions_commands/commands/count.lua
index 3a65d29..a418dbd 100644
--- a/worldeditadditions_commands/commands/count.lua
+++ b/worldeditadditions_commands/commands/count.lua
@@ -3,7 +3,7 @@
 -- ██      ██    ██ ██    ██ ██ ██  ██    ██
 -- ██      ██    ██ ██    ██ ██  ██ ██    ██
 --  ██████  ██████   ██████  ██   ████    ██
-worldedit.register_command("count", {
+worldeditadditions_core.register_command("count", {
 	params = "",
 	description = "Counts all the nodes in the defined region.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/dome.lua b/worldeditadditions_commands/commands/dome.lua
index 499a6e3..054d2dd 100644
--- a/worldeditadditions_commands/commands/dome.lua
+++ b/worldeditadditions_commands/commands/dome.lua
@@ -25,7 +25,7 @@ end
 -- ██   ██ ██    ██ ██ ████ ██ █████
 -- ██   ██ ██    ██ ██  ██  ██ ██
 -- ██████   ██████  ██      ██ ███████
-worldedit.register_command("dome+", { -- TODO: Make this an override
+worldeditadditions_core.register_command("dome+", { -- TODO: Make this an override
 	params = "<radius> <replace_node> [<pointing_dir:x|y|z|-x|-y|-z|?|front|back|left|right|up|down> ...] [h[ollow]]",
 	description = "Creates a dome shape with a specified radius of the defined node, optionally specifying the direction it should be pointing in (defaults to the positive y direction).",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/ellipsoid.lua b/worldeditadditions_commands/commands/ellipsoid.lua
index efa4ebf..2a71e6a 100644
--- a/worldeditadditions_commands/commands/ellipsoid.lua
+++ b/worldeditadditions_commands/commands/ellipsoid.lua
@@ -30,7 +30,7 @@ local function parse_params_ellipsoid(params_text)
 	return true, replace_node, radius, hollow
 end
 
-worldedit.register_command("ellipsoid", {
+worldeditadditions_core.register_command("ellipsoid", {
 	params = "<rx> <ry> <rz> <replace_node> [h[ollow]]",
 	description = "Creates a 3D ellipsoid with a radius of (rx, ry, rz) at pos1, filled with <replace_node>.",
 	privs = { worldedit = true },
@@ -53,7 +53,7 @@ worldedit.register_command("ellipsoid", {
 })
 
 -- TODO: This duplicates a lot of code. Perhaps we can trim it down a bit?
-worldedit.register_command("hollowellipsoid", {
+worldeditadditions_core.register_command("hollowellipsoid", {
 	params = "<rx> <ry> <rz> <replace_node>",
 	description = "Creates a 3D hollow ellipsoid with a radius of (rx, ry, rz) at pos1, made out of <replace_node>.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/ellipsoid2.lua b/worldeditadditions_commands/commands/ellipsoid2.lua
index 541532a..257ed5b 100644
--- a/worldeditadditions_commands/commands/ellipsoid2.lua
+++ b/worldeditadditions_commands/commands/ellipsoid2.lua
@@ -5,7 +5,7 @@
 -- ███████ ███████ ███████ ██ ██      ███████  ██████  ██ ██████
 local wea = worldeditadditions
 
-worldedit.register_command("ellipsoid2", {
+worldeditadditions_core.register_command("ellipsoid2", {
 	params = "[<replace_node:dirt> [h[ollow]]]",
 	description = "Creates am optionally hollow 3D ellipsoid that fills the defined region, filled with <replace_node>.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/erode.lua b/worldeditadditions_commands/commands/erode.lua
index d41df3e..5dc755b 100644
--- a/worldeditadditions_commands/commands/erode.lua
+++ b/worldeditadditions_commands/commands/erode.lua
@@ -3,7 +3,7 @@
 -- █████   ██████  ██    ██ ██   ██ █████
 -- ██      ██   ██ ██    ██ ██   ██ ██
 -- ███████ ██   ██  ██████  ██████  ███████
-worldedit.register_command("erode", {
+worldeditadditions_core.register_command("erode", {
 	params = "[<snowballs|river> [<key_1> [<value_1>]] [<key_2> [<value_2>]] ...]",
 	description = "**experimental** Runs the specified erosion algorithm over the given defined region. This may occur in 2d or 3d. Currently implemented algorithms: snowballs (default;2d hydraulic-like). Also optionally takes an arbitrary set of key - value pairs representing parameters to pass to the algorithm. See the full documentation for details.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/extra/basename.lua b/worldeditadditions_commands/commands/extra/basename.lua
index 6d247bb..eac8497 100644
--- a/worldeditadditions_commands/commands/extra/basename.lua
+++ b/worldeditadditions_commands/commands/extra/basename.lua
@@ -3,7 +3,7 @@
 -- ██████  ███████ ███████ █████   ██ ██  ██ ███████ ██ ████ ██ █████
 -- ██   ██ ██   ██      ██ ██      ██  ██ ██ ██   ██ ██  ██  ██ ██
 -- ██████  ██   ██ ███████ ███████ ██   ████ ██   ██ ██      ██ ███████
-worldedit.register_command("basename", {
+worldeditadditions_core.register_command("basename", {
 	params = "<nodealias>",
 	description = "Returns the base name of nodes that use a given alias.",
 	privs = {worldedit = true},
diff --git a/worldeditadditions_commands/commands/fillcaves.lua b/worldeditadditions_commands/commands/fillcaves.lua
index 1b1cbe6..743221f 100644
--- a/worldeditadditions_commands/commands/fillcaves.lua
+++ b/worldeditadditions_commands/commands/fillcaves.lua
@@ -3,7 +3,7 @@
 -- █████   ██ ██      ██      ██      ███████ ██    ██ █████   ███████
 -- ██      ██ ██      ██      ██      ██   ██  ██  ██  ██           ██
 -- ██      ██ ███████ ███████  ██████ ██   ██   ████   ███████ ███████
-worldedit.register_command("fillcaves", {
+worldeditadditions_core.register_command("fillcaves", {
 	params = "[<node_name>]",
 	description = "Fills in all airlike nodes beneath the first non-airlike node detected in each column.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/floodfill.lua b/worldeditadditions_commands/commands/floodfill.lua
index e829ead..08ea547 100644
--- a/worldeditadditions_commands/commands/floodfill.lua
+++ b/worldeditadditions_commands/commands/floodfill.lua
@@ -3,7 +3,7 @@
 -- █████   ██      ██    ██ ██    ██ ██   ██ █████   ██ ██      ██
 -- ██      ██      ██    ██ ██    ██ ██   ██ ██      ██ ██      ██
 -- ██      ███████  ██████   ██████  ██████  ██      ██ ███████ ███████
-worldedit.register_command("floodfill", {
+worldeditadditions_core.register_command("floodfill", {
 	params = "[<replace_node> [<radius>]]",
 	description = "Floods all connected nodes of the same type starting at pos1 with <replace_node> (which defaults to `water_source`), in a sphere with a radius of <radius> (which defaults to 20).",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/forest.lua b/worldeditadditions_commands/commands/forest.lua
index 5240ae8..8b944c9 100644
--- a/worldeditadditions_commands/commands/forest.lua
+++ b/worldeditadditions_commands/commands/forest.lua
@@ -6,7 +6,7 @@ local wea = worldeditadditions
 -- ██      ██    ██ ██   ██ ██           ██    ██
 -- ██       ██████  ██   ██ ███████ ███████    ██
 
-worldedit.register_command("forest", {
+worldeditadditions_core.register_command("forest", {
 	params = "[<density>] <sapling_a> [<chance_a>] <sapling_b> [<chance_b>] [<sapling_N> [<chance_N>]] ...",
 	description = "Plants and grows trees in the defined region according to the given list of sapling names and chances and density factor. The density controls the relative density of the resulting forest, and defaults to 1 (floating-point numbers allowed). Higher chance numbers result in a lower relative chance with respect to other saplings in the list. Saplings that fail to grow are subsequently removed (this will affect pre-existing saplings too).",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/hollow.lua b/worldeditadditions_commands/commands/hollow.lua
index 40adc05..ea6ef69 100644
--- a/worldeditadditions_commands/commands/hollow.lua
+++ b/worldeditadditions_commands/commands/hollow.lua
@@ -3,7 +3,7 @@
 -- ███████ ██    ██ ██      ██      ██    ██ ██  █  ██
 -- ██   ██ ██    ██ ██      ██      ██    ██ ██ ███ ██
 -- ██   ██  ██████  ███████ ███████  ██████   ███ ███
-worldedit.register_command("hollow", {
+worldeditadditions_core.register_command("hollow", {
 	params = "[<wall_thickness>]",
 	description = "Replaces nodes inside the defined region with air, but leaving a given number of nodes near the outermost edges alone. In other words, it makes the defined region hollow leaving walls of a given thickness (default: 1)",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/layers.lua b/worldeditadditions_commands/commands/layers.lua
index 4c84075..dfcfa54 100644
--- a/worldeditadditions_commands/commands/layers.lua
+++ b/worldeditadditions_commands/commands/layers.lua
@@ -26,7 +26,7 @@ end
 -- ██    ██ ██    ██ █████   ██████  ██      ███████   ████
 -- ██    ██  ██  ██  ██      ██   ██ ██      ██   ██    ██
 --  ██████    ████   ███████ ██   ██ ███████ ██   ██    ██
-worldedit.register_command("layers", {
+worldeditadditions_core.register_command("layers", {
 	params = "[<max_slope|min_slope..max_slope>] [<node_name_1> [<layer_count_1>]] [<node_name_2> [<layer_count_2>]] ...",
 	description = "Replaces the topmost non-airlike nodes with layers of the given nodes from top to bottom. Like WorldEdit for MC's //naturalize command. Optionally takes a maximum or minimum and maximum slope value. If a column's slope value falls outside the defined range, then it's skipped. Default: dirt_with_grass dirt 3",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/line.lua b/worldeditadditions_commands/commands/line.lua
index 3bb6d00..0c75cf0 100644
--- a/worldeditadditions_commands/commands/line.lua
+++ b/worldeditadditions_commands/commands/line.lua
@@ -3,7 +3,7 @@
 -- ██      ██ ██ ██  ██ █████
 -- ██      ██ ██  ██ ██ ██
 -- ███████ ██ ██   ████ ███████
-worldedit.register_command("line", {
+worldeditadditions_core.register_command("line", {
 	params = "[<replace_node> [<radius>]]",
 	description = "Draws a line of a given radius (default: 1) from pos1 to pos2 in the given node (default: dirt).",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/measure/mface.lua b/worldeditadditions_commands/commands/measure/mface.lua
index 53249e6..983a402 100644
--- a/worldeditadditions_commands/commands/measure/mface.lua
+++ b/worldeditadditions_commands/commands/measure/mface.lua
@@ -4,7 +4,7 @@
 -- ██  ██  ██ ██      ██   ██ ██      ██
 -- ██      ██ ██      ██   ██  ██████ ███████
 local wea = worldeditadditions
-worldedit.register_command("mface", {
+worldeditadditions_core.register_command("mface", {
 	params = "",
 	description = "Return player facing axis.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/measure/midpos.lua b/worldeditadditions_commands/commands/measure/midpos.lua
index a2fee5f..705f550 100644
--- a/worldeditadditions_commands/commands/measure/midpos.lua
+++ b/worldeditadditions_commands/commands/measure/midpos.lua
@@ -4,7 +4,7 @@
 -- ██  ██  ██ ██ ██   ██ ██      ██    ██      ██
 -- ██      ██ ██ ██████  ██       ██████  ███████
 local wea = worldeditadditions
-worldedit.register_command("midpos", {
+worldeditadditions_core.register_command("midpos", {
 	params = "",
 	description = "Return the mid point of current selection.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/measure/msize.lua b/worldeditadditions_commands/commands/measure/msize.lua
index 648f02f..df651f5 100644
--- a/worldeditadditions_commands/commands/measure/msize.lua
+++ b/worldeditadditions_commands/commands/measure/msize.lua
@@ -4,7 +4,7 @@
 -- ██  ██  ██      ██ ██  ███    ██
 -- ██      ██ ███████ ██ ███████ ███████
 local wea = worldeditadditions
-worldedit.register_command("msize", {
+worldeditadditions_core.register_command("msize", {
 	params = "",
 	description = "Return the length of each axis of current selection.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/measure/mtrig.lua b/worldeditadditions_commands/commands/measure/mtrig.lua
index 90a28c4..a13a669 100644
--- a/worldeditadditions_commands/commands/measure/mtrig.lua
+++ b/worldeditadditions_commands/commands/measure/mtrig.lua
@@ -5,7 +5,7 @@
 -- ██      ██    ██    ██   ██ ██  ██████
 local wea = worldeditadditions
 local v3 = worldeditadditions.Vector3
-worldedit.register_command("mtrig", {
+worldeditadditions_core.register_command("mtrig", {
 	params = "",
 	description = "Return the length of and angles of an imginary line between pos1 and pos2 in the selection.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/meta/airapply.lua b/worldeditadditions_commands/commands/meta/airapply.lua
index 7989f44..41585bf 100644
--- a/worldeditadditions_commands/commands/meta/airapply.lua
+++ b/worldeditadditions_commands/commands/meta/airapply.lua
@@ -5,7 +5,7 @@
 -- ██   ██ ██ ██   ██ ██   ██ ██      ██      ███████ ██
 local wea_c  = worldeditadditions_core
 
-worldedit.register_command("airapply", {
+worldeditadditions_core.register_command("airapply", {
 	params = "<command_name> <args>",
 	description = "Executes the given command (automatically prepending '//'), but only on non-air nodes within the defined region.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/meta/ellipsoidapply.lua b/worldeditadditions_commands/commands/meta/ellipsoidapply.lua
index 0489407..4923d5f 100644
--- a/worldeditadditions_commands/commands/meta/ellipsoidapply.lua
+++ b/worldeditadditions_commands/commands/meta/ellipsoidapply.lua
@@ -5,7 +5,7 @@
 -- ███████ ███████ ███████ ██ ██      ███████ ███████ ██   ██ ██      ██      ███████ ██
 local wea_c = worldeditadditions_core
 
-worldedit.register_command("ellipsoidapply", {
+worldeditadditions_core.register_command("ellipsoidapply", {
 	params = "<command_name> <args>",
 	description = "Executes the given command (automatically prepending '//'), clipping the result with an ellipse given by the defined region.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/meta/for.lua b/worldeditadditions_commands/commands/meta/for.lua
index 7db3029..5dff676 100644
--- a/worldeditadditions_commands/commands/meta/for.lua
+++ b/worldeditadditions_commands/commands/meta/for.lua
@@ -45,7 +45,7 @@ local function step(params)
 	end
 end
 
-worldedit.register_command("for", {
+worldeditadditions_core.register_command("for", {
 	params = "<value1> <value2> <value3>... do //<command> <arg> %% <arg>",
 	description = "Executes a chat command for each value before \" do \" replacing any instances of \"%%\" with those values. The forward slashes at the beginning of the chat command must be the same as if you were executing it normally.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/meta/macro.lua b/worldeditadditions_commands/commands/meta/macro.lua
index 9bd8141..92e9eaa 100644
--- a/worldeditadditions_commands/commands/meta/macro.lua
+++ b/worldeditadditions_commands/commands/meta/macro.lua
@@ -45,7 +45,7 @@ local function step(params)
 	end
 end
 
-worldedit.register_command("macro", {
+worldeditadditions_core.register_command("macro", {
 	params = "<file> [<delay=0>]",
 	description = "Load commands from \"(world folder)/macros/<file>[.weamac | .wmac]\" with position 1 of the current WorldEdit region as the origin.",
 	privs = {worldedit=true},
diff --git a/worldeditadditions_commands/commands/meta/noiseapply2d.lua b/worldeditadditions_commands/commands/meta/noiseapply2d.lua
index c7edb48..bd31ada 100644
--- a/worldeditadditions_commands/commands/meta/noiseapply2d.lua
+++ b/worldeditadditions_commands/commands/meta/noiseapply2d.lua
@@ -6,7 +6,7 @@
 local wea_c = worldeditadditions_core
 
 
-worldedit.register_command("noiseapply2d", {
+worldeditadditions_core.register_command("noiseapply2d", {
 	params = "<threshold> <scale> <command_name> <args>",
 	description = "Executes the given command (automatically prepending '//'), but uses a 2d noise function with both a threshold value (a number between 0 and 1) and a scale value (number, 1 = normal scale, for small areas 10+ is recommended) to filter where in the defined region it's applied.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/meta/subdivide.lua b/worldeditadditions_commands/commands/meta/subdivide.lua
index c291146..724a8da 100644
--- a/worldeditadditions_commands/commands/meta/subdivide.lua
+++ b/worldeditadditions_commands/commands/meta/subdivide.lua
@@ -30,7 +30,7 @@ local function emerge_stats_tostring(tbl_emerge)
 	return table.concat(result, ", ")
 end
 
-worldedit.register_command("subdivide", {
+worldeditadditions_core.register_command("subdivide", {
 	params = "<size_x> <size_y> <size_z> <command> <params>",
 	description = "Subdivides the given worldedit area into chunks and runs a worldedit command multiple times to cover the defined region. Note that the given command must NOT be prepended with any forward slashes - just like //cubeapply.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/metaball.lua b/worldeditadditions_commands/commands/metaball.lua
index 6e00d04..312617e 100644
--- a/worldeditadditions_commands/commands/metaball.lua
+++ b/worldeditadditions_commands/commands/metaball.lua
@@ -6,7 +6,7 @@ local Vector3 = wea.Vector3
 -- ██   ██ ██    ██ ██ ████ ██ █████
 -- ██   ██ ██    ██ ██  ██  ██ ██
 -- ██████   ██████  ██      ██ ███████
-worldedit.register_command("metaball", {
+worldeditadditions_core.register_command("metaball", {
 	params = "add <radius> | remove <index> | render <replace_node> [<threshold=1>] | list | clear | volume",
 	description = "Defines and creates metaballs. After using the add subcommand to define 1 or more metaballs (uses pos1), the render subcommand can then be used to create the metaballs as nodes.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/move.lua b/worldeditadditions_commands/commands/move.lua
index 8856d2f..6e7f5cc 100644
--- a/worldeditadditions_commands/commands/move.lua
+++ b/worldeditadditions_commands/commands/move.lua
@@ -24,7 +24,7 @@ end
 -- ██ ████ ██ ██    ██ ██    ██ █████
 -- ██  ██  ██ ██    ██  ██  ██  ██
 -- ██      ██  ██████    ████   ███████
-worldedit.register_command("move+", { -- TODO: Make this an override
+worldeditadditions_core.register_command("move+", { -- TODO: Make this an override
 	params = "<axis:x|y|z|-x|-y|-z|?|front|back|left|right|up|down> <count> [<axis> <count> [...]]",
 	description = "Moves the defined region to another location - potentially across multiple axes at once.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/noise2d.lua b/worldeditadditions_commands/commands/noise2d.lua
index ce2f287..19f18a4 100644
--- a/worldeditadditions_commands/commands/noise2d.lua
+++ b/worldeditadditions_commands/commands/noise2d.lua
@@ -1,7 +1,7 @@
 
 local wea = worldeditadditions
 
-worldedit.register_command("noise2d", {
+worldeditadditions_core.register_command("noise2d", {
 	params = "[<key_1> [<value_1>]] [<key_2> [<value_2>]] ...]",
 	description = "Applies 2d random noise to the terrain as a 2d heightmap in the defined region. Optionally takes an arbitrary set of key - value pairs representing parameters that control the properties of the noise and how it's applied. See the full documentation for details of these parameters and what they do.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/overlay.lua b/worldeditadditions_commands/commands/overlay.lua
index e7f3d0f..1763f42 100644
--- a/worldeditadditions_commands/commands/overlay.lua
+++ b/worldeditadditions_commands/commands/overlay.lua
@@ -3,7 +3,7 @@
 -- ██    ██ ██    ██ █████   ██████  ██      ███████   ████
 -- ██    ██  ██  ██  ██      ██   ██ ██      ██   ██    ██
 --  ██████    ████   ███████ ██   ██ ███████ ██   ██    ██
-worldedit.register_command("overlay", {
+worldeditadditions_core.register_command("overlay", {
 	params = "<replace_node_a> [<chance_a>] <replace_node_b> [<chance_b>] [<replace_node_N> [<chance_N>]] ...",
 	description = "Places <replace_node_a> in the last contiguous air space encountered above the first non-air node. In other words, overlays all top-most nodes in the specified area with <replace_node_a>. Optionally supports a mix of nodes and chances, as in //mix and //replacemix.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/replacemix.lua b/worldeditadditions_commands/commands/replacemix.lua
index dd5ff77..07a5d81 100644
--- a/worldeditadditions_commands/commands/replacemix.lua
+++ b/worldeditadditions_commands/commands/replacemix.lua
@@ -5,7 +5,7 @@ local wea = worldeditadditions
 -- ██████  █████   ██████  ██      ███████ ██      █████   ██ ████ ██ ██   ███
 -- ██   ██ ██      ██      ██      ██   ██ ██      ██      ██  ██  ██ ██  ██ ██
 -- ██   ██ ███████ ██      ███████ ██   ██  ██████ ███████ ██      ██ ██ ██   ██
-worldedit.register_command("replacemix", {
+worldeditadditions_core.register_command("replacemix", {
 	params = "<target_node> [<chance>] <replace_node_a> [<chance_a>] [<replace_node_b> [<chance_b>]] [<replace_node_N> [<chance_N>]] ...",
 	description = "Replaces target_node with a mix of other nodes. Functions simmilarly to //mix. <chance> is optional and the chance to replace the target node at all. replace_node_a is the node to replace target_node with. If multiple nodes are specified in a space separated list, then when replacing an instance of target_node one is randomly chosen from the list. Just like with //mix, if a positive integer is present after a replace_node, that adds a weighting to that particular node making it more common.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/scale.lua b/worldeditadditions_commands/commands/scale.lua
index 3076386..bbc9000 100644
--- a/worldeditadditions_commands/commands/scale.lua
+++ b/worldeditadditions_commands/commands/scale.lua
@@ -22,7 +22,7 @@ end
 -- ███████ ██      ███████ ██      █████
 --      ██ ██      ██   ██ ██      ██
 -- ███████  ██████ ██   ██ ███████ ███████
-worldedit.register_command("scale", {
+worldeditadditions_core.register_command("scale", {
 	params = "<axis> <scale_factor> | <factor_x> [<factor_y> <factor_z> [<anchor_x> <anchor_y> <anchor_z>]]",
 	description = "Combined scale up / down. Takes either an axis name + a scale factor (e.g. y 3 or -z 2; negative values swap the anchor point for the scale operation), or 3 scale factor values for x, y, and z respectively. In the latter mode, a set of anchors can also be specified, which indicate which size the scale operation should be anchored to.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/sculpt.lua b/worldeditadditions_commands/commands/sculpt.lua
index 41a28da..00e4289 100644
--- a/worldeditadditions_commands/commands/sculpt.lua
+++ b/worldeditadditions_commands/commands/sculpt.lua
@@ -7,7 +7,7 @@ local Vector3 = wea.Vector3
 -- ███████ ██      ██    ██ ██      ██████     ██
 --      ██ ██      ██    ██ ██      ██         ██
 -- ███████  ██████  ██████  ███████ ██         ██
-worldedit.register_command("sculpt", {
+worldeditadditions_core.register_command("sculpt", {
 	params = "[<brush_name=default> [<height=5> [<brush_size=10>]]]",
 	description = "Applies a sculpting brush to the terrain with a given height. See //sculptlist to list all available brushes. Note that while the brush size is configurable, the actual brush size you end up with may be slightly different to that which you request due to brush size restrictions.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/scentre.lua b/worldeditadditions_commands/commands/selectors/scentre.lua
index 20311d9..3588c2e 100644
--- a/worldeditadditions_commands/commands/selectors/scentre.lua
+++ b/worldeditadditions_commands/commands/selectors/scentre.lua
@@ -4,7 +4,7 @@
 --      ██ ██      ██      ██  ██ ██    ██    ██      ██   ██
 -- ███████  ██████ ███████ ██   ████    ██    ███████ ██   ██
 local wea = worldeditadditions
-worldedit.register_command("scentre", {
+worldeditadditions_core.register_command("scentre", {
 	params = "",
 	description = "Set WorldEdit region positions 1 and 2 to the centre of the current selection.",
 	privs = {worldedit=true},
diff --git a/worldeditadditions_commands/commands/selectors/scloud.lua b/worldeditadditions_commands/commands/selectors/scloud.lua
index 06ed4f9..6bbe23f 100644
--- a/worldeditadditions_commands/commands/selectors/scloud.lua
+++ b/worldeditadditions_commands/commands/selectors/scloud.lua
@@ -14,7 +14,7 @@ minetest.register_on_punchnode(function(pos, node, puncher)
 		else wea.add_pos[name] = nil end
 	end
 end)
-worldedit.register_command("scloud", {
+worldeditadditions_core.register_command("scloud", {
 	params = "<0-6|stop|reset>",
 	description = "Set and add to WorldEdit region by punching up to six nodes that define the maximums of your target",
 	privs = {worldedit=true},
diff --git a/worldeditadditions_commands/commands/selectors/scol.lua b/worldeditadditions_commands/commands/selectors/scol.lua
index 37af6f4..051472c 100644
--- a/worldeditadditions_commands/commands/selectors/scol.lua
+++ b/worldeditadditions_commands/commands/selectors/scol.lua
@@ -4,7 +4,7 @@
 --      ██ ██      ██    ██ ██
 -- ███████  ██████  ██████  ███████
 local wea = worldeditadditions
-worldedit.register_command("scol", {
+worldeditadditions_core.register_command("scol", {
 	params = "[<axis1>] <length>",
 	description = "Set WorldEdit region position 2 at a set distance along 1 axis.",
 	privs = {worldedit=true},
diff --git a/worldeditadditions_commands/commands/selectors/scube.lua b/worldeditadditions_commands/commands/selectors/scube.lua
index e7e38c9..8f4ac8b 100644
--- a/worldeditadditions_commands/commands/selectors/scube.lua
+++ b/worldeditadditions_commands/commands/selectors/scube.lua
@@ -4,7 +4,7 @@
 --      ██ ██      ██    ██ ██   ██ ██
 -- ███████  ██████  ██████  ██████  ███████
 local wea = worldeditadditions
-worldedit.register_command("scube", {
+worldeditadditions_core.register_command("scube", {
 	params = "[<axis1> [<axis2> [<axis3>]]] <length>",
 	description = "Set WorldEdit region position 2 at a set distance along 3 axes.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/sfactor.lua b/worldeditadditions_commands/commands/selectors/sfactor.lua
index ac50269..a70f017 100644
--- a/worldeditadditions_commands/commands/selectors/sfactor.lua
+++ b/worldeditadditions_commands/commands/selectors/sfactor.lua
@@ -4,7 +4,7 @@
 --      ██ ██      ██   ██ ██         ██    ██    ██ ██   ██
 -- ███████ ██      ██   ██  ██████    ██     ██████  ██   ██
 local wea = worldeditadditions
-worldedit.register_command("sfactor", {
+worldeditadditions_core.register_command("sfactor", {
 	params = "<mode> <factor> [<target=xz>]",
 	description = "Make the length of one or more target axes of the current selection to be multiple(s) of <factor>.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/smake.lua b/worldeditadditions_commands/commands/selectors/smake.lua
index cd6f4a0..dfc99f1 100644
--- a/worldeditadditions_commands/commands/selectors/smake.lua
+++ b/worldeditadditions_commands/commands/selectors/smake.lua
@@ -4,7 +4,7 @@
 --      ██ ██  ██  ██ ██   ██ ██  ██  ██
 -- ███████ ██      ██ ██   ██ ██   ██ ███████
 local wea = worldeditadditions
-worldedit.register_command("smake", {
+worldeditadditions_core.register_command("smake", {
 	params = "<operation:odd|even|equal> <mode:grow|shrink|average> [<target=xyz> [<base>]]",
 	description = "Make one or more axes of the current selection odd, even, or equal to another.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/spop.lua b/worldeditadditions_commands/commands/selectors/spop.lua
index a7f1ba8..a982367 100644
--- a/worldeditadditions_commands/commands/selectors/spop.lua
+++ b/worldeditadditions_commands/commands/selectors/spop.lua
@@ -3,7 +3,7 @@
 -- ███████ ██████  ██    ██ ██████
 --      ██ ██      ██    ██ ██
 -- ███████ ██       ██████  ██
-worldedit.register_command("spop", {
+worldeditadditions_core.register_command("spop", {
 	params = "",
 	description = "Pops a region off your (per-user) selection stack.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/spush.lua b/worldeditadditions_commands/commands/selectors/spush.lua
index 8c85fe0..52cd62f 100644
--- a/worldeditadditions_commands/commands/selectors/spush.lua
+++ b/worldeditadditions_commands/commands/selectors/spush.lua
@@ -3,7 +3,7 @@
 -- ███████ ██████  ██    ██ ███████ ███████
 --      ██ ██      ██    ██      ██ ██   ██
 -- ███████ ██       ██████  ███████ ██   ██
-worldedit.register_command("spush", {
+worldeditadditions_core.register_command("spush", {
 	params = "",
 	description = "Pushes the currently defined region onto your (per-user) selection stack.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/srect.lua b/worldeditadditions_commands/commands/selectors/srect.lua
index 7669100..85534cc 100644
--- a/worldeditadditions_commands/commands/selectors/srect.lua
+++ b/worldeditadditions_commands/commands/selectors/srect.lua
@@ -4,7 +4,7 @@
 --      ██ ██   ██ ██      ██         ██
 -- ███████ ██   ██ ███████  ██████    ██
 local wea = worldeditadditions
-worldedit.register_command("srect", {
+worldeditadditions_core.register_command("srect", {
 	params = "[<axis1> [<axis2>]] <length>",
 	description = "Set WorldEdit region position 2 at a set distance along 2 axes.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/srel.lua b/worldeditadditions_commands/commands/selectors/srel.lua
index 4377d38..1a01e42 100644
--- a/worldeditadditions_commands/commands/selectors/srel.lua
+++ b/worldeditadditions_commands/commands/selectors/srel.lua
@@ -21,7 +21,7 @@ local function parse_with_name(name,args)
 	until not args:find("([%l%s+-]+%d+)%s*", i)
 	return true, vec
 end
-worldedit.register_command("srel", {
+worldeditadditions_core.register_command("srel", {
 	params = "<axis1> <length1> [<axis2> <length2> [<axis3> <length3>]]",
 	description = "Set WorldEdit region position 2 at set distances along 3 axes.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/sshift.lua b/worldeditadditions_commands/commands/selectors/sshift.lua
index 8414145..82bc138 100644
--- a/worldeditadditions_commands/commands/selectors/sshift.lua
+++ b/worldeditadditions_commands/commands/selectors/sshift.lua
@@ -22,7 +22,7 @@ local function parse_with_name(name,args)
 	until not args:find("([%l%s+-]+%d+)%s*", i)
 	return true, vec
 end
-worldedit.register_command("sshift", {
+worldeditadditions_core.register_command("sshift", {
 	params = "<axis1> <distance1> [<axis2> <distance2> [<axis3> <distance3>]]",
 	description = "Shift the WorldEdit region in 3 dimensions.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/selectors/sstack.lua b/worldeditadditions_commands/commands/selectors/sstack.lua
index e748d2d..82d486c 100644
--- a/worldeditadditions_commands/commands/selectors/sstack.lua
+++ b/worldeditadditions_commands/commands/selectors/sstack.lua
@@ -3,7 +3,7 @@
 -- ███████ ███████    ██    ███████ ██      █████
 --      ██      ██    ██    ██   ██ ██      ██  ██
 -- ███████ ███████    ██    ██   ██  ██████ ██   ██
-worldedit.register_command("sstack", {
+worldeditadditions_core.register_command("sstack", {
 	params = "",
 	description = "Displays the contents of your (per-user) selection stack.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/spiral2.lua b/worldeditadditions_commands/commands/spiral2.lua
index aa9529f..68f689e 100644
--- a/worldeditadditions_commands/commands/spiral2.lua
+++ b/worldeditadditions_commands/commands/spiral2.lua
@@ -2,7 +2,7 @@
 local wea = worldeditadditions
 local Vector3 = wea.Vector3
 
-worldedit.register_command("spiral2", {
+worldeditadditions_core.register_command("spiral2", {
 	params = "[<circle|square>] [<replace_node=dirt> [<interval=3> [<acceleration=0>] ] ]",
 	description = "Generates a spiral that fills the defined region using the specified replace node. The spiral is either square (default) or circular in shape. The interval specifies the distance between the walls of the spiral, and the acceleration specifies how quickly this value should increase.",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/torus.lua b/worldeditadditions_commands/commands/torus.lua
index 4ae2b5c..37fa2c3 100644
--- a/worldeditadditions_commands/commands/torus.lua
+++ b/worldeditadditions_commands/commands/torus.lua
@@ -52,7 +52,7 @@ local function parse_params_torus(params_text)
 	return true, replace_node, major_radius, minor_radius, axes, hollow
 end
 
-worldedit.register_command("torus", {
+worldeditadditions_core.register_command("torus", {
 	params = "<major_radius> <minor_radius> <replace_node> [<axes=xy> [h[ollow]]]",
 	description = "Creates a 3D torus with a major radius of <major_radius> and a minor radius of <minor_radius> at pos1, filled with <replace_node>, on axes <axes> (i.e. 2 axis names: xz, zy, etc).",
 	privs = { worldedit = true },
@@ -81,7 +81,7 @@ worldedit.register_command("torus", {
 })
 
 -- TODO: This duplicates a lot of code. Perhaps we can trim it down a bit?
-worldedit.register_command("hollowtorus", {
+worldeditadditions_core.register_command("hollowtorus", {
 	params = "<major_radius> <minor_radius> <replace_node> [<axes=xy>]",
 	description = "Creates a 3D hollow torus with a major radius of <major_radius> and a minor radius of <minor_radius> at pos1, made out of <replace_node>, on axes <axes> (i.e. 2 axis names: xz, zy, etc).",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/walls.lua b/worldeditadditions_commands/commands/walls.lua
index 12d6d72..aa6b694 100644
--- a/worldeditadditions_commands/commands/walls.lua
+++ b/worldeditadditions_commands/commands/walls.lua
@@ -3,7 +3,7 @@
 -- ██  █  ██ ███████ ██      ██      ███████
 -- ██ ███ ██ ██   ██ ██      ██           ██
 --  ███ ███  ██   ██ ███████ ███████ ███████
-worldedit.register_command("walls", {
+worldeditadditions_core.register_command("walls", {
 	params = "[<replace_node=dirt> [<thickness=1>]]",
 	description = "Creates vertical walls of <replace_node> around the inside edges of the defined region. Optionally specifies a thickness for the walls to be created (defaults to 1)",
 	privs = { worldedit = true },
diff --git a/worldeditadditions_commands/commands/wireframe/wbox.lua b/worldeditadditions_commands/commands/wireframe/wbox.lua
index c2bd9c4..d600bba 100644
--- a/worldeditadditions_commands/commands/wireframe/wbox.lua
+++ b/worldeditadditions_commands/commands/wireframe/wbox.lua
@@ -5,7 +5,7 @@
 --  ███ ███  ██████   ██████  ██   ██
 local wea = worldeditadditions
 local v3 = worldeditadditions.Vector3
-worldedit.register_command("wbox", {
+worldeditadditions_core.register_command("wbox", {
 	params = "<replace_node>",
 	description = "Sets the edges of the current selection to <replace_node>",
 	privs = {worldedit=true},
diff --git a/worldeditadditions_commands/commands/wireframe/wcompass.lua b/worldeditadditions_commands/commands/wireframe/wcompass.lua
index ba012c8..a54af4d 100644
--- a/worldeditadditions_commands/commands/wireframe/wcompass.lua
+++ b/worldeditadditions_commands/commands/wireframe/wcompass.lua
@@ -4,7 +4,7 @@
 -- ██ ███ ██ ██      ██    ██ ██  ██  ██ ██      ██   ██      ██      ██
 --  ███ ███   ██████  ██████  ██      ██ ██      ██   ██ ███████ ███████
 local wea = worldeditadditions
-worldedit.register_command("wcompass", {
+worldeditadditions_core.register_command("wcompass", {
 	params = "<replace_node> [<bead_node>]",
 	description = "Creates a compass around pos1 with a single node bead pointing north (+Z).",
 	privs = {worldedit=true},
diff --git a/worldeditadditions_commands/commands/wireframe/wcorner.lua b/worldeditadditions_commands/commands/wireframe/wcorner.lua
index af08d6f..67440b6 100644
--- a/worldeditadditions_commands/commands/wireframe/wcorner.lua
+++ b/worldeditadditions_commands/commands/wireframe/wcorner.lua
@@ -4,7 +4,7 @@
 -- ██ ███ ██ ██      ██    ██ ██   ██ ██  ██ ██ ██      ██   ██
 --  ███ ███   ██████  ██████  ██   ██ ██   ████ ███████ ██   ██
 local wea = worldeditadditions
-worldedit.register_command("wcorner", {
+worldeditadditions_core.register_command("wcorner", {
 	params = "<replace_node>",
 	description = "Set the corners of the current selection to <replace_node>",
 	privs = {worldedit=true},