From 48470111f350be838027a5d03a47b740df2fec4c Mon Sep 17 00:00:00 2001
From: Relintai <relintai@gmail.com>
Date: Sat, 19 Oct 2019 12:12:09 +0200
Subject: [PATCH] Standardized resource name and description properties. I left
 the original properties for now, so upgrading is possible.

---
 data/aura.cpp                       | 35 ++++++++++++----------
 data/aura.h                         | 14 ++++-----
 data/craft_recipe.cpp               | 15 +++++-----
 data/craft_recipe.h                 |  6 ++--
 data/data_manager.cpp               | 14 ++++-----
 data/item_template.cpp              | 18 ++++++-----
 data/item_template.h                |  6 ++--
 data/spell.cpp                      | 46 ++++++++++++-----------------
 data/spell.h                        | 17 +++++------
 data/spell_effect_visual.cpp        | 15 +++++-----
 data/spell_effect_visual.h          |  6 ++--
 data/world_effect_data.cpp          | 15 +++++-----
 data/world_effect_data.h            |  6 ++--
 entities/data/character_spec.cpp    | 15 +++++-----
 entities/data/character_spec.h      |  7 +++--
 entities/data/entity_class_data.cpp | 15 +++++-----
 entities/data/entity_class_data.h   |  6 ++--
 entities/data/entity_data.cpp       | 17 ++++++-----
 entities/data/entity_data.h         |  6 ++--
 19 files changed, 140 insertions(+), 139 deletions(-)

diff --git a/data/aura.cpp b/data/aura.cpp
index ba71dac..09e5b99 100644
--- a/data/aura.cpp
+++ b/data/aura.cpp
@@ -56,11 +56,18 @@ void Aura::set_rank(int value) {
 	_rank = value;
 }
 
-String Aura::get_aura_name() {
-	return _aura_name;
+String Aura::get_text_name() {
+	return _text_name;
 }
-void Aura::set_aura_name(String name) {
-	_aura_name = name;
+void Aura::set_text_name(String name) {
+	_text_name = name;
+}
+
+String Aura::get_text_description() {
+	return _text_description;
+}
+void Aura::set_text_description(String description) {
+	_text_description = description;
 }
 
 bool Aura::get_hide() {
@@ -70,12 +77,6 @@ void Aura::set_hide(bool value) {
 	_hide = value;
 }
 
-String Aura::get_aura_description() {
-	return _aura_description;
-}
-void Aura::set_aura_description(String description) {
-	_aura_description = description;
-}
 
 Ref<SpellEffectVisual> Aura::get_visual_spell_effects() {
 	return _visual_spell_effects;
@@ -1397,13 +1398,15 @@ void Aura::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "ability_scale_data_id"), "set_ability_scale_data_id", "get_ability_scale_data_id");
 
 	ADD_GROUP("Texts", "text");
-	ClassDB::bind_method(D_METHOD("get_aura_name"), &Aura::get_aura_name);
-	ClassDB::bind_method(D_METHOD("set_aura_name", "value"), &Aura::set_aura_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_aura_name"), "set_aura_name", "get_aura_name");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &Aura::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &Aura::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_aura_name"), "set_text_name", "get_text_name"); //REMOVE
 
-	ClassDB::bind_method(D_METHOD("get_aura_description"), &Aura::get_aura_description);
-	ClassDB::bind_method(D_METHOD("set_aura_description", "value"), &Aura::set_aura_description);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_aura_description", PROPERTY_HINT_MULTILINE_TEXT), "set_aura_description", "get_aura_description");
+	ClassDB::bind_method(D_METHOD("get_text_description"), &Aura::get_text_description);
+	ClassDB::bind_method(D_METHOD("set_text_description", "value"), &Aura::set_text_description);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_aura_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description"); //REMOVE
 
 	ClassDB::bind_method(D_METHOD("get_visual_spell_effects"), &Aura::get_visual_spell_effects);
 	ClassDB::bind_method(D_METHOD("set_visual_spell_effects", "value"), &Aura::set_visual_spell_effects);
diff --git a/data/aura.h b/data/aura.h
index fe6e7ab..3e60253 100644
--- a/data/aura.h
+++ b/data/aura.h
@@ -60,15 +60,15 @@ public:
 	int get_rank();
 	void set_rank(int value);
 
-	String get_aura_name();
-	void set_aura_name(String name);
+	String get_text_name();
+	void set_text_name(String name);
+
+	String get_text_description();
+	void set_text_description(String description);
 
 	bool get_hide();
 	void set_hide(bool value);
 
-	String get_aura_description();
-	void set_aura_description(String description);
-
 	Ref<SpellEffectVisual> get_visual_spell_effects();
 	void set_visual_spell_effects(Ref<SpellEffectVisual> value);
 
@@ -412,8 +412,8 @@ private:
 	bool _hide;
 	Ref<Spell> _teaches_spell;
 
-	String _aura_name;
-	String _aura_description;
+	String _text_name;
+	String _text_description;
 	int ability_scale_data_id;
 	int _rank;
 
diff --git a/data/craft_recipe.cpp b/data/craft_recipe.cpp
index f100e7b..338adf8 100644
--- a/data/craft_recipe.cpp
+++ b/data/craft_recipe.cpp
@@ -10,11 +10,11 @@ void CraftRecipe::set_id(int value) {
 	_id = value;
 }
 
-String CraftRecipe::get_recipe_name() {
-	return _recipe_name;
+String CraftRecipe::get_text_name() {
+	return _text_name;
 }
-void CraftRecipe::set_recipe_name(String name) {
-	_recipe_name = name;
+void CraftRecipe::set_text_name(String name) {
+	_text_name = name;
 }
 
 CraftRecipe::CraftCategories CraftRecipe::get_category() {
@@ -117,9 +117,10 @@ void CraftRecipe::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "value"), &CraftRecipe::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_recipe_name"), &CraftRecipe::get_recipe_name);
-	ClassDB::bind_method(D_METHOD("set_recipe_name", "value"), &CraftRecipe::set_recipe_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "recipe_name"), "set_recipe_name", "get_recipe_name");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &CraftRecipe::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &CraftRecipe::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "recipe_name"), "set_text_name", "get_text_name"); //REMOVE
 
 	ClassDB::bind_method(D_METHOD("get_category"), &CraftRecipe::get_category);
 	ClassDB::bind_method(D_METHOD("set_category", "value"), &CraftRecipe::set_category);
diff --git a/data/craft_recipe.h b/data/craft_recipe.h
index 2701a87..f0ad17a 100644
--- a/data/craft_recipe.h
+++ b/data/craft_recipe.h
@@ -34,8 +34,8 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_recipe_name();
-	void set_recipe_name(String name);
+	String get_text_name();
+	void set_text_name(String name);
 
 	CraftCategories get_category();
 	void set_category(CraftCategories value);
@@ -75,7 +75,7 @@ private:
 	};
 
 	int _id;
-	String _recipe_name;
+	String _text_name;
 
 	CraftCategories _category;
 	CraftSubCategories _sub_category;
diff --git a/data/data_manager.cpp b/data/data_manager.cpp
index ce9d91b..7d671a9 100644
--- a/data/data_manager.cpp
+++ b/data/data_manager.cpp
@@ -590,43 +590,43 @@ void DataManager::load_player_character_datas() {
 
 void DataManager::list_characters() {
 	for (int i = 0; i < _entity_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _entity_datas.get(i)->get_entity_name());
+		print_error(itos(i) + ": " + _entity_datas.get(i)->get_text_name());
 	}
 }
 
 void DataManager::list_spells() {
 	for (int i = 0; i < _spells.size(); ++i) {
-		print_error(itos(i) + ": " + _spells.get(i)->get_spell_name());
+		print_error(itos(i) + ": " + _spells.get(i)->get_text_name());
 	}
 }
 
 void DataManager::list_auras() {
 	for (int i = 0; i < _auras.size(); ++i) {
-		print_error(itos(i) + ": " + _auras.get(i)->get_aura_name());
+		print_error(itos(i) + ": " + _auras.get(i)->get_text_name());
 	}
 }
 
 void DataManager::list_craft_data() {
 	for (int i = 0; i < _craft_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _craft_datas.get(i)->get_name());
+		print_error(itos(i) + ": " + _craft_datas.get(i)->get_text_name());
 	}
 }
 
 void DataManager::list_item_templates() {
 	for (int i = 0; i < _item_templates.size(); ++i) {
-		print_error(itos(i) + ": " + _item_templates.get(i)->get_name());
+		print_error(itos(i) + ": " + _item_templates.get(i)->get_text_name());
 	}
 }
 
 void DataManager::list_mob_datas() {
 	for (int i = 0; i < _mob_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _mob_datas.get(i)->get_name());
+		print_error(itos(i) + ": " + _mob_datas.get(i)->get_text_name());
 	}
 }
 
 void DataManager::list_player_character_datas() {
 	for (int i = 0; i < _player_character_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _player_character_datas.get(i)->get_name());
+		print_error(itos(i) + ": " + _player_character_datas.get(i)->get_text_name());
 	}
 }
 
diff --git a/data/item_template.cpp b/data/item_template.cpp
index 912f8ea..ad54509 100644
--- a/data/item_template.cpp
+++ b/data/item_template.cpp
@@ -12,11 +12,11 @@ void ItemTemplate::set_id(const int value) {
 	_id = value;
 }
 
-String ItemTemplate::get_name_key() const {
-	return _name_key;
+String ItemTemplate::get_text_name() const {
+	return _text_name;
 }
-void ItemTemplate::set_name_key(const String value) {
-	_name_key = value;
+void ItemTemplate::set_text_name(const String value) {
+	_text_name = value;
 }
 
 ItemEnums::ItemType ItemTemplate::get_item_type() const {
@@ -391,7 +391,7 @@ Ref<ItemInstance> ItemTemplate::create_item_instance() {
 
 ItemTemplate::ItemTemplate() {
 	_id = 0;
-	_name_key = "";
+	_text_name = "";
 	_item_type = ItemEnums::ITEM_TYPE_NONE;
 	_item_sub_type = ItemEnums::ITEM_SUB_TYPE_NONE;
 	_item_sub_sub_type = ItemEnums::ITEM_SUB_SUB_TYPE_NONE;
@@ -439,9 +439,11 @@ void ItemTemplate::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "count"), &ItemTemplate::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_name_key"), &ItemTemplate::get_name_key);
-	ClassDB::bind_method(D_METHOD("set_name_key", "count"), &ItemTemplate::set_name_key);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "name_key"), "set_name_key", "get_name_key");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &ItemTemplate::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "count"), &ItemTemplate::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "name_key"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_item_type"), &ItemTemplate::get_item_type);
 	ClassDB::bind_method(D_METHOD("set_item_type", "count"), &ItemTemplate::set_item_type);
diff --git a/data/item_template.h b/data/item_template.h
index f6c19a8..bf0f7d2 100644
--- a/data/item_template.h
+++ b/data/item_template.h
@@ -23,8 +23,8 @@ public:
 	int get_id() const;
 	void set_id(const int value);
 
-	String get_name_key() const;
-	void set_name_key(const String value);
+	String get_text_name() const;
+	void set_text_name(const String value);
 
 	ItemEnums::ItemType get_item_type() const;
 	void set_item_type(const ItemEnums::ItemType value);
@@ -162,7 +162,7 @@ private:
 	};
 
 	int _id;
-	String _name_key;
+	String _text_name;
 	ItemEnums::ItemRarity _rarity;
 	ItemEnums::ItemType _item_type;
 	ItemEnums::ItemSubtype _item_sub_type;
diff --git a/data/spell.cpp b/data/spell.cpp
index 662dfaa..9d4ab13 100644
--- a/data/spell.cpp
+++ b/data/spell.cpp
@@ -136,25 +136,18 @@ void Spell::set_icon(Ref<Texture> value) {
 	_icon = Ref<Texture>(value);
 }
 
-String Spell::get_name_key() {
-	return _name_key;
+String Spell::get_text_name() {
+	return _text_name;
 }
-void Spell::set_name_key(String value) {
-	_name_key = value;
+void Spell::set_text_name(String value) {
+	_text_name = value;
 }
 
-String Spell::get_spell_name() {
-	return _spell_name;
+String Spell::get_text_description() {
+	return _text_description;
 }
-void Spell::set_spell_name(String value) {
-	_spell_name = value;
-}
-
-String Spell::get_spell_description() {
-	return _spell_description;
-}
-void Spell::set_spell_description(String value) {
-	_spell_description = value;
+void Spell::set_text_description(String value) {
+	_text_description = value;
 }
 
 Ref<SpellEffectVisual> Spell::get_visual_spell_effects() {
@@ -747,11 +740,11 @@ void Spell::_handle_spell_damage(Ref<SpellDamageInfo> data) {
 }
 
 String Spell::get_name() {
-	return _spell_name;
+	return _text_name;
 }
 
 String Spell::get_description(int level) {
-	return _spell_description;
+	return _text_description;
 }
 
 Spell::Spell() {
@@ -940,17 +933,16 @@ void Spell::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_absorb_scale_for_level"), &Spell::get_absorb_scale_for_level);
 
 	ADD_GROUP("Texts", "text");
-	ClassDB::bind_method(D_METHOD("get_name_key"), &Spell::get_name_key);
-	ClassDB::bind_method(D_METHOD("set_name_key", "value"), &Spell::set_name_key);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name_key"), "set_name_key", "get_name_key");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &Spell::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &Spell::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_spell_name"), "set_text_name", "get_text_name"); //REMOVE
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name_key"), "set_text_name", "get_text_name"); //REMOVE
 
-	ClassDB::bind_method(D_METHOD("get_spell_name"), &Spell::get_spell_name);
-	ClassDB::bind_method(D_METHOD("set_spell_name", "value"), &Spell::set_spell_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_spell_name"), "set_spell_name", "get_spell_name");
-
-	ClassDB::bind_method(D_METHOD("get_spell_description"), &Spell::get_spell_description);
-	ClassDB::bind_method(D_METHOD("set_spell_description", "value"), &Spell::set_spell_description);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_spell_description", PROPERTY_HINT_MULTILINE_TEXT), "set_spell_description", "get_spell_description");
+	ClassDB::bind_method(D_METHOD("get_text_description"), &Spell::get_text_description);
+	ClassDB::bind_method(D_METHOD("set_text_description", "value"), &Spell::set_text_description);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_text_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_spell_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description"); //REMOVE
 
 	ADD_GROUP("Cooldown", "cooldown");
 	ClassDB::bind_method(D_METHOD("get_cooldown"), &Spell::get_cooldown);
diff --git a/data/spell.h b/data/spell.h
index f1c6446..5e6d511 100644
--- a/data/spell.h
+++ b/data/spell.h
@@ -140,14 +140,11 @@ public:
 	Ref<Texture> get_icon();
 	void set_icon(Ref<Texture> value);
 
-	String get_name_key();
-	void set_name_key(String value);
+	String get_text_name();
+	void set_text_name(String value);
 
-	String get_spell_name();
-	void set_spell_name(String value);
-
-	String get_spell_description();
-	void set_spell_description(String value);
+	String get_text_description();
+	void set_text_description(String value);
 
 	Ref<SpellEffectVisual> get_visual_spell_effects();
 	void set_visual_spell_effects(Ref<SpellEffectVisual> value);
@@ -370,9 +367,9 @@ private:
 	bool _has_global_cooldown;
 	bool _is_local_spell;
 	Ref<Texture> _icon;
-	String _name_key;
-	String _spell_name;
-	String _spell_description;
+
+	String _text_name;
+	String _text_description;
 
 	Ref<SpellEffectVisual> _visual_spell_effects;
 	Ref<SpellProjectileData> _spell_projectile_data;
diff --git a/data/spell_effect_visual.cpp b/data/spell_effect_visual.cpp
index 7d61452..adb7335 100644
--- a/data/spell_effect_visual.cpp
+++ b/data/spell_effect_visual.cpp
@@ -1,10 +1,10 @@
 #include "spell_effect_visual.h"
 
-String SpellEffectVisual::get_effect_name() {
-	return _effect_name;
+String SpellEffectVisual::get_text_name() {
+	return _text_name;
 }
-void SpellEffectVisual::set_effect_name(String name) {
-	_effect_name = name;
+void SpellEffectVisual::set_text_name(String name) {
+	_text_name = name;
 }
 
 SpellEffectVisual::SpellEffectVisual() {
@@ -14,7 +14,8 @@ SpellEffectVisual::~SpellEffectVisual() {
 }
 
 void SpellEffectVisual::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_effect_name"), &SpellEffectVisual::get_effect_name);
-	ClassDB::bind_method(D_METHOD("set_effect_name", "value"), &SpellEffectVisual::set_effect_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "effect_name"), "set_effect_name", "get_effect_name");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &SpellEffectVisual::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &SpellEffectVisual::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "effect_name"), "set_text_name", "get_text_name"); //REMOVE
 }
diff --git a/data/spell_effect_visual.h b/data/spell_effect_visual.h
index 2cb60ef..8e2a3cd 100644
--- a/data/spell_effect_visual.h
+++ b/data/spell_effect_visual.h
@@ -7,8 +7,8 @@ class SpellEffectVisual : public Resource {
 	GDCLASS(SpellEffectVisual, Resource);
 
 public:
-	String get_effect_name();
-	void set_effect_name(String name);
+	String get_text_name();
+	void set_text_name(String name);
 
 	SpellEffectVisual();
 	~SpellEffectVisual();
@@ -17,7 +17,7 @@ protected:
 	static void _bind_methods();
 
 private:
-	String _effect_name;
+	String _text_name;
 };
 
 #endif
diff --git a/data/world_effect_data.cpp b/data/world_effect_data.cpp
index 47ad3fc..835d774 100644
--- a/data/world_effect_data.cpp
+++ b/data/world_effect_data.cpp
@@ -1,10 +1,10 @@
 #include "world_effect_data.h"
 
-String WorldEffectData::get_effect_name() {
-	return _effect_name;
+String WorldEffectData::get_text_name() {
+	return _text_name;
 }
-void WorldEffectData::set_effect_name(String name) {
-	_effect_name = name;
+void WorldEffectData::set_text_name(String name) {
+	_text_name = name;
 }
 
 WorldEffectData::WorldEffectData() {
@@ -14,7 +14,8 @@ WorldEffectData::~WorldEffectData() {
 }
 
 void WorldEffectData::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_effect_name"), &WorldEffectData::get_effect_name);
-	ClassDB::bind_method(D_METHOD("set_effect_name", "value"), &WorldEffectData::set_effect_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "effect_name"), "set_effect_name", "get_effect_name");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &WorldEffectData::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &WorldEffectData::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "effect_name"), "set_text_name", "get_text_name"); //REMOVE
 }
diff --git a/data/world_effect_data.h b/data/world_effect_data.h
index 0b0bfd2..b57117f 100644
--- a/data/world_effect_data.h
+++ b/data/world_effect_data.h
@@ -7,8 +7,8 @@ class WorldEffectData : public Resource {
 	GDCLASS(WorldEffectData, Resource);
 
 public:
-	String get_effect_name();
-	void set_effect_name(String name);
+	String get_text_name();
+	void set_text_name(String name);
 
 	WorldEffectData();
 	~WorldEffectData();
@@ -17,7 +17,7 @@ protected:
 	static void _bind_methods();
 
 private:
-	String _effect_name;
+	String _text_name;
 };
 
 #endif
diff --git a/entities/data/character_spec.cpp b/entities/data/character_spec.cpp
index a4060d1..7515c0c 100644
--- a/entities/data/character_spec.cpp
+++ b/entities/data/character_spec.cpp
@@ -9,11 +9,11 @@ void CharacterSpec::set_spec_id(int value) {
 	_spec_id = value;
 }
 
-String CharacterSpec::get_spec_name() {
-	return _spec_name;
+String CharacterSpec::get_text_name() {
+	return _text_name;
 }
-void CharacterSpec::set_spec_name(String value) {
-	_spec_name = value;
+void CharacterSpec::set_text_name(String value) {
+	_text_name = value;
 }
 
 int CharacterSpec::get_num_talent_rows() {
@@ -74,9 +74,10 @@ void CharacterSpec::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_spec_id", "value"), &CharacterSpec::set_spec_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "spec_id"), "set_spec_id", "get_spec_id");
 
-	ClassDB::bind_method(D_METHOD("get_spec_name"), &CharacterSpec::get_spec_name);
-	ClassDB::bind_method(D_METHOD("set_spec_name", "value"), &CharacterSpec::set_spec_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "spec_name"), "set_spec_name", "get_spec_name");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &CharacterSpec::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &CharacterSpec::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "spec_name"), "set_text_name", "get_text_name"); //REMOVE
 
 	ClassDB::bind_method(D_METHOD("get_num_talent_rows"), &CharacterSpec::get_num_talent_rows);
 	ClassDB::bind_method(D_METHOD("set_num_talent_rows", "value"), &CharacterSpec::set_num_talent_rows);
diff --git a/entities/data/character_spec.h b/entities/data/character_spec.h
index f8dca38..41e5020 100644
--- a/entities/data/character_spec.h
+++ b/entities/data/character_spec.h
@@ -16,8 +16,9 @@ class CharacterSpec : public Resource {
 public:
 	int get_spec_id();
 	void set_spec_id(int value);
-	String get_spec_name();
-	void set_spec_name(String value);
+
+	String get_text_name();
+	void set_text_name(String value);
 
 	int get_num_talent_rows();
 	void set_num_talent_rows(int value);
@@ -38,7 +39,7 @@ protected:
 
 private:
 	int _spec_id;
-	String _spec_name;
+	String _text_name;
 	Vector<Ref<TalentRowData> > _rows;
 };
 
diff --git a/entities/data/entity_class_data.cpp b/entities/data/entity_class_data.cpp
index b6d25c9..335ac64 100644
--- a/entities/data/entity_class_data.cpp
+++ b/entities/data/entity_class_data.cpp
@@ -15,11 +15,11 @@ void EntityClassData::set_id(int value) {
 	_id = value;
 }
 
-String EntityClassData::get_entity_class_name() {
-	return _entity_class_name;
+String EntityClassData::get_text_name() {
+	return _text_name;
 }
-void EntityClassData::set_entity_class_name(String value) {
-	_entity_class_name = value;
+void EntityClassData::set_text_name(String value) {
+	_text_name = value;
 }
 
 Ref<EntityClassData> EntityClassData::get_inherits() {
@@ -1043,9 +1043,10 @@ void EntityClassData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "value"), &EntityClassData::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_entity_class_name"), &EntityClassData::get_entity_class_name);
-	ClassDB::bind_method(D_METHOD("set_entity_class_name", "value"), &EntityClassData::set_entity_class_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "entity_class_name"), "set_entity_class_name", "get_entity_class_name");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &EntityClassData::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &EntityClassData::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "entity_class_name"), "set_text_name", "get_text_name"); //REMOVE
 
 	ClassDB::bind_method(D_METHOD("get_inherits"), &EntityClassData::get_inherits);
 	ClassDB::bind_method(D_METHOD("set_inherits", "value"), &EntityClassData::set_inherits);
diff --git a/entities/data/entity_class_data.h b/entities/data/entity_class_data.h
index 755c9ea..ebb2e89 100644
--- a/entities/data/entity_class_data.h
+++ b/entities/data/entity_class_data.h
@@ -33,8 +33,8 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_entity_class_name();
-	void set_entity_class_name(String value);
+	String get_text_name();
+	void set_text_name(String value);
 
 	Ref<EntityClassData> get_inherits();
 	void set_inherits(Ref<EntityClassData> value);
@@ -224,7 +224,7 @@ protected:
 private:
 	int _id;
 
-	String _entity_class_name;
+	String _text_name;
 
 	Ref<EntityClassData> _inherits;
 
diff --git a/entities/data/entity_data.cpp b/entities/data/entity_data.cpp
index 571c72e..753205c 100644
--- a/entities/data/entity_data.cpp
+++ b/entities/data/entity_data.cpp
@@ -16,11 +16,11 @@ void EntityData::set_id(int value) {
 	_id = value;
 }
 
-String EntityData::get_entity_name() {
-	return _entity_name;
+String EntityData::get_text_name() {
+	return _text_name;
 }
-void EntityData::set_entity_name(String value) {
-	_entity_name = value;
+void EntityData::set_text_name(String value) {
+	_text_name = value;
 }
 
 Ref<EntityData> EntityData::get_inherits() {
@@ -189,7 +189,7 @@ String EntityData::generate_name() {
 		return call("_generate_name");
 	}
 
-	return _entity_name;
+	return _text_name;
 }
 
 ////    SETUP    ////
@@ -1156,9 +1156,10 @@ void EntityData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_entity_controller", "value"), &EntityData::set_entity_controller);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "entity_controller", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_CONTOLLER), "set_entity_controller", "get_entity_controller");
 
-	ClassDB::bind_method(D_METHOD("get_entity_name"), &EntityData::get_entity_name);
-	ClassDB::bind_method(D_METHOD("set_entity_name", "value"), &EntityData::set_entity_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "entity_name"), "set_entity_name", "get_entity_name");
+	ClassDB::bind_method(D_METHOD("get_text_name"), &EntityData::get_text_name);
+	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &EntityData::set_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "entity_name"), "set_text_name", "get_text_name"); //REMOVE
 
 	ClassDB::bind_method(D_METHOD("get_money"), &EntityData::get_money);
 	ClassDB::bind_method(D_METHOD("set_money", "value"), &EntityData::set_money);
diff --git a/entities/data/entity_data.h b/entities/data/entity_data.h
index 8b57e5f..4ce0c31 100644
--- a/entities/data/entity_data.h
+++ b/entities/data/entity_data.h
@@ -40,8 +40,8 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_entity_name();
-	void set_entity_name(String value);
+	String get_text_name();
+	void set_text_name(String value);
 
 	Ref<EntityData> get_inherits();
 	void set_inherits(Ref<EntityData> value);
@@ -243,7 +243,7 @@ private:
 	int _entity_flags;
 	EntityEnums::EntityController _entity_controller;
 
-	String _entity_name;
+	String _text_name;
 
 	int _money;
 	int _bag_size;