[RIC-196] Update variables naming & add UT