TESB-10765:Naming ajustment