diff --git a/base/container_files/httpd/grouper-testapp.conf b/base/container_files/httpd/grouper-testapp.conf
index 933a741..2cc9891 100644
--- a/base/container_files/httpd/grouper-testapp.conf
+++ b/base/container_files/httpd/grouper-testapp.conf
@@ -14,7 +14,7 @@
   AuthType shibboleth
   ShibRequestSetting requireSession 1
   ShibRequireSession on
-  Require shib-attr entitlement admin superuser
+  Require shib-attr eduPersonEntitlement admin superuser
   ErrorDocument 401 /app/accessError.html
   
   DirectoryIndex index.html
diff --git a/base/container_files/shibboleth-sp/attribute-map.xml b/base/container_files/shibboleth-sp/attribute-map.xml
index 067221b..dcee617 100644
--- a/base/container_files/shibboleth-sp/attribute-map.xml
+++ b/base/container_files/shibboleth-sp/attribute-map.xml
@@ -2,34 +2,34 @@
 
     <!-- First some useful eduPerson attributes that many sites might use. -->
 
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eppn">
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" id="eduPersonPrincipalName">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
     </Attribute>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="eppn">
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonPrincipalName" id="eduPersonPrincipalName">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
     </Attribute>
 
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" id="affiliation">
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" id="eduPersonScopedAffiliation">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
     </Attribute>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="affiliation">
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" id="eduPersonScopedAffiliation">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder" caseSensitive="false"/>
     </Attribute>
 
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="unscoped-affiliation">
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" id="eduPersonAffiliation">
         <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
     </Attribute>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="unscoped-affiliation">
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonAffiliation" id="eduPersonAffiliation">
         <AttributeDecoder xsi:type="StringAttributeDecoder" caseSensitive="false"/>
     </Attribute>
 
-    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="entitlement"/>
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="entitlement"/>
+    <Attribute name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" id="eduPersonEntitlement"/>
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonEntitlement" id="eduPersonEntitlement"/>
 
     <!-- A persistent id attribute that supports personalized anonymous access. -->
 
     <!-- First, the deprecated/incorrect version, decoded as a scoped string: -->
-    <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="targeted-id">
+    <Attribute name="urn:mace:dir:attribute-def:eduPersonTargetedID" id="eduPersonTargetedID">
         <AttributeDecoder xsi:type="ScopedAttributeDecoder"/>
         <!-- <AttributeDecoder xsi:type="NameIDFromScopedAttributeDecoder" formatter="$NameQualifier!$SPNameQualifier!$Name" defaultQualifiers="true"/> -->
     </Attribute>