Cleaned up namespaces in Metamodel