Small name changes
Merge branch 'd2-dev' of github.com:cpausmit/IntelROCCS into d2-dev
Small changes