Refactoring namespaces to be more unique