diff --git a/data/auras/aura.cpp b/data/auras/aura.cpp
index 85f391d..4a1ce80 100644
--- a/data/auras/aura.cpp
+++ b/data/auras/aura.cpp
@@ -614,82 +614,82 @@ void Aura::son_remove_dispell(Ref<AuraData> aura) {
 		call("_son_remove_dispell", aura);
 }
 
-void Aura::son_death(Ref<AuraData> data) {
-	if (has_method("_son_death"))
-		call("_son_death", data);
+void Aura::notification_sdeath(Ref<AuraData> data) {
+	if (has_method("_notification_sdeath"))
+		call("_notification_sdeath", data);
 }
 
-void Aura::son_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown) {
-	if (has_method("_son_cooldown_added"))
-		call("_son_cooldown_added", data, cooldown);
+void Aura::notification_scooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown) {
+	if (has_method("_notification_scooldown_added"))
+		call("_notification_scooldown_added", data, cooldown);
 }
-void Aura::son_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown) {
-	if (has_method("_son_cooldown_removed"))
-		call("_son_cooldown_removed", data, cooldown);
+void Aura::notification_scooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown) {
+	if (has_method("_notification_scooldown_removed"))
+		call("_notification_scooldown_removed", data, cooldown);
 }
 
-void Aura::son_category_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
-	if (has_method("_son_category_cooldown_added"))
-		call("_son_category_cooldown_added", data, category_cooldown);
+void Aura::notification_scategory_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
+	if (has_method("_notification_scategory_cooldown_added"))
+		call("_notification_scategory_cooldown_added", data, category_cooldown);
 }
-void Aura::son_category_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
-	if (has_method("_son_category_cooldown_removed"))
-		call("_son_category_cooldown_removed", data, category_cooldown);
+void Aura::notification_scategory_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
+	if (has_method("_notification_scategory_cooldown_removed"))
+		call("_notification_scategory_cooldown_removed", data, category_cooldown);
 }
 
-void Aura::son_gcd_started(Ref<AuraData> data, float gcd) {
+void Aura::notification_sgcd_started(Ref<AuraData> data, float gcd) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_son_gcd_started"))
-		call("_son_gcd_started", data, gcd);
+	if (has_method("_notification_sgcd_started"))
+		call("_notification_sgcd_started", data, gcd);
 }
-void Aura::son_gcd_finished(Ref<AuraData> data) {
+void Aura::notification_sgcd_finished(Ref<AuraData> data) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_son_gcd_finished"))
-		call("_son_gcd_finished", data);
+	if (has_method("_notification_sgcd_finished"))
+		call("_notification_sgcd_finished", data);
 }
 
 void Aura::son_physics_process(Ref<AuraData> data) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_son_gcd_finished"))
-		call("_son_gcd_finished", data);
+	if (has_method("_notification_sgcd_finished"))
+		call("_notification_sgcd_finished", data);
 }
 
-void Aura::son_xp_gained(Ref<AuraData> data, int value) {
+void Aura::notification_sxp_gained(Ref<AuraData> data, int value) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_son_xp_gained"))
-		call("_son_xp_gained", data, value);
+	if (has_method("_notification_sxp_gained"))
+		call("_notification_sxp_gained", data, value);
 }
 
-void Aura::son_class_level_up(Ref<AuraData> data, int value) {
+void Aura::notification_sclass_level_up(Ref<AuraData> data, int value) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_son_class_level_up"))
-		call("_son_class_level_up", data, value);
+	if (has_method("_notification_sclass_level_up"))
+		call("_notification_sclass_level_up", data, value);
 }
 
-void Aura::son_character_level_up(Ref<AuraData> data, int value) {
+void Aura::notification_scharacter_level_up(Ref<AuraData> data, int value) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_son_character_level_up"))
-		call("_son_character_level_up", data, value);
+	if (has_method("_notification_scharacter_level_up"))
+		call("_notification_scharacter_level_up", data, value);
 }
-void Aura::son_entity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource) {
+void Aura::notification_sentity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource) {
 	ERR_FAIL_COND(!data.is_valid());
 	ERR_FAIL_COND(!resource.is_valid());
 
-	if (has_method("_son_entity_resource_added"))
-		call("_son_entity_resource_added", data, resource);
+	if (has_method("_notification_sentity_resource_added"))
+		call("_notification_sentity_resource_added", data, resource);
 }
-void Aura::son_entity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource) {
+void Aura::notification_sentity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource) {
 	ERR_FAIL_COND(!data.is_valid());
 	ERR_FAIL_COND(!resource.is_valid());
 
-	if (has_method("_son_entity_resource_removed"))
-		call("_son_entity_resource_removed", data, resource);
+	if (has_method("_notification_sentity_resource_removed"))
+		call("_notification_sentity_resource_removed", data, resource);
 }
 
 void Aura::notification_caura(int what, Ref<AuraData> data) {
@@ -720,75 +720,75 @@ void Aura::notification_cdamage(int what, Ref<AuraData> aura, Ref<SpellDamageInf
 		call("_notification_cdamage", what, aura, data);
 }
 
-void Aura::con_death(Ref<AuraData> data) {
-	if (has_method("_con_death"))
-		call("_con_death", data);
+void Aura::notification_cdeath(Ref<AuraData> data) {
+	if (has_method("_notification_cdeath"))
+		call("_notification_cdeath", data);
 }
 
-void Aura::con_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown) {
-	if (has_method("_con_cooldown_added"))
-		call("_con_cooldown_added", data, cooldown);
+void Aura::notification_ccooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown) {
+	if (has_method("_notification_ccooldown_added"))
+		call("_notification_ccooldown_added", data, cooldown);
 }
-void Aura::con_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown) {
-	if (has_method("_con_cooldown_removed"))
-		call("_con_cooldown_removed", data, cooldown);
+void Aura::notification_ccooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown) {
+	if (has_method("_notification_ccooldown_removed"))
+		call("_notification_ccooldown_removed", data, cooldown);
 }
-void Aura::con_category_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
-	if (has_method("_con_category_cooldown_added"))
-		call("_con_category_cooldown_added", data, category_cooldown);
+void Aura::notification_ccategory_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
+	if (has_method("_notification_ccategory_cooldown_added"))
+		call("_notification_ccategory_cooldown_added", data, category_cooldown);
 }
-void Aura::con_category_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
-	if (has_method("_con_category_cooldown_removed"))
-		call("_con_category_cooldown_removed", data, category_cooldown);
+void Aura::notification_ccategory_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown) {
+	if (has_method("_notification_ccategory_cooldown_removed"))
+		call("_notification_ccategory_cooldown_removed", data, category_cooldown);
 }
 
-void Aura::con_gcd_started(Ref<AuraData> data, float gcd) {
+void Aura::notification_cgcd_started(Ref<AuraData> data, float gcd) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_con_gcd_started"))
-		call("_con_gcd_started", data, gcd);
+	if (has_method("_notification_cgcd_started"))
+		call("_notification_cgcd_started", data, gcd);
 }
-void Aura::con_gcd_finished(Ref<AuraData> data) {
+void Aura::notification_cgcd_finished(Ref<AuraData> data) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_con_gcd_finished"))
-		call("_con_gcd_finished", data);
+	if (has_method("_notification_cgcd_finished"))
+		call("_notification_cgcd_finished", data);
 }
 
-void Aura::con_xp_gained(Ref<AuraData> data, int value) {
+void Aura::notification_cxp_gained(Ref<AuraData> data, int value) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_con_xp_gained"))
-		call("_con_xp_gained", data, value);
+	if (has_method("_notification_cxp_gained"))
+		call("_notification_cxp_gained", data, value);
 }
 
-void Aura::con_class_level_up(Ref<AuraData> data, int value) {
+void Aura::notification_cclass_level_up(Ref<AuraData> data, int value) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_con_class_level_up"))
-		call("_con_class_level_up", data, value);
+	if (has_method("_notification_cclass_level_up"))
+		call("_notification_cclass_level_up", data, value);
 }
 
-void Aura::con_character_level_up(Ref<AuraData> data, int value) {
+void Aura::notification_ccharacter_level_up(Ref<AuraData> data, int value) {
 	ERR_FAIL_COND(!data.is_valid());
 
-	if (has_method("_con_character_level_up"))
-		call("_con_character_level_up", data, value);
+	if (has_method("_notification_ccharacter_level_up"))
+		call("_notification_ccharacter_level_up", data, value);
 }
 
-void Aura::con_entity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource) {
+void Aura::notification_centity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource) {
 	ERR_FAIL_COND(!data.is_valid());
 	ERR_FAIL_COND(!resource.is_valid());
 
-	if (has_method("_con_entity_resource_added"))
-		call("_con_entity_resource_added", data, resource);
+	if (has_method("_notification_centity_resource_added"))
+		call("_notification_centity_resource_added", data, resource);
 }
-void Aura::con_entity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource) {
+void Aura::notification_centity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource) {
 	ERR_FAIL_COND(!data.is_valid());
 	ERR_FAIL_COND(!resource.is_valid());
 
-	if (has_method("_con_entity_resource_removed"))
-		call("_con_entity_resource_removed", data, resource);
+	if (has_method("_notification_centity_resource_removed"))
+		call("_notification_centity_resource_removed", data, resource);
 }
 
 //Equipment
@@ -1237,48 +1237,48 @@ void Aura::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("son_remove_expired", "aura"), &Aura::son_remove_expired);
 	ClassDB::bind_method(D_METHOD("son_remove_dispell", "aura"), &Aura::son_remove_dispell);
 
-	ClassDB::bind_method(D_METHOD("son_death", "data"), &Aura::son_death);
+	ClassDB::bind_method(D_METHOD("notification_sdeath", "data"), &Aura::notification_sdeath);
 
-	ClassDB::bind_method(D_METHOD("son_cooldown_added", "data", "cooldown"), &Aura::son_cooldown_added);
-	ClassDB::bind_method(D_METHOD("son_cooldown_removed", "data", "cooldown"), &Aura::son_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_scooldown_added", "data", "cooldown"), &Aura::notification_scooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_scooldown_removed", "data", "cooldown"), &Aura::notification_scooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("son_category_cooldown_added", "data", "category_cooldown"), &Aura::son_category_cooldown_added);
-	ClassDB::bind_method(D_METHOD("son_category_cooldown_removed", "data", "category_cooldown"), &Aura::son_category_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_scategory_cooldown_added", "data", "category_cooldown"), &Aura::notification_scategory_cooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_scategory_cooldown_removed", "data", "category_cooldown"), &Aura::notification_scategory_cooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("son_gcd_started", "data", "gcd"), &Aura::son_gcd_started);
-	ClassDB::bind_method(D_METHOD("son_gcd_finished", "data"), &Aura::son_gcd_finished);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_started", "data", "gcd"), &Aura::notification_sgcd_started);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_finished", "data"), &Aura::notification_sgcd_finished);
 
 	ClassDB::bind_method(D_METHOD("son_physics_process", "data"), &Aura::son_physics_process);
 
-	ClassDB::bind_method(D_METHOD("son_xp_gained", "data", "value"), &Aura::son_xp_gained);
-	ClassDB::bind_method(D_METHOD("son_class_level_up", "data", "value"), &Aura::son_class_level_up);
-	ClassDB::bind_method(D_METHOD("son_character_level_up", "data", "value"), &Aura::son_character_level_up);
+	ClassDB::bind_method(D_METHOD("notification_sxp_gained", "data", "value"), &Aura::notification_sxp_gained);
+	ClassDB::bind_method(D_METHOD("notification_sclass_level_up", "data", "value"), &Aura::notification_sclass_level_up);
+	ClassDB::bind_method(D_METHOD("notification_scharacter_level_up", "data", "value"), &Aura::notification_scharacter_level_up);
 
-	ClassDB::bind_method(D_METHOD("son_entity_resource_added", "data", "value"), &Aura::son_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("son_entity_resource_removed", "data", "value"), &Aura::son_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_added", "data", "value"), &Aura::notification_sentity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_removed", "data", "value"), &Aura::notification_sentity_resource_removed);
 
 	BIND_VMETHOD(MethodInfo("_son_remove", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 	BIND_VMETHOD(MethodInfo("_son_remove_expired", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 	BIND_VMETHOD(MethodInfo("_son_remove_dispell", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-	BIND_VMETHOD(MethodInfo("_son_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
+	BIND_VMETHOD(MethodInfo("_notification_sdeath", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-	BIND_VMETHOD(MethodInfo("_son_cooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_son_cooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_son_category_cooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
-	BIND_VMETHOD(MethodInfo("_son_category_cooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scategory_cooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scategory_cooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
 
-	BIND_VMETHOD(MethodInfo("_son_gcd_started", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_son_gcd_finished", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_started", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_finished", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
 	BIND_VMETHOD(MethodInfo("_son_physics_process", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-	BIND_VMETHOD(MethodInfo("_son_xp_gained", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_class_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_character_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sxp_gained", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sclass_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_scharacter_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
 
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
 
 	//Clientside Event Handlers
 	BIND_VMETHOD(MethodInfo("_notification_caura", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
@@ -1291,22 +1291,22 @@ void Aura::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("notification_ccast", "what", "aura", "info"), &Aura::notification_ccast);
 	ClassDB::bind_method(D_METHOD("notification_cdamage", "what", "aura", "info"), &Aura::notification_cdamage);
 
-	ClassDB::bind_method(D_METHOD("con_death", "data"), &Aura::con_death);
+	ClassDB::bind_method(D_METHOD("notification_cdeath", "data"), &Aura::notification_cdeath);
 
-	ClassDB::bind_method(D_METHOD("con_cooldown_added", "data", "info"), &Aura::con_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_cooldown_removed", "data", "info"), &Aura::con_cooldown_removed);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_added", "data", "info"), &Aura::con_category_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_removed", "data", "info"), &Aura::con_category_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_added", "data", "info"), &Aura::notification_ccooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_removed", "data", "info"), &Aura::notification_ccooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_added", "data", "info"), &Aura::notification_ccategory_cooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_removed", "data", "info"), &Aura::notification_ccategory_cooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("con_gcd_started", "data", "info"), &Aura::con_gcd_started);
-	ClassDB::bind_method(D_METHOD("con_gcd_finished", "data"), &Aura::con_gcd_finished);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_started", "data", "info"), &Aura::notification_cgcd_started);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_finished", "data"), &Aura::notification_cgcd_finished);
 
-	ClassDB::bind_method(D_METHOD("con_xp_gained", "data", "value"), &Aura::con_xp_gained);
-	ClassDB::bind_method(D_METHOD("con_class_level_up", "data", "value"), &Aura::con_class_level_up);
-	ClassDB::bind_method(D_METHOD("con_character_level_up", "data", "value"), &Aura::con_character_level_up);
+	ClassDB::bind_method(D_METHOD("notification_cxp_gained", "data", "value"), &Aura::notification_cxp_gained);
+	ClassDB::bind_method(D_METHOD("notification_cclass_level_up", "data", "value"), &Aura::notification_cclass_level_up);
+	ClassDB::bind_method(D_METHOD("notification_ccharacter_level_up", "data", "value"), &Aura::notification_ccharacter_level_up);
 
-	ClassDB::bind_method(D_METHOD("con_entity_resource_added", "data", "value"), &Aura::con_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("con_entity_resource_removed", "data", "value"), &Aura::con_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_added", "data", "value"), &Aura::notification_centity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_removed", "data", "value"), &Aura::notification_centity_resource_removed);
 
 	BIND_VMETHOD(MethodInfo("_con_cast_failed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
 	BIND_VMETHOD(MethodInfo("_con_cast_started", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
@@ -1314,12 +1314,12 @@ void Aura::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_con_cast_finished", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
 	BIND_VMETHOD(MethodInfo("_con_spell_cast_success", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
 
-	BIND_VMETHOD(MethodInfo("_con_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
+	BIND_VMETHOD(MethodInfo("_notification_cdeath", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-	BIND_VMETHOD(MethodInfo("_con_cooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_con_cooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_con_category_cooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
-	BIND_VMETHOD(MethodInfo("_con_category_cooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccategory_cooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccategory_cooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
 
 	BIND_VMETHOD(MethodInfo("_con_aura_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 	BIND_VMETHOD(MethodInfo("_con_aura_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
@@ -1330,15 +1330,15 @@ void Aura::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_con_heal_dealt", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
 	BIND_VMETHOD(MethodInfo("_con_dealt_heal", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
 
-	BIND_VMETHOD(MethodInfo("_con_gcd_started", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_con_gcd_finished", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_started", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_finished", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-	BIND_VMETHOD(MethodInfo("_con_xp_gained", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_class_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_character_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cxp_gained", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cclass_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_ccharacter_level_up", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
 
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "value")));
 
 	//Equipment
 
diff --git a/data/auras/aura.h b/data/auras/aura.h
index 578ad08..f2bb642 100644
--- a/data/auras/aura.h
+++ b/data/auras/aura.h
@@ -261,25 +261,25 @@ public:
 	void son_remove_expired(Ref<AuraData> aura);
 	void son_remove_dispell(Ref<AuraData> aura);
 
-	void son_death(Ref<AuraData> data);
+	void notification_sdeath(Ref<AuraData> data);
 
-	void son_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown);
-	void son_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown);
+	void notification_scooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown);
+	void notification_scooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown);
 
-	void son_category_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
-	void son_category_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
+	void notification_scategory_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
+	void notification_scategory_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
 
-	void son_gcd_started(Ref<AuraData> data, float gcd);
-	void son_gcd_finished(Ref<AuraData> data);
+	void notification_sgcd_started(Ref<AuraData> data, float gcd);
+	void notification_sgcd_finished(Ref<AuraData> data);
 
 	void son_physics_process(Ref<AuraData> data);
 
-	void son_xp_gained(Ref<AuraData> data, int value);
-	void son_class_level_up(Ref<AuraData> data, int value);
-	void son_character_level_up(Ref<AuraData> data, int value);
+	void notification_sxp_gained(Ref<AuraData> data, int value);
+	void notification_sclass_level_up(Ref<AuraData> data, int value);
+	void notification_scharacter_level_up(Ref<AuraData> data, int value);
 
-	void son_entity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource);
-	void son_entity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource);
+	void notification_sentity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource);
+	void notification_sentity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource);
 
 	//Clientside Event Handlers
 	void notification_caura(int what, Ref<AuraData> data);
@@ -287,22 +287,22 @@ public:
 	void notification_ccast(int what, Ref<AuraData> aura, Ref<SpellCastInfo> info);
 	void notification_cdamage(int what, Ref<AuraData> aura, Ref<SpellDamageInfo> data);
 
-	void con_death(Ref<AuraData> data);
+	void notification_cdeath(Ref<AuraData> data);
 
-	void con_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown);
-	void con_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown);
-	void con_category_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
-	void con_category_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
+	void notification_ccooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown);
+	void notification_ccooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown);
+	void notification_ccategory_cooldown_added(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
+	void notification_ccategory_cooldown_removed(Ref<AuraData> data, Ref<CategoryCooldown> category_cooldown);
 
-	void con_gcd_started(Ref<AuraData> data, float gcd);
-	void con_gcd_finished(Ref<AuraData> data);
+	void notification_cgcd_started(Ref<AuraData> data, float gcd);
+	void notification_cgcd_finished(Ref<AuraData> data);
 
-	void con_xp_gained(Ref<AuraData> data, int value);
-	void con_class_level_up(Ref<AuraData> data, int value);
-	void con_character_level_up(Ref<AuraData> data, int value);
+	void notification_cxp_gained(Ref<AuraData> data, int value);
+	void notification_cclass_level_up(Ref<AuraData> data, int value);
+	void notification_ccharacter_level_up(Ref<AuraData> data, int value);
 
-	void con_entity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource);
-	void con_entity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource);
+	void notification_centity_resource_added(Ref<AuraData> data, Ref<EntityResource> resource);
+	void notification_centity_resource_removed(Ref<AuraData> data, Ref<EntityResource> resource);
 
 	//Equipment
 	bool equip_should_deny(Ref<AuraData> data, ItemEnums::EquipSlots equip_slot, Ref<ItemInstance> item);
diff --git a/doc_classes/Aura.xml b/doc_classes/Aura.xml
index 6b5a8e9..4277bf7 100644
--- a/doc_classes/Aura.xml
+++ b/doc_classes/Aura.xml
@@ -101,7 +101,7 @@
 				Called clientside when an [Entity]'s cast state changes. Not yet used.
 			</description>
 		</method>
-		<method name="_con_category_cooldown_added" qualifiers="virtual">
+		<method name="_notification_ccategory_cooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -112,7 +112,7 @@
 				Called clientside when an [Entity] receives a [CategoryCooldown].
 			</description>
 		</method>
-		<method name="_con_category_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_ccategory_cooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -123,7 +123,7 @@
 				Called clientside when an [Entity]'s [CategoryCooldown] is removed / expires.
 			</description>
 		</method>
-		<method name="_con_character_level_up" qualifiers="virtual">
+		<method name="_notification_ccharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -133,7 +133,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_class_level_up" qualifiers="virtual">
+		<method name="_notification_cclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -143,7 +143,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_cooldown_added" qualifiers="virtual">
+		<method name="_notification_ccooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -154,7 +154,7 @@
 				Called clientside when an [Entity] receives a [Cooldown].
 			</description>
 		</method>
-		<method name="_con_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_ccooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -198,7 +198,7 @@
 				Called clientside for an [Entity] who deals heal.
 			</description>
 		</method>
-		<method name="_con_death" qualifiers="virtual">
+		<method name="_notification_cdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -207,7 +207,7 @@
 				Called clientside for an [Entity] who dies.
 			</description>
 		</method>
-		<method name="_con_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_centity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -217,7 +217,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_centity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -261,7 +261,7 @@
 				Called clientside for an [Entity] when equipping an item succeeds.
 			</description>
 		</method>
-		<method name="_con_gcd_finished" qualifiers="virtual">
+		<method name="_notification_cgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -270,7 +270,7 @@
 				Called clientside for an [Entity] when a global cooldown finishes.
 			</description>
 		</method>
-		<method name="_con_gcd_started" qualifiers="virtual">
+		<method name="_notification_cgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -303,7 +303,7 @@
 				Called clientside for an [Entity] whos spell cast succeeds.
 			</description>
 		</method>
-		<method name="_con_xp_gained" qualifiers="virtual">
+		<method name="_notification_cxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -576,7 +576,7 @@
 				Called serverside when the [Entity]'s cast this [Aura] is on starts.
 			</description>
 		</method>
-		<method name="_son_category_cooldown_added" qualifiers="virtual">
+		<method name="_notification_scategory_cooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -587,7 +587,7 @@
 				Called serverside when the [Entity] this [Aura] is on receives a [CategoryCooldown].
 			</description>
 		</method>
-		<method name="_son_category_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_scategory_cooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -598,7 +598,7 @@
 				Called serverside when a [CategoryCooldown] of the [Entity] this [Aura] is on gets removed.
 			</description>
 		</method>
-		<method name="_son_character_level_up" qualifiers="virtual">
+		<method name="_notification_scharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -608,7 +608,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_class_level_up" qualifiers="virtual">
+		<method name="_notification_sclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -618,7 +618,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_cooldown_added" qualifiers="virtual">
+		<method name="_notification_scooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -629,7 +629,7 @@
 				Called serverside when the [Entity] this [Aura] is on receives a [Cooldown].
 			</description>
 		</method>
-		<method name="_son_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_scooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -683,7 +683,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_death" qualifiers="virtual">
+		<method name="_notification_sdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -691,7 +691,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_sentity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -701,7 +701,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_sentity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -743,7 +743,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_finished" qualifiers="virtual">
+		<method name="_notification_sgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -751,7 +751,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_started" qualifiers="virtual">
+		<method name="_notification_sgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -833,7 +833,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_xp_gained" qualifiers="virtual">
+		<method name="_notification_sxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -945,7 +945,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_added">
+		<method name="notification_ccategory_cooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -955,7 +955,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_removed">
+		<method name="notification_ccategory_cooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -965,7 +965,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_character_level_up">
+		<method name="notification_ccharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -975,7 +975,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_class_level_up">
+		<method name="notification_cclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -985,7 +985,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_added">
+		<method name="notification_ccooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -995,7 +995,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_removed">
+		<method name="notification_ccooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1035,7 +1035,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_death">
+		<method name="notification_cdeath">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1043,7 +1043,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_added">
+		<method name="notification_centity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1053,7 +1053,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_removed">
+		<method name="notification_centity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1095,7 +1095,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_finished">
+		<method name="notification_cgcd_finished">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1103,7 +1103,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_started">
+		<method name="notification_cgcd_started">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1133,7 +1133,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_xp_gained">
+		<method name="notification_cxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1553,7 +1553,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_category_cooldown_added">
+		<method name="notification_scategory_cooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1563,7 +1563,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_category_cooldown_removed">
+		<method name="notification_scategory_cooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1573,7 +1573,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_character_level_up">
+		<method name="notification_scharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1583,7 +1583,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_class_level_up">
+		<method name="notification_sclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1593,7 +1593,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_cooldown_added">
+		<method name="notification_scooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1603,7 +1603,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_cooldown_removed">
+		<method name="notification_scooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1653,7 +1653,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_death">
+		<method name="notification_sdeath">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1661,7 +1661,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_added">
+		<method name="notification_sentity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1671,7 +1671,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_removed">
+		<method name="notification_sentity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1713,7 +1713,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_finished">
+		<method name="notification_sgcd_finished">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1721,7 +1721,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_started">
+		<method name="notification_sgcd_started">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
@@ -1803,7 +1803,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_xp_gained">
+		<method name="notification_sxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="AuraData">
diff --git a/doc_classes/Entity.xml b/doc_classes/Entity.xml
index 85d0b05..a2296c7 100644
--- a/doc_classes/Entity.xml
+++ b/doc_classes/Entity.xml
@@ -106,7 +106,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_character_level_up" qualifiers="virtual">
+		<method name="_notification_ccharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -114,7 +114,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_class_level_up" qualifiers="virtual">
+		<method name="_notification_cclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -146,13 +146,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_death" qualifiers="virtual">
+		<method name="_notification_cdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="_con_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_centity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -160,7 +160,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_centity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -196,13 +196,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_gcd_finished" qualifiers="virtual">
+		<method name="_notification_cgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="_con_gcd_started" qualifiers="virtual">
+		<method name="_notification_cgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="gcd" type="float">
@@ -250,7 +250,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_xp_gained" qualifiers="virtual">
+		<method name="_notification_cxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -288,25 +288,25 @@
 			<description>
 			</description>
 		</method>
-		<method name="_onc_mouse_enter" qualifiers="virtual">
+		<method name="_notification_cmouse_enter" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="_onc_mouse_exit" qualifiers="virtual">
+		<method name="_notification_cmouse_exit" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="_onc_targeted" qualifiers="virtual">
+		<method name="_notification_ctargeted" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="_onc_untargeted" qualifiers="virtual">
+		<method name="_notification_cuntargeted" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
@@ -466,7 +466,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_character_level_up" qualifiers="virtual">
+		<method name="_notification_scharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -474,7 +474,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_class_level_up" qualifiers="virtual">
+		<method name="_notification_sclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -514,13 +514,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_death" qualifiers="virtual">
+		<method name="_notification_sdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_sentity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -528,7 +528,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_sentity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -564,13 +564,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_finished" qualifiers="virtual">
+		<method name="_notification_sgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_started" qualifiers="virtual">
+		<method name="_notification_sgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="gcd" type="float">
@@ -634,7 +634,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_xp_gained" qualifiers="virtual">
+		<method name="_notification_sxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -1286,7 +1286,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_added">
+		<method name="notification_ccategory_cooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -1294,7 +1294,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_added" qualifiers="virtual">
+		<method name="notification_ccategory_cooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -1302,7 +1302,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_removed">
+		<method name="notification_ccategory_cooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -1310,7 +1310,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_removed" qualifiers="virtual">
+		<method name="notification_ccategory_cooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -1318,7 +1318,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_character_level_up">
+		<method name="notification_ccharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -1326,7 +1326,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_class_level_up">
+		<method name="notification_cclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -1334,7 +1334,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_added" qualifiers="virtual">
+		<method name="notification_ccooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -1342,7 +1342,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_added">
+		<method name="notification_ccooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -1350,7 +1350,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_removed" qualifiers="virtual">
+		<method name="notification_ccooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -1358,7 +1358,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_removed">
+		<method name="notification_ccooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -1390,13 +1390,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_death">
+		<method name="notification_cdeath">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_added">
+		<method name="notification_centity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -1404,7 +1404,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_removed">
+		<method name="notification_centity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -1440,13 +1440,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_finished">
+		<method name="notification_cgcd_finished">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_started">
+		<method name="notification_cgcd_started">
 			<return type="void">
 			</return>
 			<description>
@@ -1468,7 +1468,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_xp_gained">
+		<method name="notification_cxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -2500,19 +2500,19 @@
 			<description>
 			</description>
 		</method>
-		<method name="onc_mouse_enter">
+		<method name="notification_cmouse_enter">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="onc_mouse_exit">
+		<method name="notification_cmouse_exit">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="onc_stat_changed">
+		<method name="notification_cstat_changed">
 			<return type="void">
 			</return>
 			<argument index="0" name="stat" type="Stat">
@@ -2520,19 +2520,19 @@
 			<description>
 			</description>
 		</method>
-		<method name="onc_targeted">
+		<method name="notification_ctargeted">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="onc_untargeted">
+		<method name="notification_cuntargeted">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="item_ons_added">
+		<method name="notification_item_sadded">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2544,7 +2544,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="item_ons_count_changed">
+		<method name="notification_item_sscount_changed">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2556,7 +2556,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="item_ons_removed">
+		<method name="notification_item_sremoved">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2568,7 +2568,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="items_ons_swapped">
+		<method name="notification_items_sswapped">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2580,7 +2580,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="ons_overburden_removed">
+		<method name="notification_soverburden_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2588,7 +2588,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="ons_overburdened">
+		<method name="notification_soverburdened">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2596,7 +2596,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="ons_stat_changed">
+		<method name="notification_sstat_changed">
 			<return type="void">
 			</return>
 			<argument index="0" name="stat" type="Stat">
@@ -2604,7 +2604,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="target_item_ons_added">
+		<method name="notification_target_item_sadded">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2616,7 +2616,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="target_item_ons_count_changed">
+		<method name="notification_target_item_sscount_changed">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2628,7 +2628,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="target_item_ons_removed">
+		<method name="notification_target_item_sremoved">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -2640,7 +2640,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="target_items_ons_swapped">
+		<method name="notification_target_items_sswapped">
 			<return type="void">
 			</return>
 			<argument index="0" name="bag" type="Bag">
@@ -3394,7 +3394,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_character_level_up">
+		<method name="notification_scharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -3402,7 +3402,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_class_level_up">
+		<method name="notification_sclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -3442,13 +3442,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_death">
+		<method name="notification_sdeath">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_added">
+		<method name="notification_sentity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -3456,7 +3456,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_removed">
+		<method name="notification_sentity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -3492,13 +3492,13 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_finished">
+		<method name="notification_sgcd_finished">
 			<return type="void">
 			</return>
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_started">
+		<method name="notification_sgcd_started">
 			<return type="void">
 			</return>
 			<description>
@@ -3536,7 +3536,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_xp_gained">
+		<method name="notification_sxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="value" type="int">
@@ -3950,7 +3950,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="con_character_level_up">
+		<signal name="notification_ccharacter_level_up">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<argument index="1" name="value" type="int">
@@ -3966,7 +3966,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="con_class_level_up">
+		<signal name="notification_cclass_level_up">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<argument index="1" name="value" type="int">
@@ -4050,7 +4050,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="con_xp_gained">
+		<signal name="notification_cxp_gained">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<argument index="1" name="value" type="int">
@@ -4152,11 +4152,11 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="onc_mouse_entered">
+		<signal name="notification_cmouse_entered">
 			<description>
 			</description>
 		</signal>
-		<signal name="onc_mouse_exited">
+		<signal name="notification_cmouse_exited">
 			<description>
 			</description>
 		</signal>
@@ -4172,11 +4172,11 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="onc_targeted">
+		<signal name="notification_ctargeted">
 			<description>
 			</description>
 		</signal>
-		<signal name="onc_untargeted">
+		<signal name="notification_cuntargeted">
 			<description>
 			</description>
 		</signal>
@@ -4338,7 +4338,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="son_character_level_up">
+		<signal name="notification_scharacter_level_up">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<argument index="1" name="value" type="int">
@@ -4354,7 +4354,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="son_class_level_up">
+		<signal name="notification_sclass_level_up">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<argument index="1" name="value" type="int">
@@ -4422,7 +4422,7 @@
 			<description>
 			</description>
 		</signal>
-		<signal name="son_xp_gained">
+		<signal name="notification_sxp_gained">
 			<argument index="0" name="entity" type="Entity">
 			</argument>
 			<argument index="1" name="value" type="int">
diff --git a/doc_classes/EntityClassData.xml b/doc_classes/EntityClassData.xml
index 83cb158..92ea5dd 100644
--- a/doc_classes/EntityClassData.xml
+++ b/doc_classes/EntityClassData.xml
@@ -64,7 +64,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_category_cooldown_added" qualifiers="virtual">
+		<method name="_notification_ccategory_cooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -72,7 +72,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_category_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_ccategory_cooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -80,7 +80,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_character_level_up" qualifiers="virtual">
+		<method name="_notification_ccharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -90,7 +90,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_class_level_up" qualifiers="virtual">
+		<method name="_notification_cclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -100,7 +100,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_cooldown_added" qualifiers="virtual">
+		<method name="_notification_ccooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -108,7 +108,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_ccooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -116,7 +116,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_death" qualifiers="virtual">
+		<method name="_notification_cdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Entity">
@@ -124,7 +124,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_centity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -132,7 +132,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_centity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -172,7 +172,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_gcd_finished" qualifiers="virtual">
+		<method name="_notification_cgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -180,7 +180,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_gcd_started" qualifiers="virtual">
+		<method name="_notification_cgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -198,7 +198,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_xp_gained" qualifiers="virtual">
+		<method name="_notification_cxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -330,7 +330,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_category_cooldown_added" qualifiers="virtual">
+		<method name="_notification_scategory_cooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -338,7 +338,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_category_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_scategory_cooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -346,7 +346,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_character_level_up" qualifiers="virtual">
+		<method name="_notification_scharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -356,7 +356,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_class_level_up" qualifiers="virtual">
+		<method name="_notification_sclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -366,7 +366,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_cooldown_added" qualifiers="virtual">
+		<method name="_notification_scooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -374,7 +374,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_scooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -414,7 +414,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_death" qualifiers="virtual">
+		<method name="_notification_sdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Entity">
@@ -422,7 +422,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_sentity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -430,7 +430,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_sentity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -470,7 +470,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_finished" qualifiers="virtual">
+		<method name="_notification_sgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -478,7 +478,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_started" qualifiers="virtual">
+		<method name="_notification_sgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -520,7 +520,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_xp_gained" qualifiers="virtual">
+		<method name="_notification_sxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -586,7 +586,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_added">
+		<method name="notification_ccategory_cooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="CategoryCooldown">
@@ -594,7 +594,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_removed">
+		<method name="notification_ccategory_cooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="CategoryCooldown">
@@ -602,7 +602,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_character_level_up">
+		<method name="notification_ccharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -612,7 +612,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_class_level_up">
+		<method name="notification_cclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -622,7 +622,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_added">
+		<method name="notification_ccooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -630,7 +630,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_removed">
+		<method name="notification_ccooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -638,7 +638,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_death">
+		<method name="notification_cdeath">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Node">
@@ -646,7 +646,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_added">
+		<method name="notification_centity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -654,7 +654,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_removed">
+		<method name="notification_centity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -694,7 +694,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_finished">
+		<method name="notification_cgcd_finished">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -702,7 +702,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_started">
+		<method name="notification_cgcd_started">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -720,7 +720,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_xp_gained">
+		<method name="notification_cxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -1036,7 +1036,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_category_cooldown_added">
+		<method name="notification_scategory_cooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -1044,7 +1044,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_category_cooldown_removed">
+		<method name="notification_scategory_cooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -1052,7 +1052,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_character_level_up">
+		<method name="notification_scharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -1062,7 +1062,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_class_level_up">
+		<method name="notification_sclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -1072,7 +1072,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_cooldown_added">
+		<method name="notification_scooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -1080,7 +1080,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_cooldown_removed">
+		<method name="notification_scooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -1120,7 +1120,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_death">
+		<method name="notification_sdeath">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Node">
@@ -1128,7 +1128,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_added">
+		<method name="notification_sentity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -1136,7 +1136,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_removed">
+		<method name="notification_sentity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -1176,7 +1176,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_finished">
+		<method name="notification_sgcd_finished">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -1184,7 +1184,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_started">
+		<method name="notification_sgcd_started">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -1226,7 +1226,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_xp_gained">
+		<method name="notification_sxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
diff --git a/doc_classes/EntityData.xml b/doc_classes/EntityData.xml
index 2a36074..9c637b0 100644
--- a/doc_classes/EntityData.xml
+++ b/doc_classes/EntityData.xml
@@ -72,7 +72,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_category_cooldown_added" qualifiers="virtual">
+		<method name="_notification_ccategory_cooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -80,7 +80,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_category_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_ccategory_cooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -88,7 +88,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_character_level_up" qualifiers="virtual">
+		<method name="_notification_ccharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -98,7 +98,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_class_level_up" qualifiers="virtual">
+		<method name="_notification_cclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -108,7 +108,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_cooldown_added" qualifiers="virtual">
+		<method name="_notification_ccooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -116,7 +116,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_ccooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -124,7 +124,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_death" qualifiers="virtual">
+		<method name="_notification_cdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Entity">
@@ -132,7 +132,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_centity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -140,7 +140,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_centity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -180,7 +180,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_gcd_finished" qualifiers="virtual">
+		<method name="_notification_cgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -188,7 +188,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_gcd_started" qualifiers="virtual">
+		<method name="_notification_cgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -206,7 +206,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_con_xp_gained" qualifiers="virtual">
+		<method name="_notification_cxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -384,7 +384,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_category_cooldown_added" qualifiers="virtual">
+		<method name="_notification_scategory_cooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -392,7 +392,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_category_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_scategory_cooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -400,7 +400,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_character_level_up" qualifiers="virtual">
+		<method name="_notification_scharacter_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -410,7 +410,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_class_level_up" qualifiers="virtual">
+		<method name="_notification_sclass_level_up" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -420,7 +420,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_cooldown_added" qualifiers="virtual">
+		<method name="_notification_scooldown_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -428,7 +428,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_cooldown_removed" qualifiers="virtual">
+		<method name="_notification_scooldown_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -468,7 +468,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_death" qualifiers="virtual">
+		<method name="_notification_sdeath" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Entity">
@@ -476,7 +476,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_added" qualifiers="virtual">
+		<method name="_notification_sentity_resource_added" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -484,7 +484,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_entity_resource_removed" qualifiers="virtual">
+		<method name="_notification_sentity_resource_removed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -524,7 +524,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_finished" qualifiers="virtual">
+		<method name="_notification_sgcd_finished" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -532,7 +532,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_gcd_started" qualifiers="virtual">
+		<method name="_notification_sgcd_started" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -574,7 +574,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_son_xp_gained" qualifiers="virtual">
+		<method name="_notification_sxp_gained" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Entity">
@@ -648,7 +648,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_added">
+		<method name="notification_ccategory_cooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="CategoryCooldown">
@@ -656,7 +656,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_category_cooldown_removed">
+		<method name="notification_ccategory_cooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="CategoryCooldown">
@@ -664,7 +664,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_character_level_up">
+		<method name="notification_ccharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -674,7 +674,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_class_level_up">
+		<method name="notification_cclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -684,7 +684,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_added">
+		<method name="notification_ccooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -692,7 +692,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_cooldown_removed">
+		<method name="notification_ccooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -700,7 +700,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_death">
+		<method name="notification_cdeath">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Node">
@@ -708,7 +708,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_added">
+		<method name="notification_centity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -716,7 +716,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_entity_resource_removed">
+		<method name="notification_centity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -756,7 +756,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_finished">
+		<method name="notification_cgcd_finished">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -764,7 +764,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_gcd_started">
+		<method name="notification_cgcd_started">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -782,7 +782,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="con_xp_gained">
+		<method name="notification_cxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -944,7 +944,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_category_cooldown_added">
+		<method name="notification_scategory_cooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -952,7 +952,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_category_cooldown_removed">
+		<method name="notification_scategory_cooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="category_cooldown" type="CategoryCooldown">
@@ -960,7 +960,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_character_level_up">
+		<method name="notification_scharacter_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -970,7 +970,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_class_level_up">
+		<method name="notification_sclass_level_up">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -980,7 +980,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_cooldown_added">
+		<method name="notification_scooldown_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -988,7 +988,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_cooldown_removed">
+		<method name="notification_scooldown_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="cooldown" type="Cooldown">
@@ -1028,7 +1028,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_death">
+		<method name="notification_sdeath">
 			<return type="void">
 			</return>
 			<argument index="0" name="data" type="Node">
@@ -1036,7 +1036,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_added">
+		<method name="notification_sentity_resource_added">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -1044,7 +1044,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_entity_resource_removed">
+		<method name="notification_sentity_resource_removed">
 			<return type="void">
 			</return>
 			<argument index="0" name="resource" type="EntityResource">
@@ -1084,7 +1084,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_finished">
+		<method name="notification_sgcd_finished">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -1092,7 +1092,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_gcd_started">
+		<method name="notification_sgcd_started">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
@@ -1134,7 +1134,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="son_xp_gained">
+		<method name="notification_sxp_gained">
 			<return type="void">
 			</return>
 			<argument index="0" name="entity" type="Node">
diff --git a/doc_classes/EntityResource.xml b/doc_classes/EntityResource.xml
index a165b9e..a29f4c2 100644
--- a/doc_classes/EntityResource.xml
+++ b/doc_classes/EntityResource.xml
@@ -30,7 +30,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_onc_stat_changed" qualifiers="virtual">
+		<method name="_notification_cstat_changed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="stat" type="Stat">
@@ -56,7 +56,7 @@
 			<description>
 			</description>
 		</method>
-		<method name="_ons_stat_changed" qualifiers="virtual">
+		<method name="_notification_sstat_changed" qualifiers="virtual">
 			<return type="void">
 			</return>
 			<argument index="0" name="stat" type="Stat">
diff --git a/entities/data/entity_class_data.cpp b/entities/data/entity_class_data.cpp
index 0374c5b..7662004 100644
--- a/entities/data/entity_class_data.cpp
+++ b/entities/data/entity_class_data.cpp
@@ -461,71 +461,71 @@ void EntityClassData::notification_sdamage(int what, Ref<SpellDamageInfo> info)
 		call("_notification_sdamage", what, info);
 }
 
-void EntityClassData::son_death(Entity *entity) {
-	if (has_method("_son_death"))
-		call("_son_death", entity);
+void EntityClassData::notification_sdeath(Entity *entity) {
+	if (has_method("_notification_sdeath"))
+		call("_notification_sdeath", entity);
 }
 
-void EntityClassData::son_death_bind(Node *entity) {
+void EntityClassData::notification_sdeath_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_death(e);
+	notification_sdeath(e);
 }
 
-void EntityClassData::son_cooldown_added(Ref<Cooldown> cooldown) {
-	if (has_method("_son_cooldown_added"))
-		call("_son_cooldown_added", cooldown);
+void EntityClassData::notification_scooldown_added(Ref<Cooldown> cooldown) {
+	if (has_method("_notification_scooldown_added"))
+		call("_notification_scooldown_added", cooldown);
 }
-void EntityClassData::son_cooldown_removed(Ref<Cooldown> cooldown) {
-	if (has_method("_son_cooldown_removed"))
-		call("_son_cooldown_removed", cooldown);
+void EntityClassData::notification_scooldown_removed(Ref<Cooldown> cooldown) {
+	if (has_method("_notification_scooldown_removed"))
+		call("_notification_scooldown_removed", cooldown);
 }
 
-void EntityClassData::son_category_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
-	if (has_method("_son_category_cooldown_added"))
-		call("_son_category_cooldown_added", category_cooldown);
+void EntityClassData::notification_scategory_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
+	if (has_method("_notification_scategory_cooldown_added"))
+		call("_notification_scategory_cooldown_added", category_cooldown);
 }
-void EntityClassData::son_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
-	if (has_method("_son_category_cooldown_removed"))
-		call("_son_category_cooldown_removed", category_cooldown);
+void EntityClassData::notification_scategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
+	if (has_method("_notification_scategory_cooldown_removed"))
+		call("_notification_scategory_cooldown_removed", category_cooldown);
 }
 
-void EntityClassData::son_gcd_started(Entity *entity, float gcd) {
-	if (has_method("_son_gcd_started"))
-		call("_son_gcd_started", entity, gcd);
+void EntityClassData::notification_sgcd_started(Entity *entity, float gcd) {
+	if (has_method("_notification_sgcd_started"))
+		call("_notification_sgcd_started", entity, gcd);
 }
-void EntityClassData::son_gcd_finished(Entity *entity) {
-	if (has_method("_son_gcd_finished"))
-		call("_son_gcd_finished", entity);
+void EntityClassData::notification_sgcd_finished(Entity *entity) {
+	if (has_method("_notification_sgcd_finished"))
+		call("_notification_sgcd_finished", entity);
 }
-void EntityClassData::son_gcd_started_bind(Node *entity, float gcd) {
+void EntityClassData::notification_sgcd_started_bind(Node *entity, float gcd) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_gcd_started(e, gcd);
+	notification_sgcd_started(e, gcd);
 }
-void EntityClassData::son_gcd_finished_bind(Node *entity) {
+void EntityClassData::notification_sgcd_finished_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_gcd_finished(e);
+	notification_sgcd_finished(e);
 }
 
-void EntityClassData::son_xp_gained(Entity *entity, int value) {
-	if (has_method("_son_xp_gained"))
-		call("_son_xp_gained", entity, value);
+void EntityClassData::notification_sxp_gained(Entity *entity, int value) {
+	if (has_method("_notification_sxp_gained"))
+		call("_notification_sxp_gained", entity, value);
 }
-void EntityClassData::son_xp_gained_bind(Node *entity, int value) {
+void EntityClassData::notification_sxp_gained_bind(Node *entity, int value) {
 
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
@@ -537,14 +537,14 @@ void EntityClassData::son_xp_gained_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_xp_gained(e, value);
+	notification_sxp_gained(e, value);
 }
 
-void EntityClassData::son_class_level_up(Entity *entity, int value) {
-	if (has_method("_son_class_level_up"))
-		call("_son_class_level_up", entity);
+void EntityClassData::notification_sclass_level_up(Entity *entity, int value) {
+	if (has_method("_notification_sclass_level_up"))
+		call("_notification_sclass_level_up", entity);
 }
-void EntityClassData::son_class_level_up_bind(Node *entity, int value) {
+void EntityClassData::notification_sclass_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -555,14 +555,14 @@ void EntityClassData::son_class_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_class_level_up(e, value);
+	notification_sclass_level_up(e, value);
 }
 
-void EntityClassData::son_character_level_up(Entity *entity, int value) {
-	if (has_method("_son_character_level_up"))
-		call("_son_character_level_up", entity);
+void EntityClassData::notification_scharacter_level_up(Entity *entity, int value) {
+	if (has_method("_notification_scharacter_level_up"))
+		call("_notification_scharacter_level_up", entity);
 }
-void EntityClassData::son_character_level_up_bind(Node *entity, int value) {
+void EntityClassData::notification_scharacter_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -573,17 +573,17 @@ void EntityClassData::son_character_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_character_level_up(e, value);
+	notification_scharacter_level_up(e, value);
 }
 
-void EntityClassData::son_entity_resource_added(Ref<EntityResource> resource) {
-	if (has_method("_son_entity_resource_added"))
-		call("_son_entity_resource_added", resource);
+void EntityClassData::notification_sentity_resource_added(Ref<EntityResource> resource) {
+	if (has_method("_notification_sentity_resource_added"))
+		call("_notification_sentity_resource_added", resource);
 }
 
-void EntityClassData::son_entity_resource_removed(Ref<EntityResource> resource) {
-	if (has_method("_son_entity_resource_removed"))
-		call("_son_entity_resource_removed", resource);
+void EntityClassData::notification_sentity_resource_removed(Ref<EntityResource> resource) {
+	if (has_method("_notification_sentity_resource_removed"))
+		call("_notification_sentity_resource_removed", resource);
 }
 
 //Clientside Event Handlers
@@ -612,80 +612,80 @@ void EntityClassData::notification_cdamage(int what, Ref<SpellDamageInfo> info)
 		call("_notification_cdamage", what, info);
 }
 
-void EntityClassData::con_death(Entity *entity) {
+void EntityClassData::notification_cdeath(Entity *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
-	if (has_method("_con_death"))
-		call("_con_death", entity);
+	if (has_method("_notification_cdeath"))
+		call("_notification_cdeath", entity);
 }
 
-void EntityClassData::con_death_bind(Node *entity) {
+void EntityClassData::notification_cdeath_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_death(e);
+	notification_cdeath(e);
 }
 
-void EntityClassData::con_cooldown_added(Ref<Cooldown> cooldown) {
+void EntityClassData::notification_ccooldown_added(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
-	if (has_method("_con_cooldown_added"))
-		call("_con_cooldown_added", cooldown);
+	if (has_method("_notification_ccooldown_added"))
+		call("_notification_ccooldown_added", cooldown);
 }
-void EntityClassData::con_cooldown_removed(Ref<Cooldown> cooldown) {
+void EntityClassData::notification_ccooldown_removed(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
-	if (has_method("_con_cooldown_removed"))
-		call("_con_cooldown_removed", cooldown);
+	if (has_method("_notification_ccooldown_removed"))
+		call("_notification_ccooldown_removed", cooldown);
 }
-void EntityClassData::con_category_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
+void EntityClassData::notification_ccategory_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
-	if (has_method("_con_category_cooldown_added"))
-		call("_con_category_cooldown_added", category_cooldown);
+	if (has_method("_notification_ccategory_cooldown_added"))
+		call("_notification_ccategory_cooldown_added", category_cooldown);
 }
-void EntityClassData::con_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
+void EntityClassData::notification_ccategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
-	if (has_method("_con_category_cooldown_removed"))
-		call("_con_category_cooldown_removed", category_cooldown);
+	if (has_method("_notification_ccategory_cooldown_removed"))
+		call("_notification_ccategory_cooldown_removed", category_cooldown);
 }
 
-void EntityClassData::con_gcd_started(Entity *entity, float gcd) {
-	if (has_method("_con_gcd_started"))
-		call("_con_gcd_started", entity, gcd);
+void EntityClassData::notification_cgcd_started(Entity *entity, float gcd) {
+	if (has_method("_notification_cgcd_started"))
+		call("_notification_cgcd_started", entity, gcd);
 }
-void EntityClassData::con_gcd_finished(Entity *entity) {
-	if (has_method("_con_gcd_finished"))
-		call("_con_gcd_finished", entity);
+void EntityClassData::notification_cgcd_finished(Entity *entity) {
+	if (has_method("_notification_cgcd_finished"))
+		call("_notification_cgcd_finished", entity);
 }
-void EntityClassData::con_gcd_started_bind(Node *entity, float gcd) {
+void EntityClassData::notification_cgcd_started_bind(Node *entity, float gcd) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_gcd_started(e, gcd);
+	notification_cgcd_started(e, gcd);
 }
-void EntityClassData::con_gcd_finished_bind(Node *entity) {
+void EntityClassData::notification_cgcd_finished_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_gcd_finished(e);
+	notification_cgcd_finished(e);
 }
 
-void EntityClassData::con_xp_gained(Entity *entity, int value) {
-	if (has_method("_con_xp_gained"))
-		call("_con_xp_gained", entity, value);
+void EntityClassData::notification_cxp_gained(Entity *entity, int value) {
+	if (has_method("_notification_cxp_gained"))
+		call("_notification_cxp_gained", entity, value);
 }
-void EntityClassData::con_xp_gained_bind(Node *entity, int value) {
+void EntityClassData::notification_cxp_gained_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -696,14 +696,14 @@ void EntityClassData::con_xp_gained_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_xp_gained(e, value);
+	notification_cxp_gained(e, value);
 }
 
-void EntityClassData::con_class_level_up(Entity *entity, int value) {
-	if (has_method("_con_class_level_up"))
-		call("_con_class_level_up", entity);
+void EntityClassData::notification_cclass_level_up(Entity *entity, int value) {
+	if (has_method("_notification_cclass_level_up"))
+		call("_notification_cclass_level_up", entity);
 }
-void EntityClassData::con_class_level_up_bind(Node *entity, int value) {
+void EntityClassData::notification_cclass_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -714,14 +714,14 @@ void EntityClassData::con_class_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_class_level_up(e, value);
+	notification_cclass_level_up(e, value);
 }
 
-void EntityClassData::con_character_level_up(Entity *entity, int value) {
-	if (has_method("_con_character_level_up"))
-		call("_con_character_level_up", entity);
+void EntityClassData::notification_ccharacter_level_up(Entity *entity, int value) {
+	if (has_method("_notification_ccharacter_level_up"))
+		call("_notification_ccharacter_level_up", entity);
 }
-void EntityClassData::con_character_level_up_bind(Node *entity, int value) {
+void EntityClassData::notification_ccharacter_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -732,17 +732,17 @@ void EntityClassData::con_character_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_character_level_up(e, value);
+	notification_ccharacter_level_up(e, value);
 }
 
-void EntityClassData::con_entity_resource_added(Ref<EntityResource> resource) {
-	if (has_method("_con_entity_resource_added"))
-		call("_con_entity_resource_added", resource);
+void EntityClassData::notification_centity_resource_added(Ref<EntityResource> resource) {
+	if (has_method("_notification_centity_resource_added"))
+		call("_notification_centity_resource_added", resource);
 }
 
-void EntityClassData::con_entity_resource_removed(Ref<EntityResource> resource) {
-	if (has_method("_con_entity_resource_removed"))
-		call("_con_entity_resource_removed", resource);
+void EntityClassData::notification_centity_resource_removed(Ref<EntityResource> resource) {
+	if (has_method("_notification_centity_resource_removed"))
+		call("_notification_centity_resource_removed", resource);
 }
 
 //Equipment
@@ -875,73 +875,73 @@ void EntityClassData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("notification_ccast", "what", "info"), &EntityClassData::notification_ccast);
 	ClassDB::bind_method(D_METHOD("notification_cdamage", "what", "info"), &EntityClassData::notification_cdamage);
 
-	ClassDB::bind_method(D_METHOD("son_death", "data"), &EntityClassData::son_death_bind);
+	ClassDB::bind_method(D_METHOD("notification_sdeath", "data"), &EntityClassData::notification_sdeath_bind);
 
-	ClassDB::bind_method(D_METHOD("son_cooldown_added", "cooldown"), &EntityClassData::son_cooldown_added);
-	ClassDB::bind_method(D_METHOD("son_cooldown_removed", "cooldown"), &EntityClassData::son_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_scooldown_added", "cooldown"), &EntityClassData::notification_scooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_scooldown_removed", "cooldown"), &EntityClassData::notification_scooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("son_category_cooldown_added", "category_cooldown"), &EntityClassData::son_category_cooldown_added);
-	ClassDB::bind_method(D_METHOD("son_category_cooldown_removed", "category_cooldown"), &EntityClassData::son_category_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_scategory_cooldown_added", "category_cooldown"), &EntityClassData::notification_scategory_cooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_scategory_cooldown_removed", "category_cooldown"), &EntityClassData::notification_scategory_cooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("son_gcd_started", "entity", "gcd"), &EntityClassData::son_gcd_started_bind);
-	ClassDB::bind_method(D_METHOD("son_gcd_finished", "entity"), &EntityClassData::son_gcd_finished_bind);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_started", "entity", "gcd"), &EntityClassData::notification_sgcd_started_bind);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_finished", "entity"), &EntityClassData::notification_sgcd_finished_bind);
 
-	ClassDB::bind_method(D_METHOD("son_xp_gained", "entity", "value"), &EntityClassData::son_xp_gained_bind);
-	ClassDB::bind_method(D_METHOD("son_class_level_up", "entity", "value"), &EntityClassData::son_class_level_up_bind);
-	ClassDB::bind_method(D_METHOD("son_character_level_up", "entity", "value"), &EntityClassData::son_character_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_sxp_gained", "entity", "value"), &EntityClassData::notification_sxp_gained_bind);
+	ClassDB::bind_method(D_METHOD("notification_sclass_level_up", "entity", "value"), &EntityClassData::notification_sclass_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_scharacter_level_up", "entity", "value"), &EntityClassData::notification_scharacter_level_up_bind);
 
-	ClassDB::bind_method(D_METHOD("son_entity_resource_added", "resource"), &EntityClassData::son_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("son_entity_resource_removed", "resource"), &EntityClassData::son_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_added", "resource"), &EntityClassData::notification_sentity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_removed", "resource"), &EntityClassData::notification_sentity_resource_removed);
 
-	BIND_VMETHOD(MethodInfo("_son_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_sdeath", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_son_cooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_son_cooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
 
-	BIND_VMETHOD(MethodInfo("_son_category_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
-	BIND_VMETHOD(MethodInfo("_son_category_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scategory_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scategory_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
 
-	BIND_VMETHOD(MethodInfo("_son_gcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_son_gcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_son_xp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_class_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_character_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sxp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sclass_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_scharacter_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
 
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
 
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
 
 	BIND_VMETHOD(MethodInfo("_setup_resources", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
 	//Clientside Event Handlers
-	ClassDB::bind_method(D_METHOD("con_death", "data"), &EntityClassData::con_death_bind);
+	ClassDB::bind_method(D_METHOD("notification_cdeath", "data"), &EntityClassData::notification_cdeath_bind);
 
-	ClassDB::bind_method(D_METHOD("con_cooldown_added", "cooldown"), &EntityClassData::con_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_cooldown_removed", "cooldown"), &EntityClassData::con_cooldown_removed);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_added", "cooldown"), &EntityClassData::con_category_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_removed", "cooldown"), &EntityClassData::con_category_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_added", "cooldown"), &EntityClassData::notification_ccooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_removed", "cooldown"), &EntityClassData::notification_ccooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_added", "cooldown"), &EntityClassData::notification_ccategory_cooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_removed", "cooldown"), &EntityClassData::notification_ccategory_cooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("con_gcd_started", "entity", "gcd"), &EntityClassData::con_gcd_started_bind);
-	ClassDB::bind_method(D_METHOD("con_gcd_finished", "entity"), &EntityClassData::con_gcd_finished_bind);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_started", "entity", "gcd"), &EntityClassData::notification_cgcd_started_bind);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_finished", "entity"), &EntityClassData::notification_cgcd_finished_bind);
 
-	ClassDB::bind_method(D_METHOD("con_xp_gained", "entity", "value"), &EntityClassData::con_xp_gained_bind);
-	ClassDB::bind_method(D_METHOD("con_class_level_up", "entity", "value"), &EntityClassData::con_class_level_up_bind);
-	ClassDB::bind_method(D_METHOD("con_character_level_up", "entity", "value"), &EntityClassData::con_character_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_cxp_gained", "entity", "value"), &EntityClassData::notification_cxp_gained_bind);
+	ClassDB::bind_method(D_METHOD("notification_cclass_level_up", "entity", "value"), &EntityClassData::notification_cclass_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_ccharacter_level_up", "entity", "value"), &EntityClassData::notification_ccharacter_level_up_bind);
 
-	ClassDB::bind_method(D_METHOD("con_entity_resource_added", "resource"), &EntityClassData::con_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("con_entity_resource_removed", "resource"), &EntityClassData::con_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_added", "resource"), &EntityClassData::notification_centity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_removed", "resource"), &EntityClassData::notification_centity_resource_removed);
 
-	BIND_VMETHOD(MethodInfo("_con_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_cdeath", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_con_gcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_con_gcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_con_xp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_class_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_character_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cxp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cclass_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_ccharacter_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
 
 	//Equipment
 	BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_equip_should_deny", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance")));
diff --git a/entities/data/entity_class_data.h b/entities/data/entity_class_data.h
index af5ea1b..deba270 100644
--- a/entities/data/entity_class_data.h
+++ b/entities/data/entity_class_data.h
@@ -152,29 +152,29 @@ public:
 	void notification_scast(int what, Ref<SpellCastInfo> info);
 	void notification_sdamage(int what, Ref<SpellDamageInfo> info);
 
-	void son_death(Entity *entity);
-	void son_death_bind(Node *entity);
+	void notification_sdeath(Entity *entity);
+	void notification_sdeath_bind(Node *entity);
 
-	void son_cooldown_added(Ref<Cooldown> cooldown);
-	void son_cooldown_removed(Ref<Cooldown> cooldown);
+	void notification_scooldown_added(Ref<Cooldown> cooldown);
+	void notification_scooldown_removed(Ref<Cooldown> cooldown);
 
-	void son_category_cooldown_added(Ref<CategoryCooldown> category_cooldown);
-	void son_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
+	void notification_scategory_cooldown_added(Ref<CategoryCooldown> category_cooldown);
+	void notification_scategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
 
-	void son_gcd_started(Entity *entity, float gcd);
-	void son_gcd_finished(Entity *entity);
-	void son_gcd_started_bind(Node *entity, float gcd);
-	void son_gcd_finished_bind(Node *entity);
+	void notification_sgcd_started(Entity *entity, float gcd);
+	void notification_sgcd_finished(Entity *entity);
+	void notification_sgcd_started_bind(Node *entity, float gcd);
+	void notification_sgcd_finished_bind(Node *entity);
 
-	void son_xp_gained(Entity *entity, int value);
-	void son_xp_gained_bind(Node *entity, int value);
-	void son_class_level_up(Entity *entity, int value);
-	void son_class_level_up_bind(Node *entity, int value);
-	void son_character_level_up(Entity *entity, int value);
-	void son_character_level_up_bind(Node *entity, int value);
+	void notification_sxp_gained(Entity *entity, int value);
+	void notification_sxp_gained_bind(Node *entity, int value);
+	void notification_sclass_level_up(Entity *entity, int value);
+	void notification_sclass_level_up_bind(Node *entity, int value);
+	void notification_scharacter_level_up(Entity *entity, int value);
+	void notification_scharacter_level_up_bind(Node *entity, int value);
 
-	void son_entity_resource_added(Ref<EntityResource> resource);
-	void son_entity_resource_removed(Ref<EntityResource> resource);
+	void notification_sentity_resource_added(Ref<EntityResource> resource);
+	void notification_sentity_resource_removed(Ref<EntityResource> resource);
 
 	//Clientside Event Handlers
 	void notification_caura(int what, Ref<AuraData> data);
@@ -182,28 +182,28 @@ public:
 	void notification_ccast(int what, Ref<SpellCastInfo> info);
 	void notification_cdamage(int what, Ref<SpellDamageInfo> info);
 
-	void con_death(Entity *entity);
-	void con_death_bind(Node *entity);
+	void notification_cdeath(Entity *entity);
+	void notification_cdeath_bind(Node *entity);
 
-	void con_cooldown_added(Ref<Cooldown> cooldown);
-	void con_cooldown_removed(Ref<Cooldown> cooldown);
-	void con_category_cooldown_added(Ref<CategoryCooldown> category_cooldown);
-	void con_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
+	void notification_ccooldown_added(Ref<Cooldown> cooldown);
+	void notification_ccooldown_removed(Ref<Cooldown> cooldown);
+	void notification_ccategory_cooldown_added(Ref<CategoryCooldown> category_cooldown);
+	void notification_ccategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
 
-	void con_gcd_started(Entity *entity, float gcd);
-	void con_gcd_finished(Entity *entity);
-	void con_gcd_started_bind(Node *entity, float gcd);
-	void con_gcd_finished_bind(Node *entity);
+	void notification_cgcd_started(Entity *entity, float gcd);
+	void notification_cgcd_finished(Entity *entity);
+	void notification_cgcd_started_bind(Node *entity, float gcd);
+	void notification_cgcd_finished_bind(Node *entity);
 
-	void con_xp_gained(Entity *entity, int value);
-	void con_xp_gained_bind(Node *entity, int value);
-	void con_class_level_up(Entity *entity, int value);
-	void con_class_level_up_bind(Node *entity, int value);
-	void con_character_level_up(Entity *entity, int value);
-	void con_character_level_up_bind(Node *entity, int value);
+	void notification_cxp_gained(Entity *entity, int value);
+	void notification_cxp_gained_bind(Node *entity, int value);
+	void notification_cclass_level_up(Entity *entity, int value);
+	void notification_cclass_level_up_bind(Node *entity, int value);
+	void notification_ccharacter_level_up(Entity *entity, int value);
+	void notification_ccharacter_level_up_bind(Node *entity, int value);
 
-	void con_entity_resource_added(Ref<EntityResource> resource);
-	void con_entity_resource_removed(Ref<EntityResource> resource);
+	void notification_centity_resource_added(Ref<EntityResource> resource);
+	void notification_centity_resource_removed(Ref<EntityResource> resource);
 
 	//Equipment
 
diff --git a/entities/data/entity_data.cpp b/entities/data/entity_data.cpp
index 716eb43..2d8591d 100644
--- a/entities/data/entity_data.cpp
+++ b/entities/data/entity_data.cpp
@@ -386,95 +386,95 @@ void EntityData::notification_sdamage(int what, Ref<SpellDamageInfo> info) {
 		call("_notification_sdamage", what, info);
 }
 
-void EntityData::son_death(Entity *entity) {
+void EntityData::notification_sdeath(Entity *entity) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_death(entity);
+		_entity_class_data->notification_sdeath(entity);
 
-	if (has_method("_son_death"))
-		call("_son_death", entity);
+	if (has_method("_notification_sdeath"))
+		call("_notification_sdeath", entity);
 }
 
-void EntityData::son_death_bind(Node *entity) {
+void EntityData::notification_sdeath_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_death(e);
+	notification_sdeath(e);
 }
 
-void EntityData::son_cooldown_added(Ref<Cooldown> cooldown) {
+void EntityData::notification_scooldown_added(Ref<Cooldown> cooldown) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_cooldown_added(cooldown);
+		_entity_class_data->notification_scooldown_added(cooldown);
 
-	if (has_method("_son_cooldown_added"))
-		call("_son_cooldown_added", cooldown);
+	if (has_method("_notification_scooldown_added"))
+		call("_notification_scooldown_added", cooldown);
 }
-void EntityData::son_cooldown_removed(Ref<Cooldown> cooldown) {
+void EntityData::notification_scooldown_removed(Ref<Cooldown> cooldown) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_cooldown_removed(cooldown);
+		_entity_class_data->notification_scooldown_removed(cooldown);
 
-	if (has_method("_son_cooldown_removed"))
-		call("_son_cooldown_removed", cooldown);
+	if (has_method("_notification_scooldown_removed"))
+		call("_notification_scooldown_removed", cooldown);
 }
 
-void EntityData::son_category_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
+void EntityData::notification_scategory_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_category_cooldown_added(category_cooldown);
+		_entity_class_data->notification_scategory_cooldown_added(category_cooldown);
 
-	if (has_method("_son_category_cooldown_added"))
-		call("_son_category_cooldown_added", category_cooldown);
+	if (has_method("_notification_scategory_cooldown_added"))
+		call("_notification_scategory_cooldown_added", category_cooldown);
 }
-void EntityData::son_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
+void EntityData::notification_scategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_category_cooldown_removed(category_cooldown);
+		_entity_class_data->notification_scategory_cooldown_removed(category_cooldown);
 
-	if (has_method("_son_category_cooldown_removed"))
-		call("_son_category_cooldown_removed", category_cooldown);
+	if (has_method("_notification_scategory_cooldown_removed"))
+		call("_notification_scategory_cooldown_removed", category_cooldown);
 }
 
-void EntityData::son_gcd_started(Entity *entity, float gcd) {
+void EntityData::notification_sgcd_started(Entity *entity, float gcd) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_gcd_started(entity, gcd);
+		_entity_class_data->notification_sgcd_started(entity, gcd);
 
-	if (has_method("_son_gcd_started"))
-		call("_son_gcd_started", entity, gcd);
+	if (has_method("_notification_sgcd_started"))
+		call("_notification_sgcd_started", entity, gcd);
 }
-void EntityData::son_gcd_finished(Entity *entity) {
+void EntityData::notification_sgcd_finished(Entity *entity) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_gcd_finished(entity);
+		_entity_class_data->notification_sgcd_finished(entity);
 
-	if (has_method("_son_gcd_finished"))
-		call("_son_gcd_finished", entity);
+	if (has_method("_notification_sgcd_finished"))
+		call("_notification_sgcd_finished", entity);
 }
-void EntityData::son_gcd_started_bind(Node *entity, float gcd) {
+void EntityData::notification_sgcd_started_bind(Node *entity, float gcd) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_gcd_started(e, gcd);
+	notification_sgcd_started(e, gcd);
 }
-void EntityData::son_gcd_finished_bind(Node *entity) {
+void EntityData::notification_sgcd_finished_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_gcd_finished(e);
+	notification_sgcd_finished(e);
 }
 
-void EntityData::son_xp_gained(Entity *entity, int value) {
+void EntityData::notification_sxp_gained(Entity *entity, int value) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_xp_gained(entity, value);
+		_entity_class_data->notification_sxp_gained(entity, value);
 
-	if (has_method("_son_xp_gained"))
-		call("_son_xp_gained", entity, value);
+	if (has_method("_notification_sxp_gained"))
+		call("_notification_sxp_gained", entity, value);
 }
-void EntityData::son_xp_gained_bind(Node *entity, int value) {
+void EntityData::notification_sxp_gained_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -485,17 +485,17 @@ void EntityData::son_xp_gained_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_xp_gained(e, value);
+	notification_sxp_gained(e, value);
 }
 
-void EntityData::son_class_level_up(Entity *entity, int value) {
+void EntityData::notification_sclass_level_up(Entity *entity, int value) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_class_level_up(entity, value);
+		_entity_class_data->notification_sclass_level_up(entity, value);
 
-	if (has_method("_son_class_level_up"))
-		call("_son_class_level_up", entity);
+	if (has_method("_notification_sclass_level_up"))
+		call("_notification_sclass_level_up", entity);
 }
-void EntityData::son_class_level_up_bind(Node *entity, int value) {
+void EntityData::notification_sclass_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -506,17 +506,17 @@ void EntityData::son_class_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_class_level_up(e, value);
+	notification_sclass_level_up(e, value);
 }
 
-void EntityData::son_character_level_up(Entity *entity, int value) {
+void EntityData::notification_scharacter_level_up(Entity *entity, int value) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_character_level_up(entity, value);
+		_entity_class_data->notification_scharacter_level_up(entity, value);
 
-	if (has_method("_son_character_level_up"))
-		call("_son_character_level_up", entity);
+	if (has_method("_notification_scharacter_level_up"))
+		call("_notification_scharacter_level_up", entity);
 }
-void EntityData::son_character_level_up_bind(Node *entity, int value) {
+void EntityData::notification_scharacter_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -527,24 +527,24 @@ void EntityData::son_character_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	son_character_level_up(e, value);
+	notification_scharacter_level_up(e, value);
 }
 
-void EntityData::son_entity_resource_added(Ref<EntityResource> resource) {
+void EntityData::notification_sentity_resource_added(Ref<EntityResource> resource) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->son_entity_resource_added(resource);
+		_entity_class_data->notification_sentity_resource_added(resource);
 
-	if (has_method("_son_entity_resource_added"))
-		call("_son_entity_resource_added", resource);
+	if (has_method("_notification_sentity_resource_added"))
+		call("_notification_sentity_resource_added", resource);
 }
 
-void EntityData::son_entity_resource_removed(Ref<EntityResource> resource) {
+void EntityData::notification_sentity_resource_removed(Ref<EntityResource> resource) {
 	if (_entity_class_data.is_valid()) {
-		_entity_class_data->son_entity_resource_removed(resource);
+		_entity_class_data->notification_sentity_resource_removed(resource);
 	}
 
-	if (has_method("_son_entity_resource_removed"))
-		call("_son_entity_resource_removed", resource);
+	if (has_method("_notification_sentity_resource_removed"))
+		call("_notification_sentity_resource_removed", resource);
 }
 
 //Clientside Event Handlers
@@ -585,104 +585,104 @@ void EntityData::notification_cdamage(int what, Ref<SpellDamageInfo> info) {
 		call("_notification_cdamage", what, info);
 }
 
-void EntityData::con_death(Entity *entity) {
+void EntityData::notification_cdeath(Entity *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_death(entity);
+		_entity_class_data->notification_cdeath(entity);
 
-	if (has_method("_con_death"))
-		call("_con_death", entity);
+	if (has_method("_notification_cdeath"))
+		call("_notification_cdeath", entity);
 }
 
-void EntityData::con_death_bind(Node *entity) {
+void EntityData::notification_cdeath_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_death(e);
+	notification_cdeath(e);
 }
 
-void EntityData::con_cooldown_added(Ref<Cooldown> cooldown) {
+void EntityData::notification_ccooldown_added(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_cooldown_added(cooldown);
+		_entity_class_data->notification_ccooldown_added(cooldown);
 
-	if (has_method("_con_cooldown_added"))
-		call("_con_cooldown_added", cooldown);
+	if (has_method("_notification_ccooldown_added"))
+		call("_notification_ccooldown_added", cooldown);
 }
-void EntityData::con_cooldown_removed(Ref<Cooldown> cooldown) {
+void EntityData::notification_ccooldown_removed(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_cooldown_removed(cooldown);
+		_entity_class_data->notification_ccooldown_removed(cooldown);
 
-	if (has_method("_con_cooldown_removed"))
-		call("_con_cooldown_removed", cooldown);
+	if (has_method("_notification_ccooldown_removed"))
+		call("_notification_ccooldown_removed", cooldown);
 }
-void EntityData::con_category_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
+void EntityData::notification_ccategory_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_category_cooldown_added(category_cooldown);
+		_entity_class_data->notification_ccategory_cooldown_added(category_cooldown);
 
-	if (has_method("_con_category_cooldown_added"))
-		call("_con_category_cooldown_added", category_cooldown);
+	if (has_method("_notification_ccategory_cooldown_added"))
+		call("_notification_ccategory_cooldown_added", category_cooldown);
 }
-void EntityData::con_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
+void EntityData::notification_ccategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_category_cooldown_removed(category_cooldown);
+		_entity_class_data->notification_ccategory_cooldown_removed(category_cooldown);
 
-	if (has_method("_con_category_cooldown_removed"))
-		call("_con_category_cooldown_removed", category_cooldown);
+	if (has_method("_notification_ccategory_cooldown_removed"))
+		call("_notification_ccategory_cooldown_removed", category_cooldown);
 }
 
-void EntityData::con_gcd_started(Entity *entity, float gcd) {
+void EntityData::notification_cgcd_started(Entity *entity, float gcd) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_gcd_started(entity, gcd);
+		_entity_class_data->notification_cgcd_started(entity, gcd);
 
-	if (has_method("_con_gcd_started"))
-		call("_con_gcd_started", entity, gcd);
+	if (has_method("_notification_cgcd_started"))
+		call("_notification_cgcd_started", entity, gcd);
 }
-void EntityData::con_gcd_finished(Entity *entity) {
+void EntityData::notification_cgcd_finished(Entity *entity) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_gcd_finished(entity);
+		_entity_class_data->notification_cgcd_finished(entity);
 
-	if (has_method("_con_gcd_finished"))
-		call("_con_gcd_finished", entity);
+	if (has_method("_notification_cgcd_finished"))
+		call("_notification_cgcd_finished", entity);
 }
-void EntityData::con_gcd_started_bind(Node *entity, float gcd) {
+void EntityData::notification_cgcd_started_bind(Node *entity, float gcd) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_gcd_started(e, gcd);
+	notification_cgcd_started(e, gcd);
 }
-void EntityData::con_gcd_finished_bind(Node *entity) {
+void EntityData::notification_cgcd_finished_bind(Node *entity) {
 	ERR_FAIL_COND(entity == NULL);
 
 	Entity *e = Object::cast_to<Entity>(entity);
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_gcd_finished(e);
+	notification_cgcd_finished(e);
 }
 
-void EntityData::con_xp_gained(Entity *entity, int value) {
+void EntityData::notification_cxp_gained(Entity *entity, int value) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_xp_gained(entity, value);
+		_entity_class_data->notification_cxp_gained(entity, value);
 
-	if (has_method("_con_xp_gained"))
-		call("_con_xp_gained", entity, value);
+	if (has_method("_notification_cxp_gained"))
+		call("_notification_cxp_gained", entity, value);
 }
-void EntityData::con_xp_gained_bind(Node *entity, int value) {
+void EntityData::notification_cxp_gained_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -693,17 +693,17 @@ void EntityData::con_xp_gained_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_xp_gained(e, value);
+	notification_cxp_gained(e, value);
 }
 
-void EntityData::con_class_level_up(Entity *entity, int value) {
+void EntityData::notification_cclass_level_up(Entity *entity, int value) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_class_level_up(entity, value);
+		_entity_class_data->notification_cclass_level_up(entity, value);
 
-	if (has_method("_con_class_level_up"))
-		call("_con_class_level_up", entity);
+	if (has_method("_notification_cclass_level_up"))
+		call("_notification_cclass_level_up", entity);
 }
-void EntityData::con_class_level_up_bind(Node *entity, int value) {
+void EntityData::notification_cclass_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -714,17 +714,17 @@ void EntityData::con_class_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_class_level_up(e, value);
+	notification_cclass_level_up(e, value);
 }
 
-void EntityData::con_character_level_up(Entity *entity, int value) {
+void EntityData::notification_ccharacter_level_up(Entity *entity, int value) {
 	if (_entity_class_data.is_valid())
-		_entity_class_data->con_character_level_up(entity, value);
+		_entity_class_data->notification_ccharacter_level_up(entity, value);
 
-	if (has_method("_con_character_level_up"))
-		call("_con_character_level_up", entity);
+	if (has_method("_notification_ccharacter_level_up"))
+		call("_notification_ccharacter_level_up", entity);
 }
-void EntityData::con_character_level_up_bind(Node *entity, int value) {
+void EntityData::notification_ccharacter_level_up_bind(Node *entity, int value) {
 #if VERSION_MAJOR < 4
 	ERR_FAIL_COND(!ObjectDB::instance_validate(entity));
 #else
@@ -735,25 +735,25 @@ void EntityData::con_character_level_up_bind(Node *entity, int value) {
 
 	ERR_FAIL_COND(e == NULL);
 
-	con_character_level_up(e, value);
+	notification_ccharacter_level_up(e, value);
 }
 
-void EntityData::con_entity_resource_added(Ref<EntityResource> resource) {
+void EntityData::notification_centity_resource_added(Ref<EntityResource> resource) {
 	if (_entity_class_data.is_valid()) {
-		_entity_class_data->con_entity_resource_added(resource);
+		_entity_class_data->notification_centity_resource_added(resource);
 	}
 
-	if (has_method("_con_entity_resource_added"))
-		call("_con_entity_resource_added", resource);
+	if (has_method("_notification_centity_resource_added"))
+		call("_notification_centity_resource_added", resource);
 }
 
-void EntityData::con_entity_resource_removed(Ref<EntityResource> resource) {
+void EntityData::notification_centity_resource_removed(Ref<EntityResource> resource) {
 	if (_entity_class_data.is_valid()) {
-		_entity_class_data->con_entity_resource_removed(resource);
+		_entity_class_data->notification_centity_resource_removed(resource);
 	}
 
-	if (has_method("_con_entity_resource_removed"))
-		call("_con_entity_resource_removed", resource);
+	if (has_method("_notification_centity_resource_removed"))
+		call("_notification_centity_resource_removed", resource);
 }
 
 //Equipment
@@ -926,83 +926,83 @@ void EntityData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("notification_ccast", "what", "info"), &EntityData::notification_ccast);
 	ClassDB::bind_method(D_METHOD("notification_cdamage", "what", "info"), &EntityData::notification_cdamage);
 
-	ClassDB::bind_method(D_METHOD("son_death", "data"), &EntityData::son_death_bind);
+	ClassDB::bind_method(D_METHOD("notification_sdeath", "data"), &EntityData::notification_sdeath_bind);
 
-	ClassDB::bind_method(D_METHOD("son_cooldown_added", "cooldown"), &EntityData::son_cooldown_added);
-	ClassDB::bind_method(D_METHOD("son_cooldown_removed", "cooldown"), &EntityData::son_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_scooldown_added", "cooldown"), &EntityData::notification_scooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_scooldown_removed", "cooldown"), &EntityData::notification_scooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("son_category_cooldown_added", "category_cooldown"), &EntityData::son_category_cooldown_added);
-	ClassDB::bind_method(D_METHOD("son_category_cooldown_removed", "category_cooldown"), &EntityData::son_category_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_scategory_cooldown_added", "category_cooldown"), &EntityData::notification_scategory_cooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_scategory_cooldown_removed", "category_cooldown"), &EntityData::notification_scategory_cooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("son_gcd_started", "entity", "gcd"), &EntityData::son_gcd_started_bind);
-	ClassDB::bind_method(D_METHOD("son_gcd_finished", "entity"), &EntityData::son_gcd_finished_bind);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_started", "entity", "gcd"), &EntityData::notification_sgcd_started_bind);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_finished", "entity"), &EntityData::notification_sgcd_finished_bind);
 
-	ClassDB::bind_method(D_METHOD("son_xp_gained", "entity", "value"), &EntityData::son_xp_gained_bind);
-	ClassDB::bind_method(D_METHOD("son_class_level_up", "entity", "value"), &EntityData::son_class_level_up_bind);
-	ClassDB::bind_method(D_METHOD("son_character_level_up", "entity", "value"), &EntityData::son_character_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_sxp_gained", "entity", "value"), &EntityData::notification_sxp_gained_bind);
+	ClassDB::bind_method(D_METHOD("notification_sclass_level_up", "entity", "value"), &EntityData::notification_sclass_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_scharacter_level_up", "entity", "value"), &EntityData::notification_scharacter_level_up_bind);
 
-	ClassDB::bind_method(D_METHOD("son_entity_resource_added", "resource"), &EntityData::son_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("son_entity_resource_removed", "resource"), &EntityData::son_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_added", "resource"), &EntityData::notification_sentity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_removed", "resource"), &EntityData::notification_sentity_resource_removed);
 
-	BIND_VMETHOD(MethodInfo("_son_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_sdeath", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
 	BIND_VMETHOD(MethodInfo("_sai_follow", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 	BIND_VMETHOD(MethodInfo("_sai_rest", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 	BIND_VMETHOD(MethodInfo("_sai_regenerate", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 	BIND_VMETHOD(MethodInfo("_sai_attack", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_son_cooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_son_cooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
 
-	BIND_VMETHOD(MethodInfo("_son_category_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
-	BIND_VMETHOD(MethodInfo("_son_category_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scategory_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_scategory_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
 
-	BIND_VMETHOD(MethodInfo("_son_gcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_son_gcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_son_xp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_class_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_character_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sxp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sclass_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_scharacter_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
 
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
 
 	BIND_VMETHOD(MethodInfo("_setup_resources", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
 	//Clientside Event Handlers
-	ClassDB::bind_method(D_METHOD("con_death", "data"), &EntityData::con_death_bind);
+	ClassDB::bind_method(D_METHOD("notification_cdeath", "data"), &EntityData::notification_cdeath_bind);
 
-	ClassDB::bind_method(D_METHOD("con_cooldown_added", "cooldown"), &EntityData::con_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_cooldown_removed", "cooldown"), &EntityData::con_cooldown_removed);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_added", "cooldown"), &EntityData::con_category_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_removed", "cooldown"), &EntityData::con_category_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_added", "cooldown"), &EntityData::notification_ccooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_removed", "cooldown"), &EntityData::notification_ccooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_added", "cooldown"), &EntityData::notification_ccategory_cooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_removed", "cooldown"), &EntityData::notification_ccategory_cooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("con_gcd_started", "entity", "gcd"), &EntityData::con_gcd_started_bind);
-	ClassDB::bind_method(D_METHOD("con_gcd_finished", "entity"), &EntityData::con_gcd_finished_bind);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_started", "entity", "gcd"), &EntityData::notification_cgcd_started_bind);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_finished", "entity"), &EntityData::notification_cgcd_finished_bind);
 
-	ClassDB::bind_method(D_METHOD("con_xp_gained", "entity", "value"), &EntityData::con_xp_gained_bind);
-	ClassDB::bind_method(D_METHOD("con_class_level_up", "entity", "value"), &EntityData::con_class_level_up_bind);
-	ClassDB::bind_method(D_METHOD("con_character_level_up", "entity", "value"), &EntityData::con_character_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_cxp_gained", "entity", "value"), &EntityData::notification_cxp_gained_bind);
+	ClassDB::bind_method(D_METHOD("notification_cclass_level_up", "entity", "value"), &EntityData::notification_cclass_level_up_bind);
+	ClassDB::bind_method(D_METHOD("notification_ccharacter_level_up", "entity", "value"), &EntityData::notification_ccharacter_level_up_bind);
 
-	ClassDB::bind_method(D_METHOD("con_entity_resource_added", "resource"), &EntityData::con_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("con_entity_resource_removed", "resource"), &EntityData::con_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_added", "resource"), &EntityData::notification_centity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_removed", "resource"), &EntityData::notification_centity_resource_removed);
 
-	BIND_VMETHOD(MethodInfo("_con_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_cdeath", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_con_cooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_con_cooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("_con_category_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
-	BIND_VMETHOD(MethodInfo("_con_category_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccategory_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("_notification_ccategory_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
 
-	BIND_VMETHOD(MethodInfo("_con_gcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_con_gcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 
-	BIND_VMETHOD(MethodInfo("_con_xp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_class_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_character_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cxp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cclass_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_ccharacter_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
 
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
 
 	//Equipment
 
diff --git a/entities/data/entity_data.h b/entities/data/entity_data.h
index eeb5d4a..bf76c41 100644
--- a/entities/data/entity_data.h
+++ b/entities/data/entity_data.h
@@ -156,29 +156,29 @@ public:
 	void notification_scast(int what, Ref<SpellCastInfo> info);
 	void notification_sdamage(int what, Ref<SpellDamageInfo> info);
 
-	void son_death(Entity *entity);
-	void son_death_bind(Node *entity);
+	void notification_sdeath(Entity *entity);
+	void notification_sdeath_bind(Node *entity);
 
-	void son_cooldown_added(Ref<Cooldown> cooldown);
-	void son_cooldown_removed(Ref<Cooldown> cooldown);
+	void notification_scooldown_added(Ref<Cooldown> cooldown);
+	void notification_scooldown_removed(Ref<Cooldown> cooldown);
 
-	void son_category_cooldown_added(Ref<CategoryCooldown> category_cooldown);
-	void son_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
+	void notification_scategory_cooldown_added(Ref<CategoryCooldown> category_cooldown);
+	void notification_scategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
 
-	void son_gcd_started(Entity *entity, float gcd);
-	void son_gcd_finished(Entity *entity);
-	void son_gcd_started_bind(Node *entity, float gcd);
-	void son_gcd_finished_bind(Node *entity);
+	void notification_sgcd_started(Entity *entity, float gcd);
+	void notification_sgcd_finished(Entity *entity);
+	void notification_sgcd_started_bind(Node *entity, float gcd);
+	void notification_sgcd_finished_bind(Node *entity);
 
-	void son_xp_gained(Entity *entity, int value);
-	void son_xp_gained_bind(Node *entity, int value);
-	void son_class_level_up(Entity *entity, int value);
-	void son_class_level_up_bind(Node *entity, int value);
-	void son_character_level_up(Entity *entity, int value);
-	void son_character_level_up_bind(Node *entity, int value);
+	void notification_sxp_gained(Entity *entity, int value);
+	void notification_sxp_gained_bind(Node *entity, int value);
+	void notification_sclass_level_up(Entity *entity, int value);
+	void notification_sclass_level_up_bind(Node *entity, int value);
+	void notification_scharacter_level_up(Entity *entity, int value);
+	void notification_scharacter_level_up_bind(Node *entity, int value);
 
-	void son_entity_resource_added(Ref<EntityResource> resource);
-	void son_entity_resource_removed(Ref<EntityResource> resource);
+	void notification_sentity_resource_added(Ref<EntityResource> resource);
+	void notification_sentity_resource_removed(Ref<EntityResource> resource);
 
 	//Clientside Event Handlers
 	void notification_caura(int what, Ref<AuraData> data);
@@ -186,28 +186,28 @@ public:
 	void notification_ccast(int what, Ref<SpellCastInfo> info);
 	void notification_cdamage(int what, Ref<SpellDamageInfo> info);
 
-	void con_cooldown_added(Ref<Cooldown> cooldown);
-	void con_cooldown_removed(Ref<Cooldown> cooldown);
-	void con_category_cooldown_added(Ref<CategoryCooldown> category_cooldown);
-	void con_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
+	void notification_ccooldown_added(Ref<Cooldown> cooldown);
+	void notification_ccooldown_removed(Ref<Cooldown> cooldown);
+	void notification_ccategory_cooldown_added(Ref<CategoryCooldown> category_cooldown);
+	void notification_ccategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
 
-	void con_death(Entity *entity);
-	void con_death_bind(Node *entity);
+	void notification_cdeath(Entity *entity);
+	void notification_cdeath_bind(Node *entity);
 
-	void con_gcd_started(Entity *entity, float gcd);
-	void con_gcd_finished(Entity *entity);
-	void con_gcd_started_bind(Node *entity, float gcd);
-	void con_gcd_finished_bind(Node *entity);
+	void notification_cgcd_started(Entity *entity, float gcd);
+	void notification_cgcd_finished(Entity *entity);
+	void notification_cgcd_started_bind(Node *entity, float gcd);
+	void notification_cgcd_finished_bind(Node *entity);
 
-	void con_xp_gained(Entity *entity, int value);
-	void con_xp_gained_bind(Node *entity, int value);
-	void con_class_level_up(Entity *entity, int value);
-	void con_class_level_up_bind(Node *entity, int value);
-	void con_character_level_up(Entity *entity, int value);
-	void con_character_level_up_bind(Node *entity, int value);
+	void notification_cxp_gained(Entity *entity, int value);
+	void notification_cxp_gained_bind(Node *entity, int value);
+	void notification_cclass_level_up(Entity *entity, int value);
+	void notification_cclass_level_up_bind(Node *entity, int value);
+	void notification_ccharacter_level_up(Entity *entity, int value);
+	void notification_ccharacter_level_up_bind(Node *entity, int value);
 
-	void con_entity_resource_added(Ref<EntityResource> resource);
-	void con_entity_resource_removed(Ref<EntityResource> resource);
+	void notification_centity_resource_added(Ref<EntityResource> resource);
+	void notification_centity_resource_removed(Ref<EntityResource> resource);
 
 	//Equipment
 
diff --git a/entities/entity.cpp b/entities/entity.cpp
index a4f4bad..d6c52c6 100644
--- a/entities/entity.cpp
+++ b/entities/entity.cpp
@@ -1542,7 +1542,7 @@ float Entity::gcd_gets() {
 void Entity::gcd_starts(float value) {
 	_s_gcd = value;
 
-	void son_gcd_started();
+	void notification_sgcd_started();
 
 	emit_signal("sgcd_started", _s_gcd);
 
@@ -1552,7 +1552,7 @@ void Entity::gcd_starts(float value) {
 void Entity::gcd_startc(float value) {
 	_c_gcd = value;
 
-	void con_gcd_started();
+	void notification_cgcd_started();
 
 	emit_signal("cgcd_started", _c_gcd);
 }
@@ -1824,7 +1824,7 @@ void Entity::set_stat(int index, Ref<Stat> entry) {
 void Entity::dies() {
 	//serverside
 
-	son_death();
+	notification_sdeath();
 
 	//send an event to client
 	VRPC(diec);
@@ -1834,19 +1834,19 @@ void Entity::dies() {
 }
 
 void Entity::diec() {
-	con_death();
+	notification_cdeath();
 
 	emit_signal("diecd", this);
 }
 
-void Entity::ons_stat_changed(Ref<Stat> stat) {
+void Entity::notification_sstat_changed(Ref<Stat> stat) {
 	for (int i = 0; i < _s_resources.size(); ++i) {
-		_s_resources.get(i)->ons_stat_changed(stat);
+		_s_resources.get(i)->notification_sstat_changed(stat);
 	}
 }
-void Entity::onc_stat_changed(Ref<Stat> stat) {
+void Entity::notification_cstat_changed(Ref<Stat> stat) {
 	for (int i = 0; i < _c_resources.size(); ++i) {
-		_c_resources.get(i)->onc_stat_changed(stat);
+		_c_resources.get(i)->notification_cstat_changed(stat);
 	}
 }
 
@@ -2193,7 +2193,7 @@ void Entity::resource_adds(Ref<EntityResource> resource) {
 
 	resource->ons_added(this);
 
-	son_entity_resource_added(resource);
+	notification_sentity_resource_added(resource);
 
 	VRPCOBJP(resource_addc_rpc, _s_resources.size() - 1, JSON::print(resource->to_dict()), resource_addc, _s_resources.size() - 1, resource);
 }
@@ -2206,7 +2206,7 @@ void Entity::resource_removes(int index) {
 	Ref<EntityResource> res = _s_resources.get(index);
 	_s_resources.remove(index);
 
-	son_entity_resource_removed(res);
+	notification_sentity_resource_removed(res);
 
 	VRPC(resource_removec, index);
 }
@@ -2290,7 +2290,7 @@ void Entity::resource_addc(int index, Ref<EntityResource> resource) {
 
 	resource->onc_added(this);
 
-	con_entity_resource_added(resource);
+	notification_centity_resource_added(resource);
 }
 int Entity::resource_getc_count() {
 	return _c_resources.size();
@@ -2301,7 +2301,7 @@ void Entity::resource_removec(int index) {
 	Ref<EntityResource> res = _c_resources.get(index);
 	_c_resources.remove(index);
 
-	con_entity_resource_removed(res);
+	notification_centity_resource_removed(res);
 }
 void Entity::resource_clearc() {
 	_s_resources.clear();
@@ -2594,7 +2594,7 @@ void Entity::xp_adds(int value) {
 	_s_class_xp += value;
 	_s_character_xp += value;
 
-	son_xp_gained(value);
+	notification_sxp_gained(value);
 
 	ORPC(xp_addc, value);
 }
@@ -2602,7 +2602,7 @@ void Entity::xp_addc(int value) {
 	_c_class_xp += value;
 	_c_character_xp += value;
 
-	con_xp_gained(value);
+	notification_cxp_gained(value);
 }
 
 void Entity::levelup_sclass(int value) {
@@ -2614,14 +2614,14 @@ void Entity::levelup_sclass(int value) {
 
 	_s_class_level += value;
 
-	son_class_level_up(value);
+	notification_sclass_level_up(value);
 
 	VRPC(levelup_cclass, value);
 }
 void Entity::levelup_cclass(int value) {
 	_c_class_level += value;
 
-	con_class_level_up(value);
+	notification_cclass_level_up(value);
 }
 
 void Entity::levelup_scharacter(int value) {
@@ -2633,14 +2633,14 @@ void Entity::levelup_scharacter(int value) {
 
 	_s_character_level += value;
 
-	son_character_level_up(value);
+	notification_scharacter_level_up(value);
 
 	VRPC(levelup_ccharacter, value);
 }
 void Entity::levelup_ccharacter(int value) {
 	_c_character_level += value;
 
-	con_character_level_up(value);
+	notification_ccharacter_level_up(value);
 }
 
 ////    Spell System    ////
@@ -2837,141 +2837,141 @@ void Entity::notification_sdamage(int what, Ref<SpellDamageInfo> info) {
 	}
 }
 
-void Entity::son_death() {
+void Entity::notification_sdeath() {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_death(this);
+		_s_entity_data->notification_sdeath(this);
 	}
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_death(ad);
+		ad->get_aura()->notification_sdeath(ad);
 	}
 
-	if (has_method("_son_death"))
-		call("_son_death");
+	if (has_method("_notification_sdeath"))
+		call("_notification_sdeath");
 }
 
-void Entity::son_cooldown_added(Ref<Cooldown> cooldown) {
+void Entity::notification_scooldown_added(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_cooldown_added(cooldown);
+		_s_entity_data->notification_scooldown_added(cooldown);
 	}
 
-	if (has_method("_son_cooldown_added"))
-		call("_son_cooldown_added", cooldown);
+	if (has_method("_notification_scooldown_added"))
+		call("_notification_scooldown_added", cooldown);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_cooldown_added(ad, cooldown);
+		ad->get_aura()->notification_scooldown_added(ad, cooldown);
 	}
 }
-void Entity::son_cooldown_removed(Ref<Cooldown> cooldown) {
+void Entity::notification_scooldown_removed(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_cooldown_removed(cooldown);
+		_s_entity_data->notification_scooldown_removed(cooldown);
 	}
 
-	if (has_method("_son_cooldown_removed"))
-		call("_son_cooldown_removed", cooldown);
+	if (has_method("_notification_scooldown_removed"))
+		call("_notification_scooldown_removed", cooldown);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_cooldown_removed(ad, cooldown);
+		ad->get_aura()->notification_scooldown_removed(ad, cooldown);
 	}
 }
 
-void Entity::son_category_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
+void Entity::notification_scategory_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_category_cooldown_added(category_cooldown);
+		_s_entity_data->notification_scategory_cooldown_added(category_cooldown);
 	}
 
-	if (has_method("_son_category_cooldown_added"))
-		call("_son_category_cooldown_added", category_cooldown);
+	if (has_method("_notification_scategory_cooldown_added"))
+		call("_notification_scategory_cooldown_added", category_cooldown);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_category_cooldown_added(ad, category_cooldown);
+		ad->get_aura()->notification_scategory_cooldown_added(ad, category_cooldown);
 	}
 }
-void Entity::son_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
+void Entity::notification_scategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_category_cooldown_removed(category_cooldown);
+		_s_entity_data->notification_scategory_cooldown_removed(category_cooldown);
 	}
 
-	if (has_method("_son_category_cooldown_removed"))
-		call("_son_category_cooldown_removed", category_cooldown);
+	if (has_method("_notification_scategory_cooldown_removed"))
+		call("_notification_scategory_cooldown_removed", category_cooldown);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_category_cooldown_removed(ad, category_cooldown);
+		ad->get_aura()->notification_scategory_cooldown_removed(ad, category_cooldown);
 	}
 }
 
-void Entity::son_gcd_started() {
+void Entity::notification_sgcd_started() {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_gcd_started(this, _s_gcd);
+		_s_entity_data->notification_sgcd_started(this, _s_gcd);
 	}
 
-	if (has_method("_son_gcd_started"))
-		call("_son_gcd_started", _s_gcd);
+	if (has_method("_notification_sgcd_started"))
+		call("_notification_sgcd_started", _s_gcd);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_gcd_started(ad, _s_gcd);
+		ad->get_aura()->notification_sgcd_started(ad, _s_gcd);
 	}
 }
-void Entity::son_gcd_finished() {
+void Entity::notification_sgcd_finished() {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_gcd_finished(this);
+		_s_entity_data->notification_sgcd_finished(this);
 	}
 
-	if (has_method("_son_gcd_finished"))
-		call("_son_gcd_finished");
+	if (has_method("_notification_sgcd_finished"))
+		call("_notification_sgcd_finished");
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_gcd_finished(ad);
+		ad->get_aura()->notification_sgcd_finished(ad);
 	}
 }
-void Entity::con_gcd_started() {
+void Entity::notification_cgcd_started() {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_gcd_started(this, _c_gcd);
+		_s_entity_data->notification_cgcd_started(this, _c_gcd);
 	}
 
-	if (has_method("_con_gcd_started"))
-		call("_con_gcd_started", _c_gcd);
+	if (has_method("_notification_cgcd_started"))
+		call("_notification_cgcd_started", _c_gcd);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->con_gcd_started(ad, _c_gcd);
+		ad->get_aura()->notification_cgcd_started(ad, _c_gcd);
 	}
 }
-void Entity::con_gcd_finished() {
+void Entity::notification_cgcd_finished() {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_gcd_finished(this);
+		_s_entity_data->notification_cgcd_finished(this);
 	}
 
-	if (has_method("_con_gcd_finished"))
-		call("_con_gcd_finished");
+	if (has_method("_notification_cgcd_finished"))
+		call("_notification_cgcd_finished");
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->con_gcd_finished(ad);
+		ad->get_aura()->notification_cgcd_finished(ad);
 	}
 }
 
@@ -2995,86 +2995,86 @@ void Entity::son_physics_process(float delta) {
 	}
 }
 
-void Entity::son_xp_gained(int value) {
+void Entity::notification_sxp_gained(int value) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_xp_gained(this, value);
+		_s_entity_data->notification_sxp_gained(this, value);
 	}
 
-	if (has_method("_son_xp_gained"))
-		call("_son_xp_gained", value);
+	if (has_method("_notification_sxp_gained"))
+		call("_notification_sxp_gained", value);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_xp_gained(ad, value);
+		ad->get_aura()->notification_sxp_gained(ad, value);
 	}
 
-	emit_signal("son_xp_gained", this, value);
+	emit_signal("notification_sxp_gained", this, value);
 }
 
-void Entity::son_class_level_up(int value) {
+void Entity::notification_sclass_level_up(int value) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_class_level_up(this, value);
+		_s_entity_data->notification_sclass_level_up(this, value);
 	}
 
-	if (has_method("_son_class_level_up"))
-		call("_son_class_level_up", value);
+	if (has_method("_notification_sclass_level_up"))
+		call("_notification_sclass_level_up", value);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_class_level_up(ad, value);
+		ad->get_aura()->notification_sclass_level_up(ad, value);
 	}
 
-	emit_signal("son_class_level_up", this, value);
+	emit_signal("notification_sclass_level_up", this, value);
 }
 
-void Entity::son_character_level_up(int value) {
+void Entity::notification_scharacter_level_up(int value) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_character_level_up(this, value);
+		_s_entity_data->notification_scharacter_level_up(this, value);
 	}
 
-	if (has_method("_son_character_level_up"))
-		call("_son_character_level_up", value);
+	if (has_method("_notification_scharacter_level_up"))
+		call("_notification_scharacter_level_up", value);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_character_level_up(ad, value);
+		ad->get_aura()->notification_scharacter_level_up(ad, value);
 	}
 
-	emit_signal("son_character_level_up", this, value);
+	emit_signal("notification_scharacter_level_up", this, value);
 }
 
-void Entity::son_entity_resource_added(Ref<EntityResource> resource) {
+void Entity::notification_sentity_resource_added(Ref<EntityResource> resource) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_entity_resource_added(resource);
+		_s_entity_data->notification_sentity_resource_added(resource);
 	}
 
-	if (has_method("_son_entity_resource_added"))
-		call("_son_entity_resource_added", resource);
+	if (has_method("_notification_sentity_resource_added"))
+		call("_notification_sentity_resource_added", resource);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_entity_resource_added(ad, resource);
+		ad->get_aura()->notification_sentity_resource_added(ad, resource);
 	}
 
 	emit_signal("sentity_resource_added", resource);
 }
 
-void Entity::son_entity_resource_removed(Ref<EntityResource> resource) {
+void Entity::notification_sentity_resource_removed(Ref<EntityResource> resource) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->son_entity_resource_removed(resource);
+		_s_entity_data->notification_sentity_resource_removed(resource);
 	}
 
-	if (has_method("_son_entity_resource_removed"))
-		call("_son_entity_resource_removed", resource);
+	if (has_method("_notification_sentity_resource_removed"))
+		call("_notification_sentity_resource_removed", resource);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->son_entity_resource_removed(ad, resource);
+		ad->get_aura()->notification_sentity_resource_removed(ad, resource);
 	}
 
 	emit_signal("sentity_resource_removed", resource);
@@ -3417,30 +3417,30 @@ void Entity::moved() {
 		call("_moved");
 }
 
-void Entity::onc_mouse_enter() {
-	if (has_method("_onc_mouse_enter"))
-		call("_onc_mouse_enter");
+void Entity::notification_cmouse_enter() {
+	if (has_method("_notification_cmouse_enter"))
+		call("_notification_cmouse_enter");
 
-	emit_signal("onc_mouse_entered");
+	emit_signal("notification_cmouse_entered");
 }
-void Entity::onc_mouse_exit() {
-	if (has_method("_onc_mouse_exit"))
-		call("_onc_mouse_exit");
+void Entity::notification_cmouse_exit() {
+	if (has_method("_notification_cmouse_exit"))
+		call("_notification_cmouse_exit");
 
-	emit_signal("onc_mouse_exited");
+	emit_signal("notification_cmouse_exited");
 }
 
-void Entity::onc_targeted() {
-	if (has_method("_onc_targeted"))
-		call("_onc_targeted");
+void Entity::notification_ctargeted() {
+	if (has_method("_notification_ctargeted"))
+		call("_notification_ctargeted");
 
-	emit_signal("onc_targeted");
+	emit_signal("notification_ctargeted");
 }
-void Entity::onc_untargeted() {
-	if (has_method("_onc_untargeted"))
-		call("_onc_untargeted");
+void Entity::notification_cuntargeted() {
+	if (has_method("_notification_cuntargeted"))
+		call("_notification_cuntargeted");
 
-	emit_signal("onc_untargeted");
+	emit_signal("notification_cuntargeted");
 }
 
 void Entity::notification_caura(int what, Ref<AuraData> data) {
@@ -3520,166 +3520,166 @@ void Entity::notification_cdamage(int what, Ref<SpellDamageInfo> info) {
 	emit_signal("notification_cdamage", this, what, info);
 }
 
-void Entity::con_death() {
+void Entity::notification_cdeath() {
 	if (_c_entity_data.is_valid()) {
-		_c_entity_data->con_death(this);
+		_c_entity_data->notification_cdeath(this);
 	}
 
 	for (int i = 0; i < _c_auras.size(); ++i) {
 		Ref<AuraData> ad = _c_auras.get(i);
 
-		ad->get_aura()->con_death(ad);
+		ad->get_aura()->notification_cdeath(ad);
 	}
 
-	if (has_method("_con_death"))
-		call("_con_death");
+	if (has_method("_notification_cdeath"))
+		call("_notification_cdeath");
 }
 
-void Entity::con_cooldown_added(Ref<Cooldown> cooldown) {
+void Entity::notification_ccooldown_added(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
 	if (_c_entity_data.is_valid()) {
-		_c_entity_data->con_cooldown_added(cooldown);
+		_c_entity_data->notification_ccooldown_added(cooldown);
 	}
 
 	for (int i = 0; i < _c_auras.size(); ++i) {
 		Ref<AuraData> ad = _c_auras.get(i);
 
-		ad->get_aura()->con_cooldown_added(ad, cooldown);
+		ad->get_aura()->notification_ccooldown_added(ad, cooldown);
 	}
 
-	if (has_method("_con_cooldown_added"))
-		call("_con_cooldown_added", cooldown);
+	if (has_method("_notification_ccooldown_added"))
+		call("_notification_ccooldown_added", cooldown);
 }
-void Entity::con_cooldown_removed(Ref<Cooldown> cooldown) {
+void Entity::notification_ccooldown_removed(Ref<Cooldown> cooldown) {
 	ERR_FAIL_COND(!cooldown.is_valid());
 
 	if (_c_entity_data.is_valid()) {
-		_c_entity_data->con_cooldown_removed(cooldown);
+		_c_entity_data->notification_ccooldown_removed(cooldown);
 	}
 
 	for (int i = 0; i < _c_auras.size(); ++i) {
 		Ref<AuraData> ad = _c_auras.get(i);
 
-		ad->get_aura()->con_cooldown_removed(ad, cooldown);
+		ad->get_aura()->notification_ccooldown_removed(ad, cooldown);
 	}
 
-	if (has_method("_con_cooldown_removed"))
-		call("_con_cooldown_removed", cooldown);
+	if (has_method("_notification_ccooldown_removed"))
+		call("_notification_ccooldown_removed", cooldown);
 }
-void Entity::con_category_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
+void Entity::notification_ccategory_cooldown_added(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
 	if (_c_entity_data.is_valid()) {
-		_c_entity_data->con_category_cooldown_added(category_cooldown);
+		_c_entity_data->notification_ccategory_cooldown_added(category_cooldown);
 	}
 
 	for (int i = 0; i < _c_auras.size(); ++i) {
 		Ref<AuraData> ad = _c_auras.get(i);
 
-		ad->get_aura()->con_category_cooldown_added(ad, category_cooldown);
+		ad->get_aura()->notification_ccategory_cooldown_added(ad, category_cooldown);
 	}
 
-	if (has_method("_con_category_cooldown_added"))
-		call("_con_category_cooldown_added", category_cooldown);
+	if (has_method("_notification_ccategory_cooldown_added"))
+		call("_notification_ccategory_cooldown_added", category_cooldown);
 }
-void Entity::con_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
+void Entity::notification_ccategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown) {
 	ERR_FAIL_COND(!category_cooldown.is_valid());
 
 	if (_c_entity_data.is_valid()) {
-		_c_entity_data->con_category_cooldown_removed(category_cooldown);
+		_c_entity_data->notification_ccategory_cooldown_removed(category_cooldown);
 	}
 
 	for (int i = 0; i < _c_auras.size(); ++i) {
 		Ref<AuraData> ad = _c_auras.get(i);
 
-		ad->get_aura()->con_category_cooldown_removed(ad, category_cooldown);
+		ad->get_aura()->notification_ccategory_cooldown_removed(ad, category_cooldown);
 	}
 
-	if (has_method("_con_category_cooldown_removed"))
-		call("_con_category_cooldown_removed", category_cooldown);
+	if (has_method("_notification_ccategory_cooldown_removed"))
+		call("_notification_ccategory_cooldown_removed", category_cooldown);
 }
 
-void Entity::con_xp_gained(int value) {
+void Entity::notification_cxp_gained(int value) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_xp_gained(this, value);
+		_s_entity_data->notification_cxp_gained(this, value);
 	}
 
-	if (has_method("_con_xp_gained"))
-		call("_con_xp_gained", value);
+	if (has_method("_notification_cxp_gained"))
+		call("_notification_cxp_gained", value);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->con_xp_gained(ad, value);
+		ad->get_aura()->notification_cxp_gained(ad, value);
 	}
 
-	emit_signal("con_xp_gained", this, value);
+	emit_signal("notification_cxp_gained", this, value);
 }
 
-void Entity::con_class_level_up(int value) {
+void Entity::notification_cclass_level_up(int value) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_class_level_up(this, value);
+		_s_entity_data->notification_cclass_level_up(this, value);
 	}
 
-	if (has_method("_con_class_level_up"))
-		call("_con_class_level_up", value);
+	if (has_method("_notification_cclass_level_up"))
+		call("_notification_cclass_level_up", value);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->con_class_level_up(ad, value);
+		ad->get_aura()->notification_cclass_level_up(ad, value);
 	}
 
-	emit_signal("con_class_level_up", this, value);
+	emit_signal("notification_cclass_level_up", this, value);
 }
 
-void Entity::con_character_level_up(int value) {
+void Entity::notification_ccharacter_level_up(int value) {
 	if (_s_entity_data.is_valid()) {
-		_s_entity_data->con_character_level_up(this, value);
+		_s_entity_data->notification_ccharacter_level_up(this, value);
 	}
 
-	if (has_method("_con_character_level_up"))
-		call("_con_character_level_up", value);
+	if (has_method("_notification_ccharacter_level_up"))
+		call("_notification_ccharacter_level_up", value);
 
 	for (int i = 0; i < _s_auras.size(); ++i) {
 		Ref<AuraData> ad = _s_auras.get(i);
 
-		ad->get_aura()->con_character_level_up(ad, value);
+		ad->get_aura()->notification_ccharacter_level_up(ad, value);
 	}
 
-	emit_signal("con_character_level_up", this, value);
+	emit_signal("notification_ccharacter_level_up", this, value);
 }
 
-void Entity::con_entity_resource_added(Ref<EntityResource> resource) {
+void Entity::notification_centity_resource_added(Ref<EntityResource> resource) {
 	if (_c_entity_data.is_valid()) {
-		_c_entity_data->con_entity_resource_added(resource);
+		_c_entity_data->notification_centity_resource_added(resource);
 	}
 
-	if (has_method("_con_entity_resource_added"))
-		call("_con_entity_resource_added", resource);
+	if (has_method("_notification_centity_resource_added"))
+		call("_notification_centity_resource_added", resource);
 
 	for (int i = 0; i < _c_auras.size(); ++i) {
 		Ref<AuraData> ad = _c_auras.get(i);
 
-		ad->get_aura()->con_entity_resource_added(ad, resource);
+		ad->get_aura()->notification_centity_resource_added(ad, resource);
 	}
 
 	emit_signal("centity_resource_added", resource);
 }
 
-void Entity::con_entity_resource_removed(Ref<EntityResource> resource) {
+void Entity::notification_centity_resource_removed(Ref<EntityResource> resource) {
 	if (_c_entity_data.is_valid()) {
-		_c_entity_data->con_entity_resource_removed(resource);
+		_c_entity_data->notification_centity_resource_removed(resource);
 	}
 
-	if (has_method("_con_entity_resource_removed"))
-		call("_con_entity_resource_removed", resource);
+	if (has_method("_notification_centity_resource_removed"))
+		call("_notification_centity_resource_removed", resource);
 
 	for (int i = 0; i < _c_auras.size(); ++i) {
 		Ref<AuraData> ad = _c_auras.get(i);
 
-		ad->get_aura()->con_entity_resource_removed(ad, resource);
+		ad->get_aura()->notification_centity_resource_removed(ad, resource);
 	}
 
 	emit_signal("centity_resource_removed", resource);
@@ -3818,7 +3818,7 @@ void Entity::cooldown_adds(int spell_id, float value) {
 
 		cd->set_remaining(value);
 
-		son_cooldown_added(cd);
+		notification_scooldown_added(cd);
 
 		emit_signal("scooldown_added", cd);
 
@@ -3836,7 +3836,7 @@ void Entity::cooldown_adds(int spell_id, float value) {
 	_s_cooldown_map.set(spell_id, cd);
 	_s_cooldowns.push_back(cd);
 
-	son_cooldown_added(cd);
+	notification_scooldown_added(cd);
 
 	emit_signal("scooldown_added", cd);
 
@@ -3859,7 +3859,7 @@ void Entity::cooldown_removes(int spell_id) {
 		}
 	}
 
-	son_cooldown_removed(cd);
+	notification_scooldown_removed(cd);
 
 	emit_signal("scooldown_removed", cd);
 
@@ -3890,7 +3890,7 @@ void Entity::cooldown_addc(int spell_id, float value) {
 
 		cd->set_remaining(value);
 
-		con_cooldown_added(cd);
+		notification_ccooldown_added(cd);
 
 		emit_signal("ccooldown_added", cd);
 
@@ -3906,7 +3906,7 @@ void Entity::cooldown_addc(int spell_id, float value) {
 	_c_cooldown_map.set(spell_id, cd);
 	_c_cooldowns.push_back(cd);
 
-	con_cooldown_added(cd);
+	notification_ccooldown_added(cd);
 
 	emit_signal("ccooldown_added", cd);
 }
@@ -3928,7 +3928,7 @@ void Entity::cooldown_removec(int spell_id) {
 	if (!cd.is_valid())
 		cd.instance();
 
-	con_cooldown_removed(cd);
+	notification_ccooldown_removed(cd);
 
 	emit_signal("ccooldown_removed", cd);
 }
@@ -3967,7 +3967,7 @@ void Entity::category_cooldown_adds(int category_id, float value) {
 			if (cc->get_category_id() == category_id) {
 				cc->set_remaining(value);
 
-				son_category_cooldown_added(cc);
+				notification_scategory_cooldown_added(cc);
 
 				emit_signal("scategory_cooldown_added", cc);
 
@@ -3988,7 +3988,7 @@ void Entity::category_cooldown_adds(int category_id, float value) {
 
 	_s_active_category_cooldowns |= category_id;
 
-	son_category_cooldown_added(cc);
+	notification_scategory_cooldown_added(cc);
 
 	emit_signal("scategory_cooldown_added", cc);
 
@@ -4010,7 +4010,7 @@ void Entity::category_cooldown_removes(int category_id) {
 
 	_s_active_category_cooldowns ^= category_id;
 
-	son_category_cooldown_removed(cc);
+	notification_scategory_cooldown_removed(cc);
 
 	emit_signal("scategory_cooldown_removed", cc);
 
@@ -4051,7 +4051,7 @@ void Entity::category_cooldown_addc(int category_id, float value) {
 			if (cc->get_category_id() == category_id) {
 				cc->set_remaining(value);
 
-				con_category_cooldown_added(cc);
+				notification_ccategory_cooldown_added(cc);
 
 				emit_signal("ccategory_cooldown_added", cc);
 				return;
@@ -4069,7 +4069,7 @@ void Entity::category_cooldown_addc(int category_id, float value) {
 
 	_c_active_category_cooldowns |= category_id;
 
-	con_category_cooldown_added(cc);
+	notification_ccategory_cooldown_added(cc);
 
 	emit_signal("ccategory_cooldown_added", cc);
 }
@@ -4091,7 +4091,7 @@ void Entity::category_cooldown_removec(int category_id) {
 
 	_c_active_category_cooldowns ^= category_id;
 
-	con_category_cooldown_removed(cc);
+	notification_ccategory_cooldown_removed(cc);
 
 	emit_signal("ccategory_cooldown_removed", cc);
 }
@@ -4892,19 +4892,19 @@ Ref<Bag> Entity::gets_bag() const {
 void Entity::sets_bag(const Ref<Bag> bag) {
 	if (_s_bag.is_valid()) {
 #if VERSION_MAJOR < 4
-		_s_bag->disconnect("item_added", this, "item_ons_added");
-		_s_bag->disconnect("item_removed", this, "item_ons_removed");
-		_s_bag->disconnect("item_swapped", this, "items_ons_swapped");
-		_s_bag->disconnect("item_count_changed", this, "item_ons_count_changed");
-		_s_bag->disconnect("overburdened", this, "ons_overburdened");
-		_s_bag->disconnect("overburden_removed", this, "ons_overburden_removed");
+		_s_bag->disconnect("item_added", this, "notification_item_sadded");
+		_s_bag->disconnect("item_removed", this, "notification_item_sremoved");
+		_s_bag->disconnect("item_swapped", this, "notification_items_sswapped");
+		_s_bag->disconnect("item_count_changed", this, "notification_item_sscount_changed");
+		_s_bag->disconnect("overburdened", this, "notification_soverburdened");
+		_s_bag->disconnect("overburden_removed", this, "notification_soverburden_removed");
 #else
-		_s_bag->disconnect("item_added", callable_mp(this, &Entity::item_ons_added));
-		_s_bag->disconnect("item_removed", callable_mp(this, &Entity::item_ons_removed));
-		_s_bag->disconnect("item_swapped", callable_mp(this, &Entity::items_ons_swapped));
-		_s_bag->disconnect("item_count_changed", callable_mp(this, &Entity::item_ons_count_changed));
-		_s_bag->disconnect("overburdened", callable_mp(this, &Entity::ons_overburdened));
-		_s_bag->disconnect("overburden_removed", callable_mp(this, &Entity::ons_overburden_removed));
+		_s_bag->disconnect("item_added", callable_mp(this, &Entity::notification_item_sadded));
+		_s_bag->disconnect("item_removed", callable_mp(this, &Entity::notification_item_sremoved));
+		_s_bag->disconnect("item_swapped", callable_mp(this, &Entity::notification_items_sswapped));
+		_s_bag->disconnect("item_count_changed", callable_mp(this, &Entity::notification_item_sscount_changed));
+		_s_bag->disconnect("overburdened", callable_mp(this, &Entity::notification_soverburdened));
+		_s_bag->disconnect("overburden_removed", callable_mp(this, &Entity::notification_soverburden_removed));
 #endif
 	}
 
@@ -4912,19 +4912,19 @@ void Entity::sets_bag(const Ref<Bag> bag) {
 
 	if (_s_bag.is_valid()) {
 #if VERSION_MAJOR < 4
-		_s_bag->connect("item_added", this, "item_ons_added");
-		_s_bag->connect("item_removed", this, "item_ons_removed");
-		_s_bag->connect("item_swapped", this, "items_ons_swapped");
-		_s_bag->connect("item_count_changed", this, "item_ons_count_changed");
-		_s_bag->connect("overburdened", this, "ons_overburdened");
-		_s_bag->connect("overburden_removed", this, "ons_overburden_removed");
+		_s_bag->connect("item_added", this, "notification_item_sadded");
+		_s_bag->connect("item_removed", this, "notification_item_sremoved");
+		_s_bag->connect("item_swapped", this, "notification_items_sswapped");
+		_s_bag->connect("item_count_changed", this, "notification_item_sscount_changed");
+		_s_bag->connect("overburdened", this, "notification_soverburdened");
+		_s_bag->connect("overburden_removed", this, "notification_soverburden_removed");
 #else
-		_s_bag->connect("item_added", callable_mp(this, &Entity::item_ons_added));
-		_s_bag->connect("item_removed", callable_mp(this, &Entity::item_ons_removed));
-		_s_bag->connect("item_swapped", callable_mp(this, &Entity::items_ons_swapped));
-		_s_bag->connect("item_count_changed", callable_mp(this, &Entity::item_ons_count_changed));
-		_s_bag->connect("overburdened", callable_mp(this, &Entity::ons_overburdened));
-		_s_bag->connect("overburden_removed", callable_mp(this, &Entity::ons_overburden_removed));
+		_s_bag->connect("item_added", callable_mp(this, &Entity::notification_item_sadded));
+		_s_bag->connect("item_removed", callable_mp(this, &Entity::notification_item_sremoved));
+		_s_bag->connect("item_swapped", callable_mp(this, &Entity::notification_items_sswapped));
+		_s_bag->connect("item_count_changed", callable_mp(this, &Entity::notification_item_sscount_changed));
+		_s_bag->connect("overburdened", callable_mp(this, &Entity::notification_soverburdened));
+		_s_bag->connect("overburden_removed", callable_mp(this, &Entity::notification_soverburden_removed));
 #endif
 	}
 
@@ -4952,15 +4952,15 @@ Ref<Bag> Entity::gets_target_bag() const {
 void Entity::sets_target_bag(const Ref<Bag> bag) {
 	if (_s_target_bag.is_valid()) {
 #if VERSION_MAJOR < 4
-		_s_target_bag->disconnect("item_added", this, "target_item_ons_added");
-		_s_target_bag->disconnect("item_removed", this, "target_item_ons_removed");
-		_s_target_bag->disconnect("item_swapped", this, "target_items_ons_swapped");
-		_s_target_bag->disconnect("item_count_changed", this, "target_item_ons_count_changed");
+		_s_target_bag->disconnect("item_added", this, "notification_target_item_sadded");
+		_s_target_bag->disconnect("item_removed", this, "notification_target_item_sremoved");
+		_s_target_bag->disconnect("item_swapped", this, "notification_target_items_sswapped");
+		_s_target_bag->disconnect("item_count_changed", this, "notification_target_item_sscount_changed");
 #else
-		_s_target_bag->disconnect("item_added", callable_mp(this, &Entity::target_item_ons_added));
-		_s_target_bag->disconnect("item_removed", callable_mp(this, &Entity::target_item_ons_removed));
-		_s_target_bag->disconnect("item_swapped", callable_mp(this, &Entity::target_items_ons_swapped));
-		_s_target_bag->disconnect("item_count_changed", callable_mp(this, &Entity::target_item_ons_count_changed));
+		_s_target_bag->disconnect("item_added", callable_mp(this, &Entity::notification_target_item_sadded));
+		_s_target_bag->disconnect("item_removed", callable_mp(this, &Entity::notification_target_item_sremoved));
+		_s_target_bag->disconnect("item_swapped", callable_mp(this, &Entity::notification_target_items_sswapped));
+		_s_target_bag->disconnect("item_count_changed", callable_mp(this, &Entity::notification_target_item_sscount_changed));
 #endif
 	}
 
@@ -4968,15 +4968,15 @@ void Entity::sets_target_bag(const Ref<Bag> bag) {
 
 	if (_s_target_bag.is_valid()) {
 #if VERSION_MAJOR < 4
-		_s_target_bag->connect("item_added", this, "target_item_ons_added");
-		_s_target_bag->connect("item_removed", this, "target_item_ons_removed");
-		_s_target_bag->connect("item_swapped", this, "target_items_ons_swapped");
-		_s_target_bag->connect("item_count_changed", this, "target_item_ons_count_changed");
+		_s_target_bag->connect("item_added", this, "notification_target_item_sadded");
+		_s_target_bag->connect("item_removed", this, "notification_target_item_sremoved");
+		_s_target_bag->connect("item_swapped", this, "notification_target_items_sswapped");
+		_s_target_bag->connect("item_count_changed", this, "notification_target_item_sscount_changed");
 #else
-		_s_target_bag->connect("item_added", callable_mp(this, &Entity::target_item_ons_added));
-		_s_target_bag->connect("item_removed", callable_mp(this, &Entity::target_item_ons_removed));
-		_s_target_bag->connect("item_swapped", callable_mp(this, &Entity::target_items_ons_swapped));
-		_s_target_bag->connect("item_count_changed", callable_mp(this, &Entity::target_item_ons_count_changed));
+		_s_target_bag->connect("item_added", callable_mp(this, &Entity::notification_target_item_sadded));
+		_s_target_bag->connect("item_removed", callable_mp(this, &Entity::notification_target_item_sremoved));
+		_s_target_bag->connect("item_swapped", callable_mp(this, &Entity::notification_target_items_sswapped));
+		_s_target_bag->connect("item_count_changed", callable_mp(this, &Entity::notification_target_item_sscount_changed));
 #endif
 	}
 
@@ -5033,7 +5033,7 @@ void Entity::lootc(int index) {
 	_c_target_bag->remove_item(index);
 }
 
-void Entity::item_ons_added(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
+void Entity::notification_item_sadded(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
 	ORPCOBJP(item_addc_rpc, slot_id, JSON::print(item->to_dict()), item_addc, slot_id, item);
 }
 void Entity::item_addc_rpc(int slot_id, String item_data) {
@@ -5049,7 +5049,7 @@ void Entity::item_addc(int slot_id, Ref<ItemInstance> item) {
 	_c_bag->add_item_at(slot_id, item);
 }
 
-void Entity::item_ons_removed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
+void Entity::notification_item_sremoved(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
 	ORPC(item_removec, slot_id);
 }
 void Entity::item_removes(const int slot_id) {
@@ -5068,7 +5068,7 @@ void Entity::item_crequest_remove(const int slot_id) {
 	RPCS(item_removes, slot_id);
 }
 
-void Entity::items_ons_swapped(Ref<Bag> bag, int slot_id_1, int slot_id_2) {
+void Entity::notification_items_sswapped(Ref<Bag> bag, int slot_id_1, int slot_id_2) {
 	ORPC(items_swapc, slot_id_1, slot_id_2);
 }
 void Entity::items_swaps(int slot_id_1, int slot_id_2) {
@@ -5087,7 +5087,7 @@ void Entity::item_crequest_swap(int slot_id_1, int slot_id_2) {
 	RPCS(items_swaps, slot_id_1, slot_id_2);
 }
 
-void Entity::item_ons_count_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
+void Entity::notification_item_sscount_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
 	ERR_FAIL_COND(!item.is_valid());
 
 	ORPC(item_cchange_count, slot_id, item->get_stack_size());
@@ -5098,14 +5098,14 @@ void Entity::item_cchange_count(int slot_id, int new_count) {
 	_c_bag->set_item_count(slot_id, new_count);
 }
 
-void Entity::ons_overburdened(Ref<Bag> bag) {
+void Entity::notification_soverburdened(Ref<Bag> bag) {
 }
-void Entity::ons_overburden_removed(Ref<Bag> bag) {
+void Entity::notification_soverburden_removed(Ref<Bag> bag) {
 }
 
 //Target Bag
 
-void Entity::target_item_ons_added(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
+void Entity::notification_target_item_sadded(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
 	ORPCOBJP(target_item_addc_rpc, slot_id, JSON::print(item->to_dict()), target_item_addc, slot_id, item);
 }
 void Entity::target_item_addc_rpc(int slot_id, String item_data) {
@@ -5121,7 +5121,7 @@ void Entity::target_item_addc(int slot_id, Ref<ItemInstance> item) {
 	_c_target_bag->add_item_at(slot_id, item);
 }
 
-void Entity::target_item_ons_removed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
+void Entity::notification_target_item_sremoved(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
 	ORPC(target_item_removec, slot_id);
 }
 void Entity::target_item_removes(const int slot_id) {
@@ -5140,7 +5140,7 @@ void Entity::target_remove_crequest_item(const int slot_id) {
 	RPCS(target_item_removes, slot_id);
 }
 
-void Entity::target_items_ons_swapped(Ref<Bag> bag, int slot_id_1, int slot_id_2) {
+void Entity::notification_target_items_sswapped(Ref<Bag> bag, int slot_id_1, int slot_id_2) {
 	ORPC(target_items_cswap, slot_id_1, slot_id_2);
 }
 void Entity::target_items_sswap(int slot_id_1, int slot_id_2) {
@@ -5159,7 +5159,7 @@ void Entity::target_item_crequest_swap(int slot_id_1, int slot_id_2) {
 	RPCS(target_items_sswap, slot_id_1, slot_id_2);
 }
 
-void Entity::target_item_ons_count_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
+void Entity::notification_target_item_sscount_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id) {
 	ERR_FAIL_COND(!item.is_valid());
 
 	ORPC(target_item_cchange_count, slot_id, item->get_stack_size());
@@ -5251,7 +5251,7 @@ void Entity::update(float delta) {
 		if (_s_gcd <= 0) {
 			_s_gcd = 0;
 
-			void son_gcd_finished();
+			void notification_sgcd_finished();
 
 			emit_signal("sgcd_finished");
 		}
@@ -5263,7 +5263,7 @@ void Entity::update(float delta) {
 		if (_c_gcd <= 0) {
 			_c_gcd = 0;
 
-			void con_gcd_finished();
+			void notification_cgcd_finished();
 
 			emit_signal("cgcd_finished");
 		}
@@ -5993,7 +5993,7 @@ void Entity::_crafts(int id) {
 	gets_bag()->add_item(item);
 }
 
-void Entity::_son_xp_gained(int value) {
+void Entity::_notification_sxp_gained(int value) {
 	if (ESS::get_instance()->get_use_class_xp() && ESS::get_instance()->get_automatic_class_levelups()) {
 		if (ESS::get_instance()->get_resource_db()->get_xp_data()->can_class_level_up(gets_class_level())) {
 			int xpr = ESS::get_instance()->get_resource_db()->get_xp_data()->get_class_xp(gets_class_level());
@@ -6015,7 +6015,7 @@ void Entity::_son_xp_gained(int value) {
 	}
 }
 
-void Entity::_son_character_level_up(int level) {
+void Entity::_notification_scharacter_level_up(int level) {
 	if (!gets_entity_data().is_valid())
 		return;
 
@@ -6041,7 +6041,7 @@ void Entity::_son_character_level_up(int level) {
 	}
 }
 
-void Entity::_son_class_level_up(int level) {
+void Entity::_notification_sclass_level_up(int level) {
 	if (!gets_entity_data().is_valid())
 		return;
 
@@ -6067,24 +6067,24 @@ void Entity::_con_target_changed(Node *p_entity, Node *p_old_target) {
 
 #if VERSION_MAJOR < 4
 	if (ObjectDB::instance_validate(old_target))
-		old_target->onc_untargeted();
+		old_target->notification_cuntargeted();
 
 	if (ObjectDB::instance_validate(getc_target())) {
 #else
 	if (old_target != NULL)
-		old_target->onc_untargeted();
+		old_target->notification_cuntargeted();
 
 	if (getc_target() != NULL) {
 #endif
 
-		getc_target()->onc_targeted();
+		getc_target()->notification_ctargeted();
 
 		if (canc_interact())
 			crequest_interact();
 	}
 }
 
-void Entity::_son_death() {
+void Entity::_notification_sdeath() {
 
 	//only if mob
 	/*
@@ -6890,21 +6890,21 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("dies"), &Entity::dies);
 	ClassDB::bind_method(D_METHOD("diec"), &Entity::diec);
 
-	ClassDB::bind_method(D_METHOD("ons_stat_changed", "stat"), &Entity::ons_stat_changed);
-	ClassDB::bind_method(D_METHOD("onc_stat_changed", "stat"), &Entity::onc_stat_changed);
+	ClassDB::bind_method(D_METHOD("notification_sstat_changed", "stat"), &Entity::notification_sstat_changed);
+	ClassDB::bind_method(D_METHOD("notification_cstat_changed", "stat"), &Entity::notification_cstat_changed);
 
 	//EventHandlers
-	BIND_VMETHOD(MethodInfo("_son_death"));
+	BIND_VMETHOD(MethodInfo("_notification_sdeath"));
 
-	BIND_VMETHOD(MethodInfo("_son_gcd_started", PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_son_gcd_finished"));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_started", PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_sgcd_finished"));
 
-	BIND_VMETHOD(MethodInfo("_son_xp_gained", PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_class_level_up", PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_son_character_level_up", PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sxp_gained", PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_sclass_level_up", PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_scharacter_level_up", PropertyInfo(Variant::INT, "value")));
 
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
-	BIND_VMETHOD(MethodInfo("_son_entity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_sentity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
 
 	BIND_VMETHOD(MethodInfo("_son_target_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::OBJECT, "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 	BIND_VMETHOD(MethodInfo("_con_target_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::OBJECT, "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
@@ -6941,13 +6941,13 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("notification_ccast", "what", "info"), &Entity::notification_ccast);
 	ClassDB::bind_method(D_METHOD("notification_cdamage", "what", "info"), &Entity::notification_cdamage);
 
-	ClassDB::bind_method(D_METHOD("son_death"), &Entity::son_death);
+	ClassDB::bind_method(D_METHOD("notification_sdeath"), &Entity::notification_sdeath);
 
-	ClassDB::bind_method(D_METHOD("son_gcd_started"), &Entity::son_gcd_started);
-	ClassDB::bind_method(D_METHOD("son_gcd_finished"), &Entity::son_gcd_finished);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_started"), &Entity::notification_sgcd_started);
+	ClassDB::bind_method(D_METHOD("notification_sgcd_finished"), &Entity::notification_sgcd_finished);
 
-	ClassDB::bind_method(D_METHOD("son_entity_resource_added", "resource"), &Entity::son_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("son_entity_resource_removed", "resource"), &Entity::son_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_added", "resource"), &Entity::notification_sentity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_sentity_resource_removed", "resource"), &Entity::notification_sentity_resource_removed);
 
 	//Talents
 
@@ -7000,22 +7000,22 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("talent_cclear"), &Entity::talent_cclear);
 
 	//Clientside EventHandlers
-	BIND_VMETHOD(MethodInfo("_con_death"));
+	BIND_VMETHOD(MethodInfo("_notification_cdeath"));
 
-	BIND_VMETHOD(MethodInfo("con_cooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("con_cooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
-	BIND_VMETHOD(MethodInfo("con_category_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
-	BIND_VMETHOD(MethodInfo("con_category_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("notification_ccooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("notification_ccooldown_removed", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
+	BIND_VMETHOD(MethodInfo("notification_ccategory_cooldown_added", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
+	BIND_VMETHOD(MethodInfo("notification_ccategory_cooldown_removed", PropertyInfo(Variant::OBJECT, "category_cooldown", PROPERTY_HINT_RESOURCE_TYPE, "CategoryCooldown")));
 
-	BIND_VMETHOD(MethodInfo("_con_gcd_started", PropertyInfo(Variant::REAL, "gcd")));
-	BIND_VMETHOD(MethodInfo("_con_gcd_finished"));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_started", PropertyInfo(Variant::REAL, "gcd")));
+	BIND_VMETHOD(MethodInfo("_notification_cgcd_finished"));
 
-	BIND_VMETHOD(MethodInfo("_con_xp_gained", PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_class_level_up", PropertyInfo(Variant::INT, "value")));
-	BIND_VMETHOD(MethodInfo("_con_character_level_up", PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cxp_gained", PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_cclass_level_up", PropertyInfo(Variant::INT, "value")));
+	BIND_VMETHOD(MethodInfo("_notification_ccharacter_level_up", PropertyInfo(Variant::INT, "value")));
 
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
-	BIND_VMETHOD(MethodInfo("_con_entity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_added", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
+	BIND_VMETHOD(MethodInfo("_notification_centity_resource_removed", PropertyInfo(Variant::OBJECT, "resource", PROPERTY_HINT_RESOURCE_TYPE, "EntityResource")));
 
 	BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "value"), "_canc_interact"));
 	BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "value"), "_cans_interact"));
@@ -7024,22 +7024,22 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("cast_spell_successc", "info"), &Entity::cast_spell_successc);
 	ClassDB::bind_method(D_METHOD("cast_spell_successc_rpc", "data"), &Entity::cast_spell_successc_rpc);
 
-	ClassDB::bind_method(D_METHOD("con_death"), &Entity::con_death);
+	ClassDB::bind_method(D_METHOD("notification_cdeath"), &Entity::notification_cdeath);
 
-	ClassDB::bind_method(D_METHOD("con_cooldown_added", "cooldown"), &Entity::con_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_cooldown_removed", "cooldown"), &Entity::con_cooldown_removed);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_added", "category_cooldown"), &Entity::con_category_cooldown_added);
-	ClassDB::bind_method(D_METHOD("con_category_cooldown_removed", "category_cooldown"), &Entity::con_category_cooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_added", "cooldown"), &Entity::notification_ccooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccooldown_removed", "cooldown"), &Entity::notification_ccooldown_removed);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_added", "category_cooldown"), &Entity::notification_ccategory_cooldown_added);
+	ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_removed", "category_cooldown"), &Entity::notification_ccategory_cooldown_removed);
 
-	ClassDB::bind_method(D_METHOD("con_gcd_started"), &Entity::con_gcd_started);
-	ClassDB::bind_method(D_METHOD("con_gcd_finished"), &Entity::con_gcd_finished);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_started"), &Entity::notification_cgcd_started);
+	ClassDB::bind_method(D_METHOD("notification_cgcd_finished"), &Entity::notification_cgcd_finished);
 
-	ClassDB::bind_method(D_METHOD("con_xp_gained", "value"), &Entity::con_xp_gained);
-	ClassDB::bind_method(D_METHOD("con_class_level_up", "value"), &Entity::con_class_level_up);
-	ClassDB::bind_method(D_METHOD("con_character_level_up", "value"), &Entity::con_character_level_up);
+	ClassDB::bind_method(D_METHOD("notification_cxp_gained", "value"), &Entity::notification_cxp_gained);
+	ClassDB::bind_method(D_METHOD("notification_cclass_level_up", "value"), &Entity::notification_cclass_level_up);
+	ClassDB::bind_method(D_METHOD("notification_ccharacter_level_up", "value"), &Entity::notification_ccharacter_level_up);
 
-	ClassDB::bind_method(D_METHOD("con_entity_resource_added", "resource"), &Entity::con_entity_resource_added);
-	ClassDB::bind_method(D_METHOD("con_entity_resource_removed", "resource"), &Entity::con_entity_resource_removed);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_added", "resource"), &Entity::notification_centity_resource_added);
+	ClassDB::bind_method(D_METHOD("notification_centity_resource_removed", "resource"), &Entity::notification_centity_resource_removed);
 
 	//Modifiers/Requesters
 	ClassDB::bind_method(D_METHOD("sapply_passives_damage_receive", "data"), &Entity::sapply_passives_damage_receive);
@@ -7080,14 +7080,14 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("copen_window", "window_id"), &Entity::copen_window);
 
 	//XP Operations
-	ADD_SIGNAL(MethodInfo("son_xp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	ADD_SIGNAL(MethodInfo("con_xp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	ADD_SIGNAL(MethodInfo("notification_sxp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	ADD_SIGNAL(MethodInfo("notification_cxp_gained", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
 
-	ADD_SIGNAL(MethodInfo("con_class_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	ADD_SIGNAL(MethodInfo("son_class_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	ADD_SIGNAL(MethodInfo("notification_cclass_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	ADD_SIGNAL(MethodInfo("notification_sclass_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
 
-	ADD_SIGNAL(MethodInfo("con_character_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
-	ADD_SIGNAL(MethodInfo("son_character_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	ADD_SIGNAL(MethodInfo("notification_ccharacter_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
+	ADD_SIGNAL(MethodInfo("notification_scharacter_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value")));
 
 	ADD_SIGNAL(MethodInfo("son_class_level_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "level")));
 	ADD_SIGNAL(MethodInfo("con_class_level_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "level")));
@@ -7104,9 +7104,9 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("levelup_scharacter", "value"), &Entity::levelup_scharacter);
 	ClassDB::bind_method(D_METHOD("levelup_ccharacter", "value"), &Entity::levelup_ccharacter);
 
-	ClassDB::bind_method(D_METHOD("son_xp_gained", "value"), &Entity::son_xp_gained);
-	ClassDB::bind_method(D_METHOD("son_class_level_up", "value"), &Entity::son_class_level_up);
-	ClassDB::bind_method(D_METHOD("son_character_level_up", "value"), &Entity::son_character_level_up);
+	ClassDB::bind_method(D_METHOD("notification_sxp_gained", "value"), &Entity::notification_sxp_gained);
+	ClassDB::bind_method(D_METHOD("notification_sclass_level_up", "value"), &Entity::notification_sclass_level_up);
+	ClassDB::bind_method(D_METHOD("notification_scharacter_level_up", "value"), &Entity::notification_scharacter_level_up);
 
 	//Aura Manipulation
 	ClassDB::bind_method(D_METHOD("aura_adds", "aura"), &Entity::aura_adds);
@@ -7143,23 +7143,23 @@ void Entity::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_moved"));
 	ClassDB::bind_method(D_METHOD("moved"), &Entity::moved);
 
-	ADD_SIGNAL(MethodInfo("onc_mouse_entered"));
-	ADD_SIGNAL(MethodInfo("onc_mouse_exited"));
+	ADD_SIGNAL(MethodInfo("notification_cmouse_entered"));
+	ADD_SIGNAL(MethodInfo("notification_cmouse_exited"));
 
-	BIND_VMETHOD(MethodInfo("_onc_mouse_enter"));
-	BIND_VMETHOD(MethodInfo("_onc_mouse_exit"));
+	BIND_VMETHOD(MethodInfo("_notification_cmouse_enter"));
+	BIND_VMETHOD(MethodInfo("_notification_cmouse_exit"));
 
-	ClassDB::bind_method(D_METHOD("onc_mouse_enter"), &Entity::onc_mouse_enter);
-	ClassDB::bind_method(D_METHOD("onc_mouse_exit"), &Entity::onc_mouse_exit);
+	ClassDB::bind_method(D_METHOD("notification_cmouse_enter"), &Entity::notification_cmouse_enter);
+	ClassDB::bind_method(D_METHOD("notification_cmouse_exit"), &Entity::notification_cmouse_exit);
 
-	ADD_SIGNAL(MethodInfo("onc_targeted"));
-	ADD_SIGNAL(MethodInfo("onc_untargeted"));
+	ADD_SIGNAL(MethodInfo("notification_ctargeted"));
+	ADD_SIGNAL(MethodInfo("notification_cuntargeted"));
 
-	BIND_VMETHOD(MethodInfo("_onc_targeted"));
-	BIND_VMETHOD(MethodInfo("_onc_untargeted"));
+	BIND_VMETHOD(MethodInfo("_notification_ctargeted"));
+	BIND_VMETHOD(MethodInfo("_notification_cuntargeted"));
 
-	ClassDB::bind_method(D_METHOD("onc_targeted"), &Entity::onc_targeted);
-	ClassDB::bind_method(D_METHOD("onc_untargeted"), &Entity::onc_untargeted);
+	ClassDB::bind_method(D_METHOD("notification_ctargeted"), &Entity::notification_ctargeted);
+	ClassDB::bind_method(D_METHOD("notification_cuntargeted"), &Entity::notification_cuntargeted);
 
 	//Properties
 	ClassDB::bind_method(D_METHOD("get_body_path"), &Entity::get_body_path);
@@ -7647,46 +7647,46 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("lootc"), &Entity::lootc);
 
 	//Bag
-	ClassDB::bind_method(D_METHOD("item_ons_added", "bag", "item", "slot_id"), &Entity::item_ons_added);
+	ClassDB::bind_method(D_METHOD("notification_item_sadded", "bag", "item", "slot_id"), &Entity::notification_item_sadded);
 	ClassDB::bind_method(D_METHOD("item_addc_rpc", "slot_id", "item_data"), &Entity::item_addc_rpc);
 	ClassDB::bind_method(D_METHOD("item_addc", "slot_id", "item"), &Entity::item_addc);
 
-	ClassDB::bind_method(D_METHOD("item_ons_removed", "bag", "item", "slot_id"), &Entity::item_ons_removed);
+	ClassDB::bind_method(D_METHOD("notification_item_sremoved", "bag", "item", "slot_id"), &Entity::notification_item_sremoved);
 	ClassDB::bind_method(D_METHOD("item_removes", "slot_id"), &Entity::item_removes);
 	ClassDB::bind_method(D_METHOD("item_removec", "slot_id"), &Entity::item_removec);
 	ClassDB::bind_method(D_METHOD("item_cdeny_remove", "slot_id"), &Entity::item_cdeny_remove);
 	ClassDB::bind_method(D_METHOD("item_crequest_remove", "slot_id"), &Entity::item_crequest_remove);
 
-	ClassDB::bind_method(D_METHOD("items_ons_swapped", "bag", "slot_id_1", "slot_id_2"), &Entity::items_ons_swapped);
+	ClassDB::bind_method(D_METHOD("notification_items_sswapped", "bag", "slot_id_1", "slot_id_2"), &Entity::notification_items_sswapped);
 	ClassDB::bind_method(D_METHOD("items_swaps", "slot_id_1", "slot_id_2"), &Entity::items_swaps);
 	ClassDB::bind_method(D_METHOD("items_swapc", "slot_id_1", "slot_id_2"), &Entity::items_swapc);
 	ClassDB::bind_method(D_METHOD("item_cdeny_swap", "slot_id_1", "slot_id_2"), &Entity::item_cdeny_swap);
 	ClassDB::bind_method(D_METHOD("item_crequest_swap", "slot_id_1", "slot_id_2"), &Entity::item_crequest_swap);
 
-	ClassDB::bind_method(D_METHOD("item_ons_count_changed", "bag", "item", "slot_id"), &Entity::item_ons_count_changed);
+	ClassDB::bind_method(D_METHOD("notification_item_sscount_changed", "bag", "item", "slot_id"), &Entity::notification_item_sscount_changed);
 	ClassDB::bind_method(D_METHOD("item_cchange_count", "slot_id", "new_count"), &Entity::item_cchange_count);
 
-	ClassDB::bind_method(D_METHOD("ons_overburdened", "bag"), &Entity::ons_overburdened);
-	ClassDB::bind_method(D_METHOD("ons_overburden_removed", "bag"), &Entity::ons_overburden_removed);
+	ClassDB::bind_method(D_METHOD("notification_soverburdened", "bag"), &Entity::notification_soverburdened);
+	ClassDB::bind_method(D_METHOD("notification_soverburden_removed", "bag"), &Entity::notification_soverburden_removed);
 
 	//target Bag
-	ClassDB::bind_method(D_METHOD("target_item_ons_added", "bag", "item", "slot_id"), &Entity::target_item_ons_added);
+	ClassDB::bind_method(D_METHOD("notification_target_item_sadded", "bag", "item", "slot_id"), &Entity::notification_target_item_sadded);
 	ClassDB::bind_method(D_METHOD("target_item_addc_rpc", "slot_id", "item_data"), &Entity::target_item_addc_rpc);
 	ClassDB::bind_method(D_METHOD("target_item_addc", "slot_id", "item"), &Entity::target_item_addc);
 
-	ClassDB::bind_method(D_METHOD("target_item_ons_removed", "bag", "item", "slot_id"), &Entity::target_item_ons_removed);
+	ClassDB::bind_method(D_METHOD("notification_target_item_sremoved", "bag", "item", "slot_id"), &Entity::notification_target_item_sremoved);
 	ClassDB::bind_method(D_METHOD("target_item_removes", "slot_id"), &Entity::target_item_removes);
 	ClassDB::bind_method(D_METHOD("target_item_removec", "slot_id"), &Entity::target_item_removec);
 	ClassDB::bind_method(D_METHOD("target_item_cdeny_remove", "slot_id"), &Entity::target_item_cdeny_remove);
 	ClassDB::bind_method(D_METHOD("target_remove_crequest_item", "slot_id"), &Entity::target_remove_crequest_item);
 
-	ClassDB::bind_method(D_METHOD("target_items_ons_swapped", "bag", "slot_id_1", "slot_id_2"), &Entity::target_items_ons_swapped);
+	ClassDB::bind_method(D_METHOD("notification_target_items_sswapped", "bag", "slot_id_1", "slot_id_2"), &Entity::notification_target_items_sswapped);
 	ClassDB::bind_method(D_METHOD("target_items_sswap", "slot_id_1", "slot_id_2"), &Entity::target_items_sswap);
 	ClassDB::bind_method(D_METHOD("target_items_cswap", "slot_id_1", "slot_id_2"), &Entity::target_items_cswap);
 	ClassDB::bind_method(D_METHOD("target_item_cdeny_swap", "slot_id_1", "slot_id_2"), &Entity::target_item_cdeny_swap);
 	ClassDB::bind_method(D_METHOD("target_item_crequest_swap", "slot_id_1", "slot_id_2"), &Entity::target_item_crequest_swap);
 
-	ClassDB::bind_method(D_METHOD("target_item_ons_count_changed", "bag", "item", "slot_id"), &Entity::target_item_ons_count_changed);
+	ClassDB::bind_method(D_METHOD("notification_target_item_sscount_changed", "bag", "item", "slot_id"), &Entity::notification_target_item_sscount_changed);
 	ClassDB::bind_method(D_METHOD("target_item_cchange_count", "slot_id", "new_count"), &Entity::target_item_cchange_count);
 
 	//Actionbars
@@ -7795,10 +7795,10 @@ void Entity::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("update", "delta"), &Entity::update);
 
 	ClassDB::bind_method(D_METHOD("_crafts", "id"), &Entity::_crafts);
-	ClassDB::bind_method(D_METHOD("_son_xp_gained", "value"), &Entity::_son_xp_gained);
-	ClassDB::bind_method(D_METHOD("_son_character_level_up", "level"), &Entity::_son_character_level_up);
-	ClassDB::bind_method(D_METHOD("_son_class_level_up", "level"), &Entity::_son_class_level_up);
+	ClassDB::bind_method(D_METHOD("_notification_sxp_gained", "value"), &Entity::_notification_sxp_gained);
+	ClassDB::bind_method(D_METHOD("_notification_scharacter_level_up", "level"), &Entity::_notification_scharacter_level_up);
+	ClassDB::bind_method(D_METHOD("_notification_sclass_level_up", "level"), &Entity::_notification_sclass_level_up);
 	ClassDB::bind_method(D_METHOD("_moved"), &Entity::_moved);
 	ClassDB::bind_method(D_METHOD("_con_target_changed", "entity", "old_target"), &Entity::_con_target_changed);
-	ClassDB::bind_method(D_METHOD("_son_death"), &Entity::_son_death);
+	ClassDB::bind_method(D_METHOD("_notification_sdeath"), &Entity::_notification_sdeath);
 }
diff --git a/entities/entity.h b/entities/entity.h
index 16134ea..3e42010 100644
--- a/entities/entity.h
+++ b/entities/entity.h
@@ -345,8 +345,8 @@ public:
 	void dies();
 	void diec();
 
-	void ons_stat_changed(Ref<Stat> stat);
-	void onc_stat_changed(Ref<Stat> stat);
+	void notification_sstat_changed(Ref<Stat> stat);
+	void notification_cstat_changed(Ref<Stat> stat);
 
 	void ssend_stat(int id, int ccurrent, int cmax);
 	void creceive_stat(int id, int ccurrent, int cmax);
@@ -466,48 +466,49 @@ public:
 	void notification_scast(int what, Ref<SpellCastInfo> info);
 	void notification_sdamage(int what, Ref<SpellDamageInfo> info);
 
-	void son_death();
+	void notification_scooldown_added(Ref<Cooldown> cooldown);
+	void notification_scooldown_removed(Ref<Cooldown> cooldown);
 
-	void son_cooldown_added(Ref<Cooldown> cooldown);
-	void son_cooldown_removed(Ref<Cooldown> cooldown);
+	void notification_scategory_cooldown_added(Ref<CategoryCooldown> category_cooldown);
+	void notification_scategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
 
-	void son_category_cooldown_added(Ref<CategoryCooldown> category_cooldown);
-	void son_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
+	void notification_sentity_resource_added(Ref<EntityResource> resource);
+	void notification_sentity_resource_removed(Ref<EntityResource> resource);
 
-	void son_entity_resource_added(Ref<EntityResource> resource);
-	void son_entity_resource_removed(Ref<EntityResource> resource);
+	void notification_sxp_gained(int value);
+	void notification_sclass_level_up(int value);
+	void notification_scharacter_level_up(int value);
 
-	void son_gcd_started();
-	void son_gcd_finished();
-	void con_gcd_started();
-	void con_gcd_finished();
+	void notification_sdeath();
 
 	void son_physics_process(float delta);
 
-	void son_xp_gained(int value);
-	void son_class_level_up(int value);
-	void son_character_level_up(int value);
-
 	//Clientside EventHandlers
 	void notification_caura(int what, Ref<AuraData> data);
 	void notification_cheal(int what, Ref<SpellHealInfo> info);
 	void notification_ccast(int what, Ref<SpellCastInfo> info);
 	void notification_cdamage(int what, Ref<SpellDamageInfo> info);
 
-	void con_death();
+	void notification_ccooldown_added(Ref<Cooldown> cooldown);
+	void notification_ccooldown_removed(Ref<Cooldown> cooldown);
 
-	void con_cooldown_added(Ref<Cooldown> cooldown);
-	void con_cooldown_removed(Ref<Cooldown> cooldown);
+	void notification_ccategory_cooldown_added(Ref<CategoryCooldown> category_cooldown);
+	void notification_ccategory_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
 
-	void con_category_cooldown_added(Ref<CategoryCooldown> category_cooldown);
-	void con_category_cooldown_removed(Ref<CategoryCooldown> category_cooldown);
+	void notification_centity_resource_added(Ref<EntityResource> resource);
+	void notification_centity_resource_removed(Ref<EntityResource> resource);
 
-	void con_entity_resource_added(Ref<EntityResource> resource);
-	void con_entity_resource_removed(Ref<EntityResource> resource);
+	void notification_cxp_gained(int value);
+	void notification_cclass_level_up(int value);
+	void notification_ccharacter_level_up(int value);
 
-	void con_xp_gained(int value);
-	void con_class_level_up(int value);
-	void con_character_level_up(int value);
+	void notification_cdeath();
+
+	//gcd
+	void notification_sgcd_started();
+	void notification_sgcd_finished();
+	void notification_cgcd_started();
+	void notification_cgcd_finished();
 
 	//Modifiers/Requesters
 	void sapply_passives_damage_receive(Ref<SpellDamageInfo> info);
@@ -595,11 +596,11 @@ public:
 	//Hooks
 	void moved();
 
-	void onc_mouse_enter();
-	void onc_mouse_exit();
+	void notification_cmouse_enter();
+	void notification_cmouse_exit();
 
-	void onc_targeted();
-	void onc_untargeted();
+	void notification_ctargeted();
+	void notification_cuntargeted();
 
 	//Update
 	void update_auras(float delta);
@@ -796,49 +797,51 @@ public:
 	void loots(int index);
 	void lootc(int index);
 
-	void item_ons_added(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
 	void item_addc_rpc(int slot_id, String item_data);
 	void item_addc(int slot_id, Ref<ItemInstance> item);
 
 	//Bag
-	void item_ons_removed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
 	void item_removes(const int slot_id);
 	void item_removec(const int slot_id);
 	void item_cdeny_remove(const int slot_id);
 	void item_crequest_remove(const int slot_id);
 
-	void items_ons_swapped(Ref<Bag> bag, int slot_id_1, int slot_id_2);
 	void items_swaps(int slot_id_1, int slot_id_2);
 	void items_swapc(int slot_id_1, int slot_id_2);
 	void item_cdeny_swap(int slot_id_1, int slot_id_2);
 	void item_crequest_swap(int slot_id_1, int slot_id_2);
 
-	void item_ons_count_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
 	void item_cchange_count(int slot_id, int new_count);
 
-	void ons_overburdened(Ref<Bag> bag);
-	void ons_overburden_removed(Ref<Bag> bag);
+	void notification_item_sadded(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
+	void notification_item_sremoved(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
+	void notification_items_sswapped(Ref<Bag> bag, int slot_id_1, int slot_id_2);
+	void notification_item_sscount_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
+	void notification_soverburdened(Ref<Bag> bag);
+	void notification_soverburden_removed(Ref<Bag> bag);
 
 	//Target Bag
-	void target_item_ons_added(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
+
 	void target_item_addc_rpc(int slot_id, String item_data);
 	void target_item_addc(int slot_id, Ref<ItemInstance> item);
 
-	void target_item_ons_removed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
 	void target_item_removes(const int slot_id);
 	void target_item_removec(const int slot_id);
 	void target_item_cdeny_remove(const int slot_id);
 	void target_remove_crequest_item(const int slot_id);
 
-	void target_items_ons_swapped(Ref<Bag> bag, int slot_id_1, int slot_id_2);
 	void target_items_sswap(int slot_id_1, int slot_id_2);
 	void target_items_cswap(int slot_id_1, int slot_id_2);
 	void target_item_cdeny_swap(int slot_id_1, int slot_id_2);
 	void target_item_crequest_swap(int slot_id_1, int slot_id_2);
 
-	void target_item_ons_count_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
 	void target_item_cchange_count(int slot_id, int new_count);
 
+	void notification_target_item_sadded(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
+	void notification_target_item_sremoved(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
+	void notification_target_items_sswapped(Ref<Bag> bag, int slot_id_1, int slot_id_2);
+	void notification_target_item_sscount_changed(Ref<Bag> bag, Ref<ItemInstance> item, int slot_id);
+
 	////    Data    ////
 
 	void data_adds(Ref<EntityDataContainer> data);
@@ -969,12 +972,12 @@ public:
 
 protected:
 	void _crafts(int id);
-	void _son_xp_gained(int value);
-	void _son_character_level_up(int level);
-	void _son_class_level_up(int level);
+	void _notification_sxp_gained(int value);
+	void _notification_scharacter_level_up(int level);
+	void _notification_sclass_level_up(int level);
 	void _moved();
 	void _con_target_changed(Node *p_entity, Node *p_old_target);
-	void _son_death();
+	void _notification_sdeath();
 	void _spell_learns(int id);
 
 	bool _set(const StringName &p_name, const Variant &p_value);
diff --git a/entities/resources/entity_resource.cpp b/entities/resources/entity_resource.cpp
index 93465f2..888af07 100644
--- a/entities/resources/entity_resource.cpp
+++ b/entities/resources/entity_resource.cpp
@@ -123,13 +123,13 @@ void EntityResource::onc_added(Entity *owner) {
 		call("_onc_added", owner);
 }
 
-void EntityResource::ons_stat_changed(Ref<Stat> stat) {
-	if (has_method("_ons_stat_changed"))
-		call("_ons_stat_changed", stat);
+void EntityResource::notification_sstat_changed(Ref<Stat> stat) {
+	if (has_method("_notification_sstat_changed"))
+		call("_notification_sstat_changed", stat);
 }
-void EntityResource::onc_stat_changed(Ref<Stat> stat) {
-	if (has_method("_onc_stat_changed"))
-		call("_onc_stat_changed", stat);
+void EntityResource::notification_cstat_changed(Ref<Stat> stat) {
+	if (has_method("_notification_cstat_changed"))
+		call("_notification_cstat_changed", stat);
 }
 
 void EntityResource::ons_target_changed(Entity *entity, Entity *old_target) {
@@ -249,8 +249,8 @@ void EntityResource::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_owner", "value"), &EntityResource::set_owner_bind);
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "owner", PROPERTY_HINT_RESOURCE_TYPE, "Entity", 0), "set_owner", "get_owner");
 
-	BIND_VMETHOD(MethodInfo("_ons_stat_changed", PropertyInfo(Variant::OBJECT, "stat", PROPERTY_HINT_RESOURCE_TYPE, "Stat")));
-	BIND_VMETHOD(MethodInfo("_onc_stat_changed", PropertyInfo(Variant::OBJECT, "stat", PROPERTY_HINT_RESOURCE_TYPE, "Stat")));
+	BIND_VMETHOD(MethodInfo("_notification_sstat_changed", PropertyInfo(Variant::OBJECT, "stat", PROPERTY_HINT_RESOURCE_TYPE, "Stat")));
+	BIND_VMETHOD(MethodInfo("_notification_cstat_changed", PropertyInfo(Variant::OBJECT, "stat", PROPERTY_HINT_RESOURCE_TYPE, "Stat")));
 
 	BIND_VMETHOD(MethodInfo("_ons_target_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::OBJECT, "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
 	BIND_VMETHOD(MethodInfo("_onc_target_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::OBJECT, "old_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
diff --git a/entities/resources/entity_resource.h b/entities/resources/entity_resource.h
index 7d19c38..39356ab 100644
--- a/entities/resources/entity_resource.h
+++ b/entities/resources/entity_resource.h
@@ -58,8 +58,8 @@ public:
 	void ons_added(Entity *owner);
 	void onc_added(Entity *owner);
 
-	void ons_stat_changed(Ref<Stat> stat);
-	void onc_stat_changed(Ref<Stat> stat);
+	void notification_sstat_changed(Ref<Stat> stat);
+	void notification_cstat_changed(Ref<Stat> stat);
 
 	void ons_target_changed(Entity *entity, Entity *old_target);
 	void onc_target_changed(Entity *entity, Entity *old_target);
diff --git a/entities/stats/stat.cpp b/entities/stats/stat.cpp
index bd5b8d4..dceffdf 100644
--- a/entities/stats/stat.cpp
+++ b/entities/stats/stat.cpp
@@ -152,7 +152,7 @@ void Stat::setc_current(float value) {
 
 	_c_current = value;
 
-	_owner->onc_stat_changed(Ref<Stat>(this));
+	_owner->notification_cstat_changed(Ref<Stat>(this));
 
 	emit_signal("c_changed", Ref<Stat>(this));
 }
@@ -165,7 +165,7 @@ void Stat::setc_max(float value) {
 
 	_s_current = value;
 
-	_owner->onc_stat_changed(Ref<Stat>(this));
+	_owner->notification_cstat_changed(Ref<Stat>(this));
 
 	emit_signal("c_changed", Ref<Stat>(this));
 }
@@ -176,7 +176,7 @@ void Stat::setc_values(int ccurrent, int cmax) {
 	_c_current = ccurrent;
 	_c_max = cmax;
 
-	_owner->onc_stat_changed(Ref<Stat>(this));
+	_owner->notification_cstat_changed(Ref<Stat>(this));
 	emit_signal("c_changed", Ref<Stat>(this));
 }
 
@@ -298,7 +298,7 @@ void Stat::apply_modifiers() {
 		sm->set_base_mod(_s_current * curve->interpolate(_s_current / max_value));
 	}
 
-	_owner->ons_stat_changed(Ref<Stat>(this));
+	_owner->notification_sstat_changed(Ref<Stat>(this));
 	emit_signal("s_changed", Ref<Stat>(this));
 }
 
@@ -337,7 +337,7 @@ void Stat::set_to_max() {
 
 	_dirty = true;
 
-	_owner->ons_stat_changed(Ref<Stat>(this));
+	_owner->notification_sstat_changed(Ref<Stat>(this));
 	emit_signal("s_changed", Ref<Stat>(this));
 }