change message structure and name