Renamed demux classes; fixe minor issues.