[BACKLOG-207] - Changing features naming