CR-127: Matching the new naming convention for models and collections in commons.
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf into cr127