channels/client: name refactoring