Making the type names a bit cleaner - tried experimenting with a better interface to the channels but failed, will try again later