Documentation and renaming, again.