[NOJIRA] Fix namespacing issues for models
Merge pull request #1043 from yuhunglin/NOJIRA3

[NOJIRA] Fix namespacing issues for models