.......... [ZBXNEXT-686] renamed some of the classes