added modifications to reflect the changes from all commits since Alan left.

these result in a renaming and a fixing of a few tests.