Adjusted namespaces to stroke my ego