Tidy up recipes.

Make names slightly more consistent.
Merge pull request #921 from square/jwilson_0611_tidy_examples

Tidy up recipes.