Titles and references cleanup, part 1.