Titlecase more terms to respect naming convention