NOJIRA: step 1 of rename
NOJIRA: step 2 of rename
Merge branch 'UCJEPS-282' of https://github.com/rjaffe/ucjeps_project into UCJEPS-282