A......... [ZBX-8634] Revert variable name changes.