Adding and Fixing Namespaces