More naming convention changes(add titles to empty title forms and titlecase more terms)