...G...... [ZBXNEXT-497] changed naming of variables