diff --git a/demo/complex2s/midpoint-objects/resources/resource-grouper.xml b/demo/complex2s/midpoint-objects/resources/resource-grouper.xml
index dc20c5d..125961e 100644
--- a/demo/complex2s/midpoint-objects/resources/resource-grouper.xml
+++ b/demo/complex2s/midpoint-objects/resources/resource-grouper.xml
@@ -112,18 +112,18 @@
                     <expression>
                         <script>
                             <code>
-                                import com.evolveum.midpoint.schema.util
-                                import com.evolveum.midpoint.schema.constants
+                                import com.evolveum.midpoint.schema.util.*
+                                import com.evolveum.midpoint.schema.constants.*
                                 
                                 if (input == null) {
                                     null
                                 } else {
-                                    archetypeOid = '5f2b96d2-49b5-4a8a-9601-14457309a69b'       // generic-grouper-group
+                                    archetypeOid = '5f2b96d2-49b5-4a8a-9601-14457309a69b'       // generic-grouper-group archetype
                                     switch (input) {
-                                        case ~/ref:affiliation:.*/: archetypeOid = '56f53812-047d-4b69-83e8-519a73d161e1'; break;
-                                        case ~/ref:dept:.*/: archetypeOid = '1cec5f78-8fba-459b-9547-ef7485009f40'; break;
-                                        case ~/ref:course:.*/: archetypeOid = '3dab9a72-118b-4e40-a138-bb691c335eca'; break;
-                                        case ~/app:mailinglist:.*/: archetypeOid = '1645d1dc-1f7c-4508-b50b-97b501ccdee3'; break;
+                                        case ~/ref:affiliation:.*/: archetypeOid = '56f53812-047d-4b69-83e8-519a73d161e1'; break;   // affiliation archetype
+                                        case ~/ref:dept:.*/: archetypeOid = '1cec5f78-8fba-459b-9547-ef7485009f40'; break;          // department archetype
+                                        case ~/ref:course:.*/: archetypeOid = '3dab9a72-118b-4e40-a138-bb691c335eca'; break;        // course archetype
+                                        case ~/app:mailinglist:.*/: archetypeOid = '1645d1dc-1f7c-4508-b50b-97b501ccdee3'; break;   // mailing-list archetype
                                     }
                                     ObjectTypeUtil.createAssignmentTo(archetypeOid, ObjectTypes.ARCHETYPE, prismContext)
                                 }
diff --git a/demo/complex2s/midpoint-objects/roles/metarole-grouper-provided-group.xml b/demo/complex2s/midpoint-objects/roles/metarole-grouper-provided-group.xml
index b3022e1..eabaf9d 100644
--- a/demo/complex2s/midpoint-objects/roles/metarole-grouper-provided-group.xml
+++ b/demo/complex2s/midpoint-objects/roles/metarole-grouper-provided-group.xml
@@ -18,14 +18,14 @@
         
         e.g.
         
-        ref:affiliation:member -> shadow -> affiliation_member -> archetype-affiliation -> metarole-grouper-provided-group 
+        ref:affiliation:member -> shadow -> affiliation_member -> affiliation (archetype) -> metarole-grouper-provided-group 
             
         1) Grouper group (e.g. ref:affiliation:member) has a shadow object.
         
         2) An org object (affiliation_member) is created and linked to this shadow.
         
         3) At the same time, appropriate archetype is assigned to the org, based on the Grouper name 
-        (e.g. ref:affiliation:* leads to archetype-affiliation).
+        (e.g. ref:affiliation:* leads to archetype affiliation).
         
         4) This archetype defines basic parameters for the particular class of Grouper groups; e.g. where in midPoint
         org tree they belong (e.g. under Affiliations org), where in LDAP tree they belong (e.g. under 
@@ -38,7 +38,7 @@
         
         This metarole is devoted to process Grouper-specific information for Grouper groups.
         As a source it needs only two pieces of information: extension/grouperName (e.g. ref:affiliation:member)
-        and particular archetype (e.g. archetype-affiliation) with its configuration data.
+        and particular archetype (e.g. affiliation) with its configuration data.
         
         It fills-in the following items: extension/grouperName -> identifier -> name and displayName
         by inducing appropriate focus mappings to the org object.    
@@ -48,7 +48,7 @@
             <mapping>
                 <name>identifier</name>
                 <description>This mapping fills-in org identifier (e.g. 'member') from extension/grouperName (e.g. 'ref:affiliation:member').
-                It uses extension/grouperNamePrefix information from the archetype (e.g. 'ref:affiliation:' defined in affiliation-archetype)</description>
+                It uses extension/grouperNamePrefix information from the archetype (e.g. 'ref:affiliation:' defined in affiliation archetype)</description>
                 <strength>strong</strength>
                 <source>
                     <path>extension/grouperName</path>
@@ -59,14 +59,14 @@
                             if (grouperName == null) {
                                 null
                             } else {
-                                metarole = assignmentPath[-2].source       // e.g. metarole-affiliation
-                                log.info('metarole = {}', metarole)
-                                if (metarole == null) {
-                                    throw new IllegalStateException('No metarole in assignment path: ' + assignmentPath)
+                                archetype = assignmentPath[-2].source       // e.g. archetype affiliation
+                                log.info('archetype = {}', archetype)
+                                if (archetype == null) {
+                                    throw new IllegalStateException('No archetype in assignment path: ' + assignmentPath)
                                 }
-                                grouperNamePrefix = basic.getExtensionPropertyValue(metarole, 'grouperNamePrefix')      // e.g. 'ref:affiliation:'
+                                grouperNamePrefix = basic.getExtensionPropertyValue(archetype, 'grouperNamePrefix')      // e.g. 'ref:affiliation:'
                                 if (grouperNamePrefix == null) {
-                                    throw new IllegalStateException('No grouper name prefix in metarole ' + metarole)
+                                    throw new IllegalStateException('No grouper name prefix in archetype ' + archetype)
                                 }
                                 // grouperName is e.g. 'ref:affiliation:member'
                                 if (grouperName.startsWith(grouperNamePrefix)) {
@@ -86,7 +86,7 @@
             <mapping>
                 <name>name</name>
                 <description>This mapping fills-in org name (e.g. 'affiliation_member') from identifier (e.g. 'member').
-                It uses extension/midPointNamePrefix information from the archetype (e.g. 'affiliation_' defined in affiliation-archetype)</description>
+                It uses extension/midPointNamePrefix information from the archetype (e.g. 'affiliation_' defined in affiliation archetype)</description>
                 <strength>strong</strength>
                 <source>
                     <path>identifier</path>
@@ -98,11 +98,11 @@
                                 null
                             } else {
                                 // e.g. identifier = 'member'
-                                metarole = assignmentPath[-2].source         // e.g. metarole-affiliation
-                                if (metarole == null) {
-                                    throw new IllegalStateException('No metarole in assignment path: ' + assignmentPath)
+                                archetype = assignmentPath[-2].source         // e.g. affiliation archetype
+                                if (archetype == null) {
+                                    throw new IllegalStateException('No archetype in assignment path: ' + assignmentPath)
                                 }
-                                prefix = basic.getExtensionPropertyValue(metarole, 'midPointNamePrefix')        // e.g. 'affiliation_'
+                                prefix = basic.getExtensionPropertyValue(archetype, 'midPointNamePrefix')        // e.g. 'affiliation_'
                                 prefix + identifier                                                             // e.g. 'affiliation_member'
                             }
                         </code>
@@ -116,7 +116,7 @@
             <mapping>
                 <name>displayName</name>
                 <description>This mapping fills-in org displayName (e.g. 'Affiliation: member') from identifier (e.g. 'member').
-                It uses extension/midPointDisplayNamePrefix information from the archetype (e.g. 'Affiliation: ' defined in affiliation-archetype)</description>
+                It uses extension/midPointDisplayNamePrefix information from the archetype (e.g. 'Affiliation: ' defined in affiliation archetype)</description>
                 <strength>strong</strength>
                 <source>
                     <path>identifier</path>
@@ -127,11 +127,11 @@
                             if (identifier == null) {
                                 null
                             } else {
-                                metarole = assignmentPath[-2].source                                                        // e.g. metarole-affiliation
-                                if (metarole == null) {
-                                    throw new IllegalStateException('No metarole in assignment path: ' + assignmentPath)
+                                archetype = assignmentPath[-2].source                                                        // e.g. affiliation archetype
+                                if (archetype == null) {
+                                    throw new IllegalStateException('No archetype in assignment path: ' + assignmentPath)
                                 }
-                                prefix = basic.getExtensionPropertyValue(metarole, 'midPointDisplayNamePrefix')         // e.g. 'Affiliation: '
+                                prefix = basic.getExtensionPropertyValue(archetype, 'midPointDisplayNamePrefix')         // e.g. 'Affiliation: '
                                 prefix + identifier                                                                     // e.g. 'Affiliation: member'
                             }
                         </code>