diff --git a/source/behavior/entities/format/events.json b/source/behavior/entities/format/events.json
index b2733b3a..fb48d441 100644
--- a/source/behavior/entities/format/events.json
+++ b/source/behavior/entities/format/events.json
@@ -10,7 +10,7 @@
       "title": "Add Or Remove",
       "description": "The components groups to add or remove",
       "type": "object",
-      "examples": [{ "add": { "component_groups": [] } }, { "remove": { "component_groups": [] } }],
+      "examples": [{ "component_groups": [] }],
       "properties": {
         "component_groups": {
           "title": "Component Groups",
@@ -23,6 +23,7 @@
     "event_base": {
       "additionalProperties": false,
       "type": "object",
+      "examples": [{ "add": { "component_groups": [] } }, { "remove": { "component_groups": [] } }],
       "properties": {
         "filters": { "$ref": "./../filters/filters.json" },
         "trigger": { "type": "string", "description": "Triggers additional events", "$comment": "UNDOCUMENTED", "title": "Trigger" },
diff --git a/source/behavior/entities/format/minecraft.entity.json b/source/behavior/entities/format/minecraft.entity.json
index 587078d6..4cf10fdf 100644
--- a/source/behavior/entities/format/minecraft.entity.json
+++ b/source/behavior/entities/format/minecraft.entity.json
@@ -82,6 +82,7 @@
       "description": "Each group when add / remove the default components",
       "uniqueItems": true,
       "type": "object",
+      "propertyNames": { "examples": ["self:"] },
       "additionalProperties": {
         "$ref": "./components.json",
         "uniqueItems": true,