Pushing Namespacing Logic down to Objects
Fixed Typo
Fixed Namespacing Issue