change the message class to a more generic name.