Replaced hardcoded tags in message classes to follow  convention