Some documentation and renaming.