Rename namespaces for clarity of references