More naming convention changes( remove closed-class words capitalization)