Test OStrategy.
Lots of renaming.  Also, clean up updates of point descriptions.