Fix channel API and renaming