More naming convention changes( do not capitalize closed-class words and modify form titles)