cleanups/name changes
doc updates