Proposing various renames.  Let's discuss and revert if we don't like the new naming.