Some renames.
Update slides.