Fixed model namespaces