assorted renaming, to clarify meanings for Ian
another renaming