Updating Channels to conform to.. 'convention'