updated namespace
Merge branch 'hotfix/update-entity-manager-namespace'