More refactoring (renamed datachannel)