some cleanup/method name changes on message
some cleanup/method name changes on message