Redone Namesspace usuage
Merge branch 'sw.nohom.act', remote branch 'origin/sw.nohom.act' into sw.nohom.act