..F....... [ZBXNEXT-219] minor code refactoring: changed few variable names to better specify their contents