Split/add and fixes

`s/locations/UsageKeys or CourseKeys`