Cleaned up and nicified simple example.
Rename as discussed.
More renaming.