Don't use the term "envelope".

envelope => request
message => expected_plan
Fix indent
Prepare to distribute multiple messages