Cleaned up some of the concept names
Merge pull request #118 from anderssv/docs-clean-up-names

Cleaned up some of the concept names