Changed Namespacing Logic