XD-885 Fix channel names

- Fix channel var names in Listener classes