A little renaming for clarity.
Updated docs after renaming things.