FORUM-239 | Fix problem of label hardcoded and change some labels