Minor Namespace Refactors