diff --git a/include/vcmi/Skill.h b/include/vcmi/Skill.h
index 363e67869..16ce88767 100644
--- a/include/vcmi/Skill.h
+++ b/include/vcmi/Skill.h
@@ -19,7 +19,8 @@ class SecondarySkill;
 class DLL_LINKAGE Skill : public EntityT<SecondarySkill>
 {
 public:
-
+	virtual std::string getDescriptionTextID(int level) const = 0;
+	virtual std::string getDescriptionTranslated(int level) const = 0;
 };
 
 
diff --git a/include/vcmi/SkillService.h b/include/vcmi/SkillService.h
index ce0fa8b12..6e8618898 100644
--- a/include/vcmi/SkillService.h
+++ b/include/vcmi/SkillService.h
@@ -15,9 +15,9 @@
 VCMI_LIB_NAMESPACE_BEGIN
 
 class SecondarySkill;
-class CSkill;
+class Skill;
 
-class DLL_LINKAGE SkillService : public EntityServiceT<SecondarySkill, CSkill>
+class DLL_LINKAGE SkillService : public EntityServiceT<SecondarySkill, Skill>
 {
 public:
 };
diff --git a/lib/CSkillHandler.h b/lib/CSkillHandler.h
index bf48b18f4..ec3b87ca5 100644
--- a/lib/CSkillHandler.h
+++ b/lib/CSkillHandler.h
@@ -63,8 +63,8 @@ public:
 	std::string getNameTextID() const override;
 	std::string getNameTranslated() const override;
 
-	std::string getDescriptionTextID(int level) const;
-	std::string getDescriptionTranslated(int level) const;
+	std::string getDescriptionTextID(int level) const override;
+	std::string getDescriptionTranslated(int level) const override;
 
 	const LevelInfo & at(int level) const;
 	LevelInfo & at(int level);
@@ -89,7 +89,7 @@ public:
 	friend DLL_LINKAGE std::ostream & operator<<(std::ostream & out, const CSkill::LevelInfo & info);
 };
 
-class DLL_LINKAGE CSkillHandler: public CHandlerBase<SecondarySkill, CSkill, CSkill, SkillService>
+class DLL_LINKAGE CSkillHandler: public CHandlerBase<SecondarySkill, Skill, CSkill, SkillService>
 {
 public:
 	CSkillHandler();
diff --git a/scripting/lua/api/Artifact.cpp b/scripting/lua/api/Artifact.cpp
index 405e03ca0..0fe72a1c9 100644
--- a/scripting/lua/api/Artifact.cpp
+++ b/scripting/lua/api/Artifact.cpp
@@ -31,13 +31,13 @@ const std::vector<ArtifactProxy::CustomRegType> ArtifactProxy::REGISTER_CUSTOM =
 	{"getIconIndex", LuaMethodWrapper<Artifact, decltype(&Entity::getIconIndex), &Entity::getIconIndex>::invoke, false},
 	{"getIndex", LuaMethodWrapper<Artifact, decltype(&Entity::getIndex), &Entity::getIndex>::invoke, false},
 	{"getJsonKey", LuaMethodWrapper<Artifact, decltype(&Entity::getJsonKey), &Entity::getJsonKey>::invoke, false},
-	{"getName", LuaMethodWrapper<Artifact, decltype(&Entity::getName), &Entity::getName>::invoke, false},
+	{"getName", LuaMethodWrapper<Artifact, decltype(&Entity::getNameTranslated), &Entity::getNameTranslated>::invoke, false},
 
 	{"getId", LuaMethodWrapper<Artifact, decltype(&EntityT<ArtifactID>::getId), &EntityT<ArtifactID>::getId>::invoke, false},
 	{"accessBonuses", LuaMethodWrapper<Artifact, decltype(&EntityWithBonuses<ArtifactID>::accessBonuses), &EntityWithBonuses<ArtifactID>::accessBonuses>::invoke, false},
 
-	{"getDescription", LuaMethodWrapper<Artifact, decltype(&Artifact::getDescription), &Artifact::getDescription>::invoke, false},
-	{"getEventText", LuaMethodWrapper<Artifact, decltype(&Artifact::getEventText), &Artifact::getEventText>::invoke, false},
+	{"getDescription", LuaMethodWrapper<Artifact, decltype(&Artifact::getDescriptionTranslated), &Artifact::getDescriptionTranslated>::invoke, false},
+	{"getEventText", LuaMethodWrapper<Artifact, decltype(&Artifact::getEventTranslated), &Artifact::getEventTranslated>::invoke, false},
 	{"isBig", LuaMethodWrapper<Artifact, decltype(&Artifact::isBig), &Artifact::isBig>::invoke, false},
 	{"isTradable", LuaMethodWrapper<Artifact, decltype(&Artifact::isTradable), &Artifact::isTradable>::invoke, false},
 	{"getPrice", LuaMethodWrapper<Artifact, decltype(&Artifact::getPrice), &Artifact::getPrice>::invoke, false},
diff --git a/scripting/lua/api/BattleCb.cpp b/scripting/lua/api/BattleCb.cpp
index 222e6403c..de4e87a83 100644
--- a/scripting/lua/api/BattleCb.cpp
+++ b/scripting/lua/api/BattleCb.cpp
@@ -88,7 +88,7 @@ int BattleCbProxy::getTerrainType(lua_State * L)
 	if(!S.tryGet(1, object))
 		return S.retVoid();
 
-	return LuaStack::quickRetInt(L, object->battleTerrainType());
+	return LuaStack::quickRetInt(L, object->battleTerrainType().getNum());
 }
 
 int BattleCbProxy::getUnitByPos(lua_State * L)
diff --git a/scripting/lua/api/Creature.cpp b/scripting/lua/api/Creature.cpp
index 0b4713a83..bf6ed9e9c 100644
--- a/scripting/lua/api/Creature.cpp
+++ b/scripting/lua/api/Creature.cpp
@@ -31,12 +31,12 @@ const std::vector<CreatureProxy::CustomRegType> CreatureProxy::REGISTER_CUSTOM =
 	{"getIconIndex", LuaMethodWrapper<Creature, decltype(&Entity::getIconIndex), &Entity::getIconIndex>::invoke, false},
 	{"getIndex", LuaMethodWrapper<Creature, decltype(&Entity::getIndex), &Entity::getIndex>::invoke, false},
 	{"getJsonKey", LuaMethodWrapper<Creature, decltype(&Entity::getJsonKey), &Entity::getJsonKey>::invoke, false},
-	{"getName", LuaMethodWrapper<Creature, decltype(&Entity::getName), &Entity::getName>::invoke, false},
+	{"getName", LuaMethodWrapper<Creature, decltype(&Entity::getNameTranslated), &Entity::getNameTranslated>::invoke, false},
 	{"accessBonuses", LuaMethodWrapper<Creature, decltype(&EntityWithBonuses<CreatureID>::accessBonuses), &EntityWithBonuses<CreatureID>::accessBonuses>::invoke, false},
 
 	{"getMaxHealth", LuaMethodWrapper<Creature,decltype(&Creature::getMaxHealth), &Creature::getMaxHealth>::invoke, false},
-	{"getPluralName", LuaMethodWrapper<Creature, decltype(&Creature::getPluralName), &Creature::getPluralName>::invoke, false},
-	{"getSingularName", LuaMethodWrapper<Creature, decltype(&Creature::getSingularName), &Creature::getSingularName>::invoke, false},
+	{"getPluralName", LuaMethodWrapper<Creature, decltype(&Creature::getNamePluralTranslated), &Creature::getNamePluralTranslated>::invoke, false},
+	{"getSingularName", LuaMethodWrapper<Creature, decltype(&Creature::getNameSingularTranslated), &Creature::getNameSingularTranslated>::invoke, false},
 
 	{"getAdvMapAmountMin", LuaMethodWrapper<Creature, decltype(&Creature::getAdvMapAmountMin), &Creature::getAdvMapAmountMin>::invoke, false},
 	{"getAdvMapAmountMax", LuaMethodWrapper<Creature, decltype(&Creature::getAdvMapAmountMax), &Creature::getAdvMapAmountMax>::invoke, false},
diff --git a/scripting/lua/api/Faction.cpp b/scripting/lua/api/Faction.cpp
index 358c43dcb..07cce7462 100644
--- a/scripting/lua/api/Faction.cpp
+++ b/scripting/lua/api/Faction.cpp
@@ -30,7 +30,7 @@ const std::vector<FactionProxy::CustomRegType> FactionProxy::REGISTER_CUSTOM =
 	{"getIconIndex", LuaMethodWrapper<Faction, decltype(&Entity::getIconIndex), &Entity::getIconIndex>::invoke, false},
 	{"getIndex", LuaMethodWrapper<Faction, decltype(&Entity::getIndex), &Entity::getIndex>::invoke, false},
 	{"getJsonKey", LuaMethodWrapper<Faction, decltype(&Entity::getJsonKey), &Entity::getJsonKey>::invoke, false},
-	{"getName", LuaMethodWrapper<Faction, decltype(&Entity::getName), &Entity::getName>::invoke, false},
+	{"getName", LuaMethodWrapper<Faction, decltype(&Entity::getNameTranslated), &Entity::getNameTranslated>::invoke, false},
 	{"hasTown", LuaMethodWrapper<Faction, decltype(&Faction::hasTown), &Faction::hasTown>::invoke, false},
 };
 
diff --git a/scripting/lua/api/HeroClass.cpp b/scripting/lua/api/HeroClass.cpp
index 03835c4e5..31f0c88bf 100644
--- a/scripting/lua/api/HeroClass.cpp
+++ b/scripting/lua/api/HeroClass.cpp
@@ -29,7 +29,7 @@ const std::vector<HeroClassProxy::CustomRegType> HeroClassProxy::REGISTER_CUSTOM
 	{"getIconIndex", LuaMethodWrapper<HeroClass, decltype(&Entity::getIconIndex), &Entity::getIconIndex>::invoke, false},
 	{"getIndex", LuaMethodWrapper<HeroClass, decltype(&Entity::getIndex), &Entity::getIndex>::invoke, false},
 	{"getJsonKey", LuaMethodWrapper<HeroClass, decltype(&Entity::getJsonKey), &Entity::getJsonKey>::invoke, false},
-	{"getName", LuaMethodWrapper<HeroClass, decltype(&Entity::getName), &Entity::getName>::invoke, false},
+	{"getName", LuaMethodWrapper<HeroClass, decltype(&Entity::getNameTranslated), &Entity::getNameTranslated>::invoke, false},
 };
 
 }
diff --git a/scripting/lua/api/HeroType.cpp b/scripting/lua/api/HeroType.cpp
index c48ee8f48..87a4d8410 100644
--- a/scripting/lua/api/HeroType.cpp
+++ b/scripting/lua/api/HeroType.cpp
@@ -30,7 +30,7 @@ const std::vector<HeroTypeProxy::CustomRegType> HeroTypeProxy::REGISTER_CUSTOM =
 	{"getIconIndex", LuaMethodWrapper<HeroType, decltype(&Entity::getIconIndex), &Entity::getIconIndex>::invoke, false},
 	{"getIndex", LuaMethodWrapper<HeroType, decltype(&Entity::getIndex), &Entity::getIndex>::invoke, false},
 	{"getJsonKey", LuaMethodWrapper<HeroType, decltype(&Entity::getJsonKey), &Entity::getJsonKey>::invoke, false},
-	{"getName", LuaMethodWrapper<HeroType, decltype(&Entity::getName), &Entity::getName>::invoke, false},
+	{"getName", LuaMethodWrapper<HeroType, decltype(&Entity::getNameTranslated), &Entity::getNameTranslated>::invoke, false},
 };
 
 
diff --git a/scripting/lua/api/Skill.cpp b/scripting/lua/api/Skill.cpp
index bf00a0cca..eb08e3832 100644
--- a/scripting/lua/api/Skill.cpp
+++ b/scripting/lua/api/Skill.cpp
@@ -29,7 +29,7 @@ const std::vector<SkillProxy::CustomRegType> SkillProxy::REGISTER_CUSTOM =
 	{"getIconIndex", LuaMethodWrapper<Skill, decltype(&Entity::getIconIndex), &Entity::getIconIndex>::invoke, false},
 	{"getIndex", LuaMethodWrapper<Skill, decltype(&Entity::getIndex), &Entity::getIndex>::invoke, false},
 	{"getJsonKey", LuaMethodWrapper<Skill, decltype(&Entity::getJsonKey), &Entity::getJsonKey>::invoke, false},
-	{"getName", LuaMethodWrapper<Skill, decltype(&Entity::getName), &Entity::getName>::invoke, false},
+	{"getName", LuaMethodWrapper<Skill, decltype(&Entity::getNameTranslated), &Entity::getNameTranslated>::invoke, false},
 };
 
 }
diff --git a/scripting/lua/api/Spell.cpp b/scripting/lua/api/Spell.cpp
index cd3eb9a3f..4460b2deb 100644
--- a/scripting/lua/api/Spell.cpp
+++ b/scripting/lua/api/Spell.cpp
@@ -33,7 +33,7 @@ const std::vector<SpellProxy::CustomRegType> SpellProxy::REGISTER_CUSTOM =
 	{"getIconIndex", LuaMethodWrapper<Spell, decltype(&Entity::getIconIndex), &Entity::getIconIndex>::invoke, false},
 	{"getIndex", LuaMethodWrapper<Spell, decltype(&Entity::getIndex), &Entity::getIndex>::invoke, false},
 	{"getJsonKey", LuaMethodWrapper<Spell, decltype(&Entity::getJsonKey), &Entity::getJsonKey>::invoke, false},
-	{"getName", LuaMethodWrapper<Spell, decltype(&Entity::getName), &Entity::getName>::invoke, false},
+	{"getName", LuaMethodWrapper<Spell, decltype(&Entity::getNameTranslated), &Entity::getNameTranslated>::invoke, false},
 
 	{"isAdventure", LuaMethodWrapper<Spell, decltype(&Spell::isAdventure), &Spell::isAdventure>::invoke, false},
 	{"isCombat", LuaMethodWrapper<Spell, decltype(&Spell::isCombat), &Spell::isCombat>::invoke, false},
@@ -48,7 +48,7 @@ const std::vector<SpellProxy::CustomRegType> SpellProxy::REGISTER_CUSTOM =
 	{"getCost", LuaMethodWrapper<Spell, decltype(&Spell::getCost), &Spell::getCost>::invoke, false},
 	{"getBasePower", LuaMethodWrapper<Spell, decltype(&Spell::getBasePower), &Spell::getBasePower>::invoke, false},
 	{"getLevelPower", LuaMethodWrapper<Spell, decltype(&Spell::getLevelPower), &Spell::getLevelPower>::invoke, false},
-	{"getLevelDescription", LuaMethodWrapper<Spell, decltype(&Spell::getLevelDescription), &Spell::getLevelDescription>::invoke, false},
+	{"getLevelDescription", LuaMethodWrapper<Spell, decltype(&Spell::getDescriptionTranslated), &Spell::getDescriptionTranslated>::invoke, false},
 };
 
 }