Tidy up recipes.

Make names slightly more consistent.