Renamed fields, merged course and preference settings into settings. 

Ignore the previous pull request due to the unnecessary reverts there.