Update to work with reorganized namespaces in SchemaSchema 0fee335f7968db58c6db1de70401587b4aeb16b8.