switch endpoint names to messages => message