Documentation fixes and naming changes.