rename & add message types