diff --git a/demo/complex/midpoint-objects/resources/ldap-main.xml b/demo/complex/midpoint-objects/resources/ldap-main.xml
index 520a46b..bd81e8e 100644
--- a/demo/complex/midpoint-objects/resources/ldap-main.xml
+++ b/demo/complex/midpoint-objects/resources/ldap-main.xml
@@ -190,35 +190,11 @@
 				</attribute>
                 <association>
                     <tolerant>false</tolerant>
-                    <ref>ri:affiliationGroup</ref>
+                    <ref>ri:group</ref>
                     <kind>entitlement</kind>
                     <intent>affiliation-group</intent>
-                    <direction>objectToSubject</direction>
-                    <associationAttribute>ri:uniqueMember</associationAttribute>
-                    <valueAttribute>ri:dn</valueAttribute>
-                </association>
-                <association>
-                    <tolerant>false</tolerant>
-                    <ref>ri:courseGroup</ref>
-                    <kind>entitlement</kind>
                     <intent>course-group</intent>
-                    <direction>objectToSubject</direction>
-                    <associationAttribute>ri:uniqueMember</associationAttribute>
-                    <valueAttribute>ri:dn</valueAttribute>
-                </association>
-                <association>
-                    <tolerant>false</tolerant>
-                    <ref>ri:midpointGroup</ref>
-                    <kind>entitlement</kind>
                     <intent>midpoint-group</intent>
-                    <direction>objectToSubject</direction>
-                    <associationAttribute>ri:uniqueMember</associationAttribute>
-                    <valueAttribute>ri:dn</valueAttribute>
-                </association>
-                <association>
-                    <tolerant>false</tolerant>
-                    <ref>ri:genericGroup</ref>
-                    <kind>entitlement</kind>
                     <intent>generic-group</intent>
                     <direction>objectToSubject</direction>
                     <associationAttribute>ri:uniqueMember</associationAttribute>
diff --git a/demo/complex/midpoint-objects/roles/metarole-affiliation.xml b/demo/complex/midpoint-objects/roles/metarole-affiliation.xml
index 079273d..269f7db 100644
--- a/demo/complex/midpoint-objects/roles/metarole-affiliation.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-affiliation.xml
@@ -23,7 +23,7 @@
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <association>
-                <c:ref>ri:affiliationGroup</c:ref>
+                <c:ref>ri:group</c:ref>
                 <outbound>
                     <expression>
                         <associationFromLink>
diff --git a/demo/complex/midpoint-objects/roles/metarole-course.xml b/demo/complex/midpoint-objects/roles/metarole-course.xml
index 38eea7e..21f9f83 100644
--- a/demo/complex/midpoint-objects/roles/metarole-course.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-course.xml
@@ -20,7 +20,7 @@
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <association>
-                <c:ref>ri:courseGroup</c:ref>
+                <c:ref>ri:group</c:ref>
                 <outbound>
                     <expression>
                         <associationFromLink>
diff --git a/demo/complex/midpoint-objects/roles/metarole-grouper-group.xml b/demo/complex/midpoint-objects/roles/metarole-grouper-group.xml
index 9b1db49..9fa5c48 100644
--- a/demo/complex/midpoint-objects/roles/metarole-grouper-group.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-grouper-group.xml
@@ -21,7 +21,7 @@
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <association>
-                <c:ref>ri:genericGroup</c:ref>
+                <c:ref>ri:group</c:ref>
                 <outbound>
                     <expression>
                         <associationFromLink>
diff --git a/demo/complex/midpoint-objects/roles/metarole-mailing-list.xml b/demo/complex/midpoint-objects/roles/metarole-mailing-list.xml
index dc801f9..d381084 100644
--- a/demo/complex/midpoint-objects/roles/metarole-mailing-list.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-mailing-list.xml
@@ -21,7 +21,7 @@
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP -->
             <association>
-                <c:ref>ri:genericGroup</c:ref>
+                <c:ref>ri:group</c:ref>
                 <outbound>
                     <expression>
                         <associationFromLink>
diff --git a/demo/complex/midpoint-objects/roles/metarole-midpoint-group.xml b/demo/complex/midpoint-objects/roles/metarole-midpoint-group.xml
index 4b82b0f..a2a2c9a 100644
--- a/demo/complex/midpoint-objects/roles/metarole-midpoint-group.xml
+++ b/demo/complex/midpoint-objects/roles/metarole-midpoint-group.xml
@@ -20,7 +20,7 @@
         <construction>
             <resourceRef oid="0a37121f-d515-4a23-9b6d-554c5ef61272" relation="org:default" type="c:ResourceType" />     <!-- OpenLDAP for Grouper (i-data) -->
             <association>
-                <c:ref>ri:midpointGroup</c:ref>
+                <c:ref>ri:group</c:ref>
                 <outbound>
                     <expression>
                         <associationFromLink>