Documentation tweaks and renaming