diff --git a/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java
index b370f9abf6..ed2db65dfc 100644
--- a/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/block/BlockPhysicsScriptEvent.java
@@ -20,8 +20,8 @@ public class BlockPhysicsScriptEvent extends BukkitScriptEvent implements Listen
 
     // <--[event]
     // @Events
-    // block physics (in <notable cuboid>)
-    // <material> physics (in <notable cuboid>)
+    // block physics (in <area>)
+    // <material> physics (in <area>)
     //
     // @Warning This event may fire very rapidly.
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java b/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java
index 8870d47321..7ff585deb1 100644
--- a/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/core/CommandSmartEvent.java
@@ -155,7 +155,7 @@ private List<String> getAll(String cmd) {
     // <--[event]
     // @Events
     // command
-    // <command_name>|... command (in <notable cuboid>)
+    // <command_name>|... command (in <area>)
     //
     // @Regex on [^\s]+ command(in \w+)?
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java
index 2d17ded8a7..8eb760a906 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityBreaksHangingScriptEvent.java
@@ -25,10 +25,10 @@ public class EntityBreaksHangingScriptEvent extends BukkitScriptEvent implements
 
     // <--[event]
     // @Events
-    // entity breaks hanging (in <notable cuboid>)
-    // entity breaks hanging because <cause> (in <notable cuboid>)
-    // <entity> breaks hanging (in <notable cuboid>)
-    // <entity> breaks hanging because <cause> (in <notable cuboid>)
+    // entity breaks hanging (in <area>)
+    // entity breaks hanging because <cause> (in <area>)
+    // <entity> breaks hanging (in <area>)
+    // <entity> breaks hanging because <cause> (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java
index 2c465d3bdd..5416e09a1f 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityChangesBlockScriptEvent.java
@@ -24,10 +24,10 @@ public class EntityChangesBlockScriptEvent extends BukkitScriptEvent implements
     // <--[event]
     // @Events
     // entity changes block
-    // entity changes block (into <material>) (in <notable cuboid>)
-    // entity changes <material> (into <material>) (in <notable cuboid>)
-    // <entity> changes block (into <material>) (in <notable cuboid>)
-    // <entity> changes <material> (into <material>) (in <notable cuboid>)
+    // entity changes block (into <material>) (in <area>)
+    // entity changes <material> (into <material>) (in <area>)
+    // <entity> changes block (into <material>) (in <area>)
+    // <entity> changes <material> (into <material>) (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java
index 01635b3550..0a8efb6485 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityCreatePortalScriptEvent.java
@@ -23,8 +23,8 @@ public class EntityCreatePortalScriptEvent extends BukkitScriptEvent implements
 
     // <--[event]
     // @Events
-    // entity creates portal (in <notable cuboid>)
-    // <entity> creates portal (in <notable cuboid>)
+    // entity creates portal (in <area>)
+    // <entity> creates portal (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java
index 48ff26a72e..ab25d82e08 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityFormsBlockScriptEvent.java
@@ -20,10 +20,10 @@ public class EntityFormsBlockScriptEvent extends BukkitScriptEvent implements Li
 
     // <--[event]
     // @Events
-    // entity forms block (in <notable cuboid>)
-    // entity forms <block> (in <notable cuboid>)
-    // <entity> forms block (in <notable cuboid>)
-    // <entity> forms <block> (in <notable cuboid>)
+    // entity forms block (in <area>)
+    // entity forms <block> (in <area>)
+    // <entity> forms block (in <area>)
+    // <entity> forms <block> (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java
index 05da917079..7dec218b22 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityInteractScriptEvent.java
@@ -21,10 +21,10 @@ public class EntityInteractScriptEvent extends BukkitScriptEvent implements List
 
     // <--[event]
     // @Events
-    // <entity> interacts with <material> (in <notable cuboid>)
-    // entity interacts with <material> (in <notable cuboid>)
-    // <entity> interacts with block (in <notable cuboid>)
-    // entity interacts with block (in <notable cuboid>)
+    // <entity> interacts with <material> (in <area>)
+    // entity interacts with <material> (in <area>)
+    // <entity> interacts with block (in <area>)
+    // entity interacts with block (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java
index 4ca85da928..c2dc5b7233 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntitySpawnScriptEvent.java
@@ -25,9 +25,9 @@ public class EntitySpawnScriptEvent extends BukkitScriptEvent implements Listene
     // <--[event]
     // @Events
     // entity spawns
-    // entity spawns (in <notable cuboid>) (because <cause>)
+    // entity spawns (in <area>) (because <cause>)
     // <entity> spawns
-    // <entity> spawns (in <notable cuboid>) (because <cause>)
+    // <entity> spawns (in <area>) (because <cause>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java
index b889d715f8..1e49eea06c 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/EntityTargetsScriptEvent.java
@@ -24,10 +24,10 @@ public class EntityTargetsScriptEvent extends BukkitScriptEvent implements Liste
 
     // <--[event]
     // @Events
-    // entity targets (<entity>) (in <notable cuboid>)
-    // entity targets (<entity>) because <cause> (in <notable cuboid>)
-    // <entity> targets (<entity>) (in <notable cuboid>)
-    // <entity> targets (<entity>) because <cause> (in <notable cuboid>)
+    // entity targets (<entity>) (in <area>)
+    // entity targets (<entity>) because <cause> (in <area>)
+    // <entity> targets (<entity>) (in <area>)
+    // <entity> targets (<entity>) because <cause> (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java
index 39492bc3f9..7bb4bb33fe 100644
--- a/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/entity/HangingBreaksScriptEvent.java
@@ -23,10 +23,10 @@ public class HangingBreaksScriptEvent extends BukkitScriptEvent implements Liste
 
     // <--[event]
     // @Events
-    // hanging breaks (in <notable cuboid>)
-    // hanging breaks because <cause> (in <notable cuboid>)
-    // <hanging> breaks (in <notable cuboid>)
-    // <hanging> breaks because <cause> (in <notable cuboid>)
+    // hanging breaks (in <area>)
+    // hanging breaks because <cause> (in <area>)
+    // <hanging> breaks (in <area>)
+    // <hanging> breaks because <cause> (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java
index 3cb5313a90..cad085e289 100644
--- a/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/player/PlayerBreaksBlockScriptEvent.java
@@ -26,12 +26,12 @@ public class PlayerBreaksBlockScriptEvent extends BukkitScriptEvent implements L
 
     // <--[event]
     // @Events
-    // player breaks block (in <notable cuboid>)
-    // player breaks <material> (in <notable cuboid>)
-    // player breaks block with <item> (in <notable cuboid>)
-    // player breaks <material> with <item> (in <notable cuboid>)
-    // player breaks block with <material> (in <notable cuboid>)
-    // player breaks <material> with <material> (in <notable cuboid>)
+    // player breaks block (in <area>)
+    // player breaks <material> (in <area>)
+    // player breaks block with <item> (in <area>)
+    // player breaks <material> with <item> (in <area>)
+    // player breaks block with <material> (in <area>)
+    // player breaks <material> with <material> (in <area>)
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java
index 3c00d95854..58ea94b2eb 100644
--- a/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/player/PlayerChangesSignScriptEvent.java
@@ -25,9 +25,9 @@ public class PlayerChangesSignScriptEvent extends BukkitScriptEvent implements L
     // <--[event]
     // @Events
     // player changes sign
-    // player changes sign in <notable cuboid>
+    // player changes sign in <area>
     // player changes <material>
-    // player changes <material> in <notable cuboid>
+    // player changes <material> in <area>
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java
index 244473a868..58b2406aeb 100644
--- a/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/player/PlayerDamagesBlockScriptEvent.java
@@ -23,8 +23,8 @@ public class PlayerDamagesBlockScriptEvent extends BukkitScriptEvent implements
     // @Events
     // player damages block
     // player damages <material>
-    // player damages block in <notable cuboid>
-    // player damages <material> in <notable cuboid>
+    // player damages block in <area>
+    // player damages <material> in <area>
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java
index aa19a82655..256a04561e 100644
--- a/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/player/PlayerPlacesBlockScriptEvent.java
@@ -24,8 +24,8 @@ public class PlayerPlacesBlockScriptEvent extends BukkitScriptEvent implements L
     // player places <material>
     // player places block in notable cuboid
     // player places <material> in notable cuboid
-    // player places block in <notable cuboid>
-    // player places <material> in <notable cuboid>
+    // player places block in <area>
+    // player places <material> in <area>
     //
     // @Cancellable true
     //
diff --git a/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java b/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java
index adf4f2ec7c..1eb4467eee 100644
--- a/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java
+++ b/src/main/java/net/aufdemrand/denizen/events/player/PlayerStepsOnScriptEvent.java
@@ -22,8 +22,8 @@ public class PlayerStepsOnScriptEvent extends BukkitScriptEvent implements Liste
 
     // <--[event]
     // @Events
-    // player steps on block (in <notable cuboid>)
-    // player steps on <material> (in <notable cuboid>)
+    // player steps on block (in <area>)
+    // player steps on <material> (in <area>)
     //
     // @Warning This event may fire very rapidly.
     //
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java
index 538f400038..97638f3b5f 100644
--- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java
+++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/BukkitWorldScriptHelper.java
@@ -1020,7 +1020,7 @@ public void playerGameModeChange(PlayerGameModeChangeEvent event) {
     // <--[event]
     // @Events
     // player clicks block
-    // player (<click type>) clicks (<material>) (with <item>) (in <notable cuboid>)
+    // player (<click type>) clicks (<material>) (with <item>) (in <area>)
     // player (<click type>) clicks block (with <item>)
     // player stands on <pressure plate>
     //
@@ -1139,10 +1139,10 @@ else if (determination.startsWith("CANCELLED"))
     // <--[event]
     // @Events
     // player right clicks at entity (with <item>)
-    // player right clicks at entity in <notable cuboid>
+    // player right clicks at entity in <area>
     // player right clicks at entity in notable cuboid
     // player right clicks at <entity> (with <item>)
-    // player right clicks at <entity> in <notable cuboid>
+    // player right clicks at <entity> in <area>
     // player right clicks at <entity> in notable cuboid
 
     // @Triggers when a player right clicks at an entity (Similar to right clicks entity, but for armor stands).
@@ -1210,10 +1210,10 @@ public void playerInteractStand(PlayerInteractAtEntityEvent event) {
     // <--[event]
     // @Events
     // player right clicks entity (with <item>)
-    // player right clicks entity in <notable cuboid>
+    // player right clicks entity in <area>
     // player right clicks entity in notable cuboid
     // player right clicks <entity> (with <item>)
-    // player right clicks <entity> in <notable cuboid>
+    // player right clicks <entity> in <area>
     // player right clicks <entity> in notable cuboid
 
     // @Triggers when a player right clicks on an entity.