minor renaming
more minor renaming
yet more comment cleanups