Keep the 'Handler' in the name. I'm working on a branch that will add Handler to the output of the ```message_type_to_handler``` function. You can leave this as is for now, and I'll come back and change it with my pull request