More refactoring of form titles.