Minor edits to replace old names, mostly.  Tests pass.