Namespace switch

Hi Cody. Please review the changes I made. If you have any questions, let me know. If you're good with them, please send them to Rich, tagging that I reviewed them.
Thanks.