Technical debts removed - Method's name of as convention