Various renames and minor improvements for wiki.