[java-idp-oidc] 35/44: JOIDC-5 Renamed *EncryptionResponse to *EncryptedResponse

[Henri Mikkonen]

This is an automated email from the git hooks/post-receive script.

hjmikkon pushed a commit to branch main
in repository java-idp-oidc.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-oidc.git;a=commit;h=0bda2dab93e94e77acd7fe018e10b998d785f755

commit 0bda2dab93e94e77acd7fe018e10b998d785f755
Author: Henri Mikkonen <henri.mikkonen at iki.fi>
AuthorDate: Fri Sep 18 15:17:29 2020 +0300

    JOIDC-5 Renamed *EncryptionResponse to *EncryptedResponse
    
    https://issues.shibboleth.net/jira/browse/JOIDC-5
---
 ...seAlg.java => IdTokenEncryptedResponseAlg.java} |  6 +--
 ...seEnc.java => IdTokenEncryptedResponseEnc.java} |  6 +--
 .../idp/saml/oidc/xmlobject/OAuthRPExtensions.java | 16 +++----
 ...eEnc.java => UserInfoEncryptedResponseAlg.java} |  6 +--
 ...eAlg.java => UserInfoEncryptedResponseEnc.java} |  6 +--
 ...ava => IdTokenEncryptedResponseAlgBuilder.java} | 16 +++----
 ...l.java => IdTokenEncryptedResponseAlgImpl.java} |  8 ++--
 ... => IdTokenEncryptedResponseAlgMarshaller.java} |  6 +--
 ...> IdTokenEncryptedResponseAlgUnmarshaller.java} |  6 +--
 ...ava => IdTokenEncryptedResponseEncBuilder.java} | 16 +++----
 ...l.java => IdTokenEncryptedResponseEncImpl.java} |  8 ++--
 ... => IdTokenEncryptedResponseEncMarshaller.java} |  6 +--
 ...> IdTokenEncryptedResponseEncUnmarshaller.java} |  6 +--
 .../oidc/xmlobject/impl/OAuthRPExtensionsImpl.java | 56 +++++++++++-----------
 .../impl/OAuthRPExtensionsUnmarshaller.java        | 24 +++++-----
 ...va => UserInfoEncryptedResponseAlgBuilder.java} | 16 +++----
 ....java => UserInfoEncryptedResponseAlgImpl.java} |  9 ++--
 ...=> UserInfoEncryptedResponseAlgMarshaller.java} |  6 +--
 ... UserInfoEncryptedResponseAlgUnmarshaller.java} |  6 +--
 ...va => UserInfoEncryptedResponseEncBuilder.java} | 16 +++----
 ....java => UserInfoEncryptedResponseEncImpl.java} |  8 ++--
 ...=> UserInfoEncryptedResponseEncMarshaller.java} |  6 +--
 ... UserInfoEncryptedResponseEncUnmarshaller.java} |  6 +--
 .../UserInfoEncryptionResponseAlgUnmarshaller.java | 26 ----------
 .../UserInfoEncryptionResponseEncUnmarshaller.java | 26 ----------
 .../impl/ClientInformationNodeProcessor.java       |  8 ++--
 .../resources/saml2-metadata-oidcmd-config.xml     | 32 ++++++-------
 27 files changed, 154 insertions(+), 203 deletions(-)

diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptionResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseAlg.java
similarity index 87%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptionResponseAlg.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseAlg.java
index a6278133..68ec3203 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptionResponseAlg.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseAlg.java
@@ -19,12 +19,12 @@ package net.shibboleth.idp.saml.oidc.xmlobject;
 import javax.xml.namespace.QName;
 
 /**
- * SAML2 OIDC metadata extension 'IdTokenEncryptionResponseAlg'.
+ * SAML2 OIDC metadata extension 'IdTokenEncryptedResponseAlg'.
  */
-public interface IdTokenEncryptionResponseAlg extends MetadataValueSAMLObject {
+public interface IdTokenEncryptedResponseAlg extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IdTokenEncryptionResponseAlg";
+    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IdTokenEncryptedResponseAlg";
 
     /** Default element name. */
     public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptionResponseEnc.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseEnc.java
similarity index 87%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptionResponseEnc.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseEnc.java
index 031cf3b3..08f554da 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptionResponseEnc.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/IdTokenEncryptedResponseEnc.java
@@ -19,12 +19,12 @@ package net.shibboleth.idp.saml.oidc.xmlobject;
 import javax.xml.namespace.QName;
 
 /**
- * SAML2 OIDC metadata extension 'IdTokenEncryptionResponseEnc'.
+ * SAML2 OIDC metadata extension 'IdTokenEncryptedResponseEnc'.
  */
-public interface IdTokenEncryptionResponseEnc extends MetadataValueSAMLObject {
+public interface IdTokenEncryptedResponseEnc extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IdTokenEncryptionResponseEnc";
+    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "IdTokenEncryptedResponseEnc";
 
     /** Default element name. */
     public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
index efe1e7ee..88229291 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/OAuthRPExtensions.java
@@ -178,28 +178,28 @@ public interface OAuthRPExtensions extends SAMLObject {
      * 
      * @return The JWE alg algorithm for ID token encryption.
      */
-    public IdTokenEncryptionResponseAlg getIdTokenEncryptionResponseAlg();
+    public IdTokenEncryptedResponseAlg getIdTokenEncryptedResponseAlg();
     
     /**
      * Set the JWE alg algorithm for ID token encryption.
      * 
      * @param algorithm The JWE alg algorithm for ID token encryption.
      */
-    public void setIdTokenEncryptionResponseAlg(final IdTokenEncryptionResponseAlg algorithm);
+    public void setIdTokenEncryptedResponseAlg(final IdTokenEncryptedResponseAlg algorithm);
 
     /**
      * Get the JWE enc algorithm for ID token encryption.
      * 
      * @return The JWE enc algorithm for ID token encryption.
      */
-    public IdTokenEncryptionResponseEnc getIdTokenEncryptionResponseEnc();
+    public IdTokenEncryptedResponseEnc getIdTokenEncryptedResponseEnc();
     
     /**
      * Set the JWE enc algorithm for ID token encryption.
      * 
      * @param algorithm The JWE enc algorithm for ID token encryption.
      */
-    public void setIdTokenEncryptionResponseEnc(final IdTokenEncryptionResponseEnc algorithm);
+    public void setIdTokenEncryptedResponseEnc(final IdTokenEncryptedResponseEnc algorithm);
 
     /**
      * Get the JWS alg algorithm for UserInfo response signature.
@@ -220,28 +220,28 @@ public interface OAuthRPExtensions extends SAMLObject {
      * 
      * @return The JWE alg algorithm for UserInfo response encryption.
      */
-    public UserInfoEncryptionResponseAlg getUserInfoEncryptionResponseAlg();
+    public UserInfoEncryptedResponseAlg getUserInfoEncryptedResponseAlg();
     
     /**
      * Set the JWE alg algorithm for UserInfo response encryption.
      * 
      * @param algorithm The JWE alg algorithm for UserInfo response encryption.
      */
-    public void setUserInfoEncryptionResponseAlg(final UserInfoEncryptionResponseAlg algorithm);
+    public void setUserInfoEncryptedResponseAlg(final UserInfoEncryptedResponseAlg algorithm);
 
     /**
      * Get the JWE enc algorithm for UserInfo response encryption.
      * 
      * @return The JWE enc algorithm for UserInfo response encryption.
      */
-    public UserInfoEncryptionResponseEnc getUserInfoEncryptionResponseEnc();
+    public UserInfoEncryptedResponseEnc getUserInfoEncryptedResponseEnc();
     
     /**
      * Set the JWE enc algorithm for UserInfo response encryption.
      * 
      * @param algorithm The JWE enc algorithm for UserInfo response encryption.
      */
-    public void setUserInfoEncryptionResponseEnc(final UserInfoEncryptionResponseEnc algorithm);
+    public void setUserInfoEncryptedResponseEnc(final UserInfoEncryptedResponseEnc algorithm);
     
     /**
      * Get the JWS alg algorithm for request object signature.
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptionResponseEnc.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseAlg.java
similarity index 86%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptionResponseEnc.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseAlg.java
index f3266016..481fc999 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptionResponseEnc.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseAlg.java
@@ -19,12 +19,12 @@ package net.shibboleth.idp.saml.oidc.xmlobject;
 import javax.xml.namespace.QName;
 
 /**
- * SAML2 OIDC metadata extension 'UserInfoEncryptionResponseEnc'.
+ * SAML2 OIDC metadata extension 'UserInfoEncryptedResponseAlg'.
  */
-public interface UserInfoEncryptionResponseEnc extends MetadataValueSAMLObject {
+public interface UserInfoEncryptedResponseAlg extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UserInfoEncryptionResponseEnc";
+    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UserInfoEncryptedResponseAlg";
 
     /** Default element name. */
     public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptionResponseAlg.java b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseEnc.java
similarity index 86%
rename from idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptionResponseAlg.java
rename to idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseEnc.java
index ab053df0..91e1ff53 100644
--- a/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptionResponseAlg.java
+++ b/idp-oidc-extension-api/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/UserInfoEncryptedResponseEnc.java
@@ -19,12 +19,12 @@ package net.shibboleth.idp.saml.oidc.xmlobject;
 import javax.xml.namespace.QName;
 
 /**
- * SAML2 OIDC metadata extension 'UserInfoEncryptionResponseAlg'.
+ * SAML2 OIDC metadata extension 'UserInfoEncryptedResponseEnc'.
  */
-public interface UserInfoEncryptionResponseAlg extends MetadataValueSAMLObject {
+public interface UserInfoEncryptedResponseEnc extends MetadataValueSAMLObject {
 
     /** Element name, no namespace. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UserInfoEncryptionResponseAlg";
+    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "UserInfoEncryptedResponseEnc";
 
     /** Default element name. */
     public static final QName DEFAULT_ELEMENT_NAME = new QName(SAML20MDOIDCMD_NS, DEFAULT_ELEMENT_LOCAL_NAME,
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgBuilder.java
similarity index 57%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgBuilder.java
index 56103568..05b4244e 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
 import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
 import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
 
 /**
- * Builder of {@link UserInfoEncryptionResponseEncImpl}.
+ * Builder of {@link IdTokenEncryptedResponseAlgImpl}.
  */
-public class UserInfoEncryptionResponseEncBuilder extends AbstractSAMLObjectBuilder<UserInfoEncryptionResponseEnc> {
+public class IdTokenEncryptedResponseAlgBuilder extends AbstractSAMLObjectBuilder<IdTokenEncryptedResponseAlg> {
 
     /**
      * Constructor.
      */
-    public UserInfoEncryptionResponseEncBuilder() {
+    public IdTokenEncryptedResponseAlgBuilder() {
 
     }
 
     /** {@inheritDoc} */
-    public UserInfoEncryptionResponseEnc buildObject() {
-        return buildObject(Constants.SAML20MDOIDCMD_NS, UserInfoEncryptionResponseEnc.DEFAULT_ELEMENT_LOCAL_NAME,
+    public IdTokenEncryptedResponseAlg buildObject() {
+        return buildObject(Constants.SAML20MDOIDCMD_NS, IdTokenEncryptedResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
                 Constants.SAML20MDOIDCMD_PREFIX);
     }
 
     /** {@inheritDoc} */
-    public UserInfoEncryptionResponseEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
-        return new UserInfoEncryptionResponseEncImpl(namespaceURI, localName, namespacePrefix);
+    public IdTokenEncryptedResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+        return new IdTokenEncryptedResponseAlgImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgImpl.java
similarity index 70%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgImpl.java
index 8ca7fcf4..4b50ed09 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgImpl.java
@@ -16,12 +16,12 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
 
 /**
- * Concrete implementation of {@link UserInfoEncryptionResponseAlg}.
+ * Concrete implementation of {@link IdTokenEncryptedResponseAlg}.
  */
-public class UserInfoEncryptionResponseAlgImpl extends AbstractMetadataValueSAMLObject implements UserInfoEncryptionResponseAlg {
+public class IdTokenEncryptedResponseAlgImpl extends AbstractMetadataValueSAMLObject implements IdTokenEncryptedResponseAlg {
 
     /**
      * Constructor.
@@ -30,7 +30,7 @@ public class UserInfoEncryptionResponseAlgImpl extends AbstractMetadataValueSAML
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected UserInfoEncryptionResponseAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+    protected IdTokenEncryptedResponseAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgMarshaller.java
similarity index 70%
copy from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java
copy to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgMarshaller.java
index 1fd4c452..4e99cec4 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgMarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
 
 /**
- * A thread safe Marshaller for {@link IdTokenEncryptionResponseEnc} objects.
+ * A thread safe Marshaller for {@link IdTokenEncryptedResponseAlg} objects.
  */
-public class IdTokenEncryptionResponseEncMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptionResponseEnc> {
+public class IdTokenEncryptedResponseAlgMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptedResponseAlg> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgUnmarshaller.java
similarity index 71%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgUnmarshaller.java
index 02179a73..229b0842 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseAlgUnmarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
 
 /**
- * A thread safe Marshaller for {@link UserInfoEncryptionResponseAlg} objects.
+ * A thread-safe Unmarshaller for {@link IdTokenEncryptedResponseAlg} objects.
  */
-public class UserInfoEncryptionResponseAlgMarshaller extends AbstractMetadataValueMarshaller<UserInfoEncryptionResponseAlg> {
+public class IdTokenEncryptedResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<IdTokenEncryptedResponseAlg> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncBuilder.java
similarity index 57%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncBuilder.java
index 8b0072fc..a903a943 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
 import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
 import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
 
 /**
- * Builder of {@link UserInfoEncryptionResponseAlgImpl}.
+ * Builder of {@link IdTokenEncryptedResponseEncImpl}.
  */
-public class UserInfoEncryptionResponseAlgBuilder extends AbstractSAMLObjectBuilder<UserInfoEncryptionResponseAlg> {
+public class IdTokenEncryptedResponseEncBuilder extends AbstractSAMLObjectBuilder<IdTokenEncryptedResponseEnc> {
 
     /**
      * Constructor.
      */
-    public UserInfoEncryptionResponseAlgBuilder() {
+    public IdTokenEncryptedResponseEncBuilder() {
 
     }
 
     /** {@inheritDoc} */
-    public UserInfoEncryptionResponseAlg buildObject() {
-        return buildObject(Constants.SAML20MDOIDCMD_NS, UserInfoEncryptionResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
+    public IdTokenEncryptedResponseEnc buildObject() {
+        return buildObject(Constants.SAML20MDOIDCMD_NS, IdTokenEncryptedResponseEnc.DEFAULT_ELEMENT_LOCAL_NAME,
                 Constants.SAML20MDOIDCMD_PREFIX);
     }
 
     /** {@inheritDoc} */
-    public UserInfoEncryptionResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
-        return new UserInfoEncryptionResponseAlgImpl(namespaceURI, localName, namespacePrefix);
+    public IdTokenEncryptedResponseEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+        return new IdTokenEncryptedResponseEncImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncImpl.java
similarity index 70%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncImpl.java
index 6aa56124..218d94df 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncImpl.java
@@ -16,12 +16,12 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
 
 /**
- * Concrete implementation of {@link UserInfoEncryptionResponseEnc}.
+ * Concrete implementation of {@link IdTokenEncryptedResponseEnc}.
  */
-public class UserInfoEncryptionResponseEncImpl extends AbstractMetadataValueSAMLObject implements UserInfoEncryptionResponseEnc {
+public class IdTokenEncryptedResponseEncImpl extends AbstractMetadataValueSAMLObject implements IdTokenEncryptedResponseEnc {
 
     /**
      * Constructor.
@@ -30,7 +30,7 @@ public class UserInfoEncryptionResponseEncImpl extends AbstractMetadataValueSAML
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected UserInfoEncryptionResponseEncImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+    protected IdTokenEncryptedResponseEncImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncMarshaller.java
similarity index 70%
copy from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java
copy to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncMarshaller.java
index 1fd4c452..85602efa 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncMarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
 
 /**
- * A thread safe Marshaller for {@link IdTokenEncryptionResponseEnc} objects.
+ * A thread safe Marshaller for {@link IdTokenEncryptedResponseEnc} objects.
  */
-public class IdTokenEncryptionResponseEncMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptionResponseEnc> {
+public class IdTokenEncryptedResponseEncMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptedResponseEnc> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncUnmarshaller.java
similarity index 71%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncUnmarshaller.java
index 2dd468ca..788bfc92 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptedResponseEncUnmarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
 
 /**
- * A thread safe Marshaller for {@link UserInfoEncryptionResponseEnc} objects.
+ * A thread-safe Unmarshaller for {@link IdTokenEncryptedResponseEnc} objects.
  */
-public class UserInfoEncryptionResponseEncMarshaller extends AbstractMetadataValueMarshaller<UserInfoEncryptionResponseEnc> {
+public class IdTokenEncryptedResponseEncUnmarshaller extends AbstractMetadataValueUnmarshaller<IdTokenEncryptedResponseEnc> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
index 2e373a5f..0f84f9d7 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsImpl.java
@@ -29,8 +29,8 @@ import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
 import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
 import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
 import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
 import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
 import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
 import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
@@ -47,8 +47,8 @@ import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
 import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
 import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
 import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
 import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
 
 /**
@@ -88,20 +88,20 @@ public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRP
     /** ID token signed response algorithm for this entity. */
     private IdTokenSignedResponseAlg idTokenSignedResponseAlg;
     
-    /** ID token encryption response algorithm for this entity. */
-    private IdTokenEncryptionResponseAlg idTokenEncryptionResponseAlg;
+    /** ID token encrypted response algorithm for this entity. */
+    private IdTokenEncryptedResponseAlg idTokenEncryptedResponseAlg;
 
-    /** ID token encryption response encoder for this entity. */
-    private IdTokenEncryptionResponseEnc idTokenEncryptionResponseEnc;
+    /** ID token encrypted response encoder for this entity. */
+    private IdTokenEncryptedResponseEnc idTokenEncryptedResponseEnc;
 
     /** User info signed response algorithm for this entity. */
     private UserInfoSignedResponseAlg userInfoSignedResponseAlg;
     
-    /** User info encryption response algorithm for this entity. */
-    private UserInfoEncryptionResponseAlg userInfoEncryptionResponseAlg;
+    /** User info encrypted response algorithm for this entity. */
+    private UserInfoEncryptedResponseAlg userInfoEncryptedResponseAlg;
 
-    /** User info encryption response encoder for this entity. */
-    private UserInfoEncryptionResponseEnc userInfoEncryptionResponseEnc;
+    /** User info encrypted response encoder for this entity. */
+    private UserInfoEncryptedResponseEnc userInfoEncryptedResponseEnc;
 
     /** Request object signing algorithm for this entity. */
     private RequestObjectSigningAlg requestObjectSigningAlg;
@@ -277,26 +277,26 @@ public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRP
 
     /** {@inheritDoc} */
     @Override
-    public IdTokenEncryptionResponseAlg getIdTokenEncryptionResponseAlg() {
-        return  idTokenEncryptionResponseAlg;
+    public IdTokenEncryptedResponseAlg getIdTokenEncryptedResponseAlg() {
+        return  idTokenEncryptedResponseAlg;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setIdTokenEncryptionResponseAlg(IdTokenEncryptionResponseAlg algorithm) {
-        idTokenEncryptionResponseAlg = algorithm;
+    public void setIdTokenEncryptedResponseAlg(IdTokenEncryptedResponseAlg algorithm) {
+        idTokenEncryptedResponseAlg = algorithm;
     }
 
     /** {@inheritDoc} */
     @Override
-    public IdTokenEncryptionResponseEnc getIdTokenEncryptionResponseEnc() {
-        return idTokenEncryptionResponseEnc;
+    public IdTokenEncryptedResponseEnc getIdTokenEncryptedResponseEnc() {
+        return idTokenEncryptedResponseEnc;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setIdTokenEncryptionResponseEnc(IdTokenEncryptionResponseEnc algorithm) {
-        idTokenEncryptionResponseEnc = algorithm;
+    public void setIdTokenEncryptedResponseEnc(IdTokenEncryptedResponseEnc algorithm) {
+        idTokenEncryptedResponseEnc = algorithm;
     }
 
     /** {@inheritDoc} */
@@ -313,26 +313,26 @@ public class OAuthRPExtensionsImpl extends RoleDescriptorImpl implements OAuthRP
 
     /** {@inheritDoc} */
     @Override
-    public UserInfoEncryptionResponseAlg getUserInfoEncryptionResponseAlg() {
-        return userInfoEncryptionResponseAlg;
+    public UserInfoEncryptedResponseAlg getUserInfoEncryptedResponseAlg() {
+        return userInfoEncryptedResponseAlg;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setUserInfoEncryptionResponseAlg(UserInfoEncryptionResponseAlg algorithm) {
-        userInfoEncryptionResponseAlg = algorithm;
+    public void setUserInfoEncryptedResponseAlg(UserInfoEncryptedResponseAlg algorithm) {
+        userInfoEncryptedResponseAlg = algorithm;
     }
 
     /** {@inheritDoc} */
     @Override
-    public UserInfoEncryptionResponseEnc getUserInfoEncryptionResponseEnc() {
-        return userInfoEncryptionResponseEnc;
+    public UserInfoEncryptedResponseEnc getUserInfoEncryptedResponseEnc() {
+        return userInfoEncryptedResponseEnc;
     }
 
     /** {@inheritDoc} */
     @Override
-    public void setUserInfoEncryptionResponseEnc(UserInfoEncryptionResponseEnc algorithm) {
-        userInfoEncryptionResponseEnc = algorithm;
+    public void setUserInfoEncryptedResponseEnc(UserInfoEncryptedResponseEnc algorithm) {
+        userInfoEncryptedResponseEnc = algorithm;
     }
 
     /** {@inheritDoc} */
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
index 2fb5482b..ba391bae 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/OAuthRPExtensionsUnmarshaller.java
@@ -27,8 +27,8 @@ import net.shibboleth.idp.saml.oidc.xmlobject.ApplicationType;
 import net.shibboleth.idp.saml.oidc.xmlobject.ClientUri;
 import net.shibboleth.idp.saml.oidc.xmlobject.DefaultAcrValue;
 import net.shibboleth.idp.saml.oidc.xmlobject.GrantType;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptedResponseEnc;
 import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenSignedResponseAlg;
 import net.shibboleth.idp.saml.oidc.xmlobject.InitiateLoginUri;
 import net.shibboleth.idp.saml.oidc.xmlobject.JwksUri;
@@ -45,8 +45,8 @@ import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareId;
 import net.shibboleth.idp.saml.oidc.xmlobject.SoftwareVersion;
 import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthMethod;
 import net.shibboleth.idp.saml.oidc.xmlobject.TokenEndpointAuthSigningAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
 import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoSignedResponseAlg;
 
 /**
@@ -81,16 +81,16 @@ public class OAuthRPExtensionsUnmarshaller extends AbstractSAMLObjectUnmarshalle
             descriptor.setSectorIdentifierUri((SectorIdentifierUri) childSAMLObject);
         } else if (childSAMLObject instanceof IdTokenSignedResponseAlg) {
             descriptor.setIdTokenSignedResponseAlg((IdTokenSignedResponseAlg) childSAMLObject);
-        } else if (childSAMLObject instanceof IdTokenEncryptionResponseAlg) {
-            descriptor.setIdTokenEncryptionResponseAlg((IdTokenEncryptionResponseAlg) childSAMLObject);
-        } else if (childSAMLObject instanceof IdTokenEncryptionResponseEnc) {
-            descriptor.setIdTokenEncryptionResponseEnc((IdTokenEncryptionResponseEnc) childSAMLObject);
+        } else if (childSAMLObject instanceof IdTokenEncryptedResponseAlg) {
+            descriptor.setIdTokenEncryptedResponseAlg((IdTokenEncryptedResponseAlg) childSAMLObject);
+        } else if (childSAMLObject instanceof IdTokenEncryptedResponseEnc) {
+            descriptor.setIdTokenEncryptedResponseEnc((IdTokenEncryptedResponseEnc) childSAMLObject);
         } else if (childSAMLObject instanceof UserInfoSignedResponseAlg) {
             descriptor.setUserInfoSignedResponseAlg((UserInfoSignedResponseAlg) childSAMLObject);
-        } else if (childSAMLObject instanceof UserInfoEncryptionResponseAlg) {
-            descriptor.setUserInfoEncryptionResponseAlg((UserInfoEncryptionResponseAlg) childSAMLObject);
-        } else if (childSAMLObject instanceof UserInfoEncryptionResponseEnc) {
-            descriptor.setUserInfoEncryptionResponseEnc((UserInfoEncryptionResponseEnc) childSAMLObject);
+        } else if (childSAMLObject instanceof UserInfoEncryptedResponseAlg) {
+            descriptor.setUserInfoEncryptedResponseAlg((UserInfoEncryptedResponseAlg) childSAMLObject);
+        } else if (childSAMLObject instanceof UserInfoEncryptedResponseEnc) {
+            descriptor.setUserInfoEncryptedResponseEnc((UserInfoEncryptedResponseEnc) childSAMLObject);
         } else if (childSAMLObject instanceof RequestObjectSigningAlg) {
             descriptor.setRequestObjectSigningAlg((RequestObjectSigningAlg) childSAMLObject);
         } else if (childSAMLObject instanceof RequestObjectEncryptionAlg) {
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgBuilder.java
similarity index 64%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgBuilder.java
index 52e2bb8d..4b34ebf6 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
 import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
 import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
 
 /**
- * Builder of {@link IdTokenEncryptionResponseAlgImpl}.
+ * Builder of {@link UserInfoEncryptedResponseAlgImpl}.
  */
-public class IdTokenEncryptionResponseAlgBuilder extends AbstractSAMLObjectBuilder<IdTokenEncryptionResponseAlg> {
+public class UserInfoEncryptedResponseAlgBuilder extends AbstractSAMLObjectBuilder<UserInfoEncryptedResponseAlg> {
 
     /**
      * Constructor.
      */
-    public IdTokenEncryptionResponseAlgBuilder() {
+    public UserInfoEncryptedResponseAlgBuilder() {
 
     }
 
     /** {@inheritDoc} */
-    public IdTokenEncryptionResponseAlg buildObject() {
-        return buildObject(Constants.SAML20MDOIDCMD_NS, IdTokenEncryptionResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
+    public UserInfoEncryptedResponseAlg buildObject() {
+        return buildObject(Constants.SAML20MDOIDCMD_NS, UserInfoEncryptedResponseAlg.DEFAULT_ELEMENT_LOCAL_NAME,
                 Constants.SAML20MDOIDCMD_PREFIX);
     }
 
     /** {@inheritDoc} */
-    public IdTokenEncryptionResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
-        return new IdTokenEncryptionResponseAlgImpl(namespaceURI, localName, namespacePrefix);
+    public UserInfoEncryptedResponseAlg buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+        return new UserInfoEncryptedResponseAlgImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgImpl.java
similarity index 76%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgImpl.java
index 2977b057..b5704260 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgImpl.java
@@ -16,9 +16,12 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
 
-public class IdTokenEncryptionResponseAlgImpl extends AbstractMetadataValueSAMLObject implements IdTokenEncryptionResponseAlg {
+/**
+ * Concrete implementation of {@link UserInfoEncryptedResponseAlg}.
+ */
+public class UserInfoEncryptedResponseAlgImpl extends AbstractMetadataValueSAMLObject implements UserInfoEncryptedResponseAlg {
 
     /**
      * Constructor.
@@ -27,7 +30,7 @@ public class IdTokenEncryptionResponseAlgImpl extends AbstractMetadataValueSAMLO
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IdTokenEncryptionResponseAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+    protected UserInfoEncryptedResponseAlgImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgMarshaller.java
similarity index 73%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgMarshaller.java
index b899fc4c..b5c8f6d8 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgMarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
 
 /**
- * A thread safe Marshaller for {@link IdTokenEncryptionResponseAlg} objects.
+ * A thread safe Marshaller for {@link UserInfoEncryptedResponseAlg} objects.
  */
-public class IdTokenEncryptionResponseAlgMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptionResponseAlg> {
+public class UserInfoEncryptedResponseAlgMarshaller extends AbstractMetadataValueMarshaller<UserInfoEncryptedResponseAlg> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgUnmarshaller.java
similarity index 73%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgUnmarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgUnmarshaller.java
index dc02b79e..da212e21 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseAlgUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseAlgUnmarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseAlg;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseAlg;
 
 /**
- * A thread-safe Unmarshaller for {@link IdTokenEncryptionResponseAlg} objects.
+ * A thread-safe Unmarshaller for {@link UserInfoEncryptedResponseAlg} objects.
  */
-public class IdTokenEncryptionResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<IdTokenEncryptionResponseAlg> {
+public class UserInfoEncryptedResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<UserInfoEncryptedResponseAlg> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncBuilder.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncBuilder.java
similarity index 64%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncBuilder.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncBuilder.java
index a680d5a8..1457d238 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncBuilder.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncBuilder.java
@@ -18,29 +18,29 @@ package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
 import org.opensaml.saml.common.AbstractSAMLObjectBuilder;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
 import net.shibboleth.idp.saml.oidc.xmlobject.Constants;
 
 /**
- * Builder of {@link IdTokenEncryptionResponseEncImpl}.
+ * Builder of {@link UserInfoEncryptedResponseEncImpl}.
  */
-public class IdTokenEncryptionResponseEncBuilder extends AbstractSAMLObjectBuilder<IdTokenEncryptionResponseEnc> {
+public class UserInfoEncryptedResponseEncBuilder extends AbstractSAMLObjectBuilder<UserInfoEncryptedResponseEnc> {
 
     /**
      * Constructor.
      */
-    public IdTokenEncryptionResponseEncBuilder() {
+    public UserInfoEncryptedResponseEncBuilder() {
 
     }
 
     /** {@inheritDoc} */
-    public IdTokenEncryptionResponseEnc buildObject() {
-        return buildObject(Constants.SAML20MDOIDCMD_NS, IdTokenEncryptionResponseEnc.DEFAULT_ELEMENT_LOCAL_NAME,
+    public UserInfoEncryptedResponseEnc buildObject() {
+        return buildObject(Constants.SAML20MDOIDCMD_NS, UserInfoEncryptedResponseEnc.DEFAULT_ELEMENT_LOCAL_NAME,
                 Constants.SAML20MDOIDCMD_PREFIX);
     }
 
     /** {@inheritDoc} */
-    public IdTokenEncryptionResponseEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
-        return new IdTokenEncryptionResponseEncImpl(namespaceURI, localName, namespacePrefix);
+    public UserInfoEncryptedResponseEnc buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+        return new UserInfoEncryptedResponseEncImpl(namespaceURI, localName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncImpl.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncImpl.java
similarity index 77%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncImpl.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncImpl.java
index c85dff6f..063bc640 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncImpl.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncImpl.java
@@ -16,12 +16,12 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
 
 /**
- * Concrete implementation of {@link IdTokenEncryptionResponseEnc}.
+ * Concrete implementation of {@link UserInfoEncryptedResponseEnc}.
  */
-public class IdTokenEncryptionResponseEncImpl extends AbstractMetadataValueSAMLObject implements IdTokenEncryptionResponseEnc {
+public class UserInfoEncryptedResponseEncImpl extends AbstractMetadataValueSAMLObject implements UserInfoEncryptedResponseEnc {
 
     /**
      * Constructor.
@@ -30,7 +30,7 @@ public class IdTokenEncryptionResponseEncImpl extends AbstractMetadataValueSAMLO
      * @param elementLocalName the local name of the XML element this Object represents
      * @param namespacePrefix the prefix for the given namespace
      */
-    protected IdTokenEncryptionResponseEncImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+    protected UserInfoEncryptedResponseEncImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
         super(namespaceURI, elementLocalName, namespacePrefix);
     }
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncMarshaller.java
similarity index 73%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncMarshaller.java
index 1fd4c452..f349850c 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncMarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncMarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
 
 /**
- * A thread safe Marshaller for {@link IdTokenEncryptionResponseEnc} objects.
+ * A thread safe Marshaller for {@link UserInfoEncryptedResponseEnc} objects.
  */
-public class IdTokenEncryptionResponseEncMarshaller extends AbstractMetadataValueMarshaller<IdTokenEncryptionResponseEnc> {
+public class UserInfoEncryptedResponseEncMarshaller extends AbstractMetadataValueMarshaller<UserInfoEncryptedResponseEnc> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncUnmarshaller.java
similarity index 73%
rename from idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncUnmarshaller.java
rename to idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncUnmarshaller.java
index 812fc44d..b0697376 100644
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/IdTokenEncryptionResponseEncUnmarshaller.java
+++ b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptedResponseEncUnmarshaller.java
@@ -16,11 +16,11 @@
 
 package net.shibboleth.idp.saml.oidc.xmlobject.impl;
 
-import net.shibboleth.idp.saml.oidc.xmlobject.IdTokenEncryptionResponseEnc;
+import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptedResponseEnc;
 
 /**
- * A thread-safe Unmarshaller for {@link IdTokenEncryptionResponseEnc} objects.
+ * A thread-safe Unmarshaller for {@link UserInfoEncryptedResponseEnc} objects.
  */
-public class IdTokenEncryptionResponseEncUnmarshaller extends AbstractMetadataValueUnmarshaller<IdTokenEncryptionResponseEnc> {
+public class UserInfoEncryptedResponseEncUnmarshaller extends AbstractMetadataValueUnmarshaller<UserInfoEncryptedResponseEnc> {
 
 }
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgUnmarshaller.java
deleted file mode 100644
index 00a1472a..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseAlgUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseAlg;
-
-/**
- * A thread-safe Unmarshaller for {@link UserInfoEncryptionResponseAlg} objects.
- */
-public class UserInfoEncryptionResponseAlgUnmarshaller extends AbstractMetadataValueUnmarshaller<UserInfoEncryptionResponseAlg> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncUnmarshaller.java b/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncUnmarshaller.java
deleted file mode 100644
index a7cff36c..00000000
--- a/idp-oidc-extension-impl/src/main/java/net/shibboleth/idp/saml/oidc/xmlobject/impl/UserInfoEncryptionResponseEncUnmarshaller.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017 - 2020, GÉANT
- *
- * Licensed under the Apache License, Version 2.0 (the “License”); you may not
- * use this file except in compliance with the License. You may obtain a copy
- * of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an “AS IS” BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.idp.saml.oidc.xmlobject.impl;
-
-import net.shibboleth.idp.saml.oidc.xmlobject.UserInfoEncryptionResponseEnc;
-
-/**
- * A thread-safe Unmarshaller for {@link UserInfoEncryptionResponseEnc} objects.
- */
-public class UserInfoEncryptionResponseEncUnmarshaller extends AbstractMetadataValueUnmarshaller<UserInfoEncryptionResponseEnc> {
-
-}
\ No newline at end of file
diff --git a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
index dfec03de..1a533564 100644
--- a/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
+++ b/idp-oidc-extension-impl/src/main/java/org/geant/idpextension/oidc/metadata/impl/ClientInformationNodeProcessor.java
@@ -177,8 +177,8 @@ public class ClientInformationNodeProcessor implements MetadataNodeProcessor {
             metadata.setURI(getSingleURIValue(extensions.getClientUri()));
             metadata.setDefaultACRs(parseDefaultAcrValues(extensions));
             metadata.setGrantTypes(parseGrantTypes(extensions));
-            metadata.setIDTokenJWEAlg(parseJweAlgorithm(extensions.getIdTokenEncryptionResponseAlg()));
-            metadata.setIDTokenJWEEnc(parseEncryptionMethod(extensions.getIdTokenEncryptionResponseEnc()));
+            metadata.setIDTokenJWEAlg(parseJweAlgorithm(extensions.getIdTokenEncryptedResponseAlg()));
+            metadata.setIDTokenJWEEnc(parseEncryptionMethod(extensions.getIdTokenEncryptedResponseEnc()));
             metadata.setIDTokenJWSAlg(parseJwsAlgorithm(extensions.getIdTokenSignedResponseAlg()));
             metadata.setInitiateLoginURI(getSingleURIValue(extensions.getInitiateLoginUri()));
             metadata.setJWKSetURI(getSingleURIValue(extensions.getJwksUri()));
@@ -202,8 +202,8 @@ public class ClientInformationNodeProcessor implements MetadataNodeProcessor {
             metadata.setSubjectType(parseSubjectType(roleDescriptor));
             metadata.setTokenEndpointAuthMethod(parseClientAuthenticationMethod(extensions));
             metadata.setTokenEndpointAuthJWSAlg(parseJwsAlgorithm(extensions.getTokenEndpointAuthSigningAlg()));
-            metadata.setUserInfoJWEAlg(parseJweAlgorithm(extensions.getUserInfoEncryptionResponseAlg()));
-            metadata.setUserInfoJWEEnc(parseEncryptionMethod(extensions.getUserInfoEncryptionResponseEnc()));
+            metadata.setUserInfoJWEAlg(parseJweAlgorithm(extensions.getUserInfoEncryptedResponseAlg()));
+            metadata.setUserInfoJWEEnc(parseEncryptionMethod(extensions.getUserInfoEncryptedResponseEnc()));
             metadata.setUserInfoJWSAlg(parseJwsAlgorithm(extensions.getUserInfoSignedResponseAlg()));
             metadata.setJWKSet(parseJwkSet(credentials, clientId));
            
diff --git a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
index 54d555ea..80d95b8c 100644
--- a/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
+++ b/idp-oidc-extension-impl/src/main/resources/saml2-metadata-oidcmd-config.xml
@@ -40,16 +40,16 @@
             <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.GrantTypeUnmarshaller"/>
         </ObjectProvider>
 
-        <ObjectProvider qualifiedName="oidcmd:IdTokenEncryptionResponseAlg">
-            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptionResponseAlgBuilder"/>
-            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptionResponseAlgMarshaller"/>
-            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptionResponseAlgUnmarshaller"/>
+        <ObjectProvider qualifiedName="oidcmd:IdTokenEncryptedResponseAlg">
+            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseAlgBuilder"/>
+            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseAlgMarshaller"/>
+            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseAlgUnmarshaller"/>
         </ObjectProvider>
         
-        <ObjectProvider qualifiedName="oidcmd:IdTokenEncryptionResponseEnc">
-            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptionResponseEncBuilder"/>
-            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptionResponseEncMarshaller"/>
-            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptionResponseEncUnmarshaller"/>
+        <ObjectProvider qualifiedName="oidcmd:IdTokenEncryptedResponseEnc">
+            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseEncBuilder"/>
+            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseEncMarshaller"/>
+            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.IdTokenEncryptedResponseEncUnmarshaller"/>
         </ObjectProvider>
         
         <ObjectProvider qualifiedName="oidcmd:IdTokenSignedResponseAlg">
@@ -154,16 +154,16 @@
             <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.TokenEndpointAuthSigningAlgUnmarshaller"/>
         </ObjectProvider>
 
-        <ObjectProvider qualifiedName="oidcmd:UserInfoEncryptionResponseAlg">
-            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptionResponseAlgBuilder"/>
-            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptionResponseAlgMarshaller"/>
-            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptionResponseAlgUnmarshaller"/>
+        <ObjectProvider qualifiedName="oidcmd:UserInfoEncryptedResponseAlg">
+            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseAlgBuilder"/>
+            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseAlgMarshaller"/>
+            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseAlgUnmarshaller"/>
         </ObjectProvider>
 
-        <ObjectProvider qualifiedName="oidcmd:UserInfoEncryptionResponseEnc">
-            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptionResponseEncBuilder"/>
-            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptionResponseEncMarshaller"/>
-            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptionResponseEncUnmarshaller"/>
+        <ObjectProvider qualifiedName="oidcmd:UserInfoEncryptedResponseEnc">
+            <BuilderClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseEncBuilder"/>
+            <MarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseEncMarshaller"/>
+            <UnmarshallingClass className="net.shibboleth.idp.saml.oidc.xmlobject.impl.UserInfoEncryptedResponseEncUnmarshaller"/>
         </ObjectProvider>
 
         <ObjectProvider qualifiedName="oidcmd:UserInfoSignedResponseAlg">

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.