Function renames, reorg, minor doc update