Various renames and tidy-ups.