Revert "NameSpace Rename"

This reverts commit 24bd0e697fdfe658a7f544d458dbb570f7b6bbcd.