Revert " - fixed namespace"

This reverts commit 0c942f4967eff63b7c71fe61de4cf3379186b8cb.