Change some variable names and comments in channels