Updated content (renaming mostly).