Bump XMP artifact to version 1.21, adjust imports for changed package name