Update models to use fully-classified namespaces