Reinsert code for keeping old channel names