Fix channel name issues