Update to match Schema/Application namespace changes.