Cleanup and more consistent naming.
Rename 'content' to 'body' where applicable.