[Olena-patches] 1027: Renaming some concepts with more explicit and longer names.