Update readme to reflect what is in the documentation.
Naming cleanup.
Naming cleanup.