Reorder to match what is shown in blog post
Consistently name message parameter