Fixed : new name for Message classes.