diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
index e69641195f18236d77dcb13014a9ec9bb5856bcf..c047df27c849c1d66fe786ffbc1b9e19587ce55c 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore
@@ -20,7 +20,7 @@
       <details key="constraints" value="AtMostOneBlackBoxBehaviorPerProvidedService"/>
     </eAnnotations>
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-      <details key="AtMostOneBlackBoxBehaviorPerProvidedService" value="&#xA;&#x9;&#x9;&#x9;not self.blackBoxBehavior->isEmpty() implies &#xA;&#x9;&#x9;&#x9;self.blackBoxBehavior->isUnique(bbb1 : servicebehavior_0::BlackBoxBehavior | bbb1.describedSignature)"/>
+      <details key="AtMostOneBlackBoxBehaviorPerProvidedService" value="&#xA;&#x9;&#x9;&#x9;not self.blackBoxBehavior->isEmpty() implies &#xA;&#x9;&#x9;&#x9;self.blackBoxBehavior->isUnique(bbb1 | bbb1.describedSignature)"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceProvidingRoles"
         ordered="false" upperBound="-1" eType="#//InterfaceProvidingRole" containment="true"
@@ -41,7 +41,7 @@
       <details key="constraints" value="AtMostOneCoarseGrainedBehaviorPerProvidedService"/>
     </eAnnotations>
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-      <details key="AtMostOneCoarseGrainedBehaviorPerProvidedService" value="&#xA;&#x9;&#x9;&#x9;not self.coarseGrainedBehavior->isEmpty() implies &#xA;&#x9;&#x9;&#x9;self.coarseGrainedBehavior->isUnique(cgb1 : servicebehavior_0::CoarseGrainedBehavior | cgb1.describedSignature)"/>
+      <details key="AtMostOneCoarseGrainedBehaviorPerProvidedService" value="&#xA;&#x9;&#x9;&#x9;not self.coarseGrainedBehavior->isEmpty() implies &#xA;&#x9;&#x9;&#x9;self.coarseGrainedBehavior->isUnique(cgb1 | cgb1.describedSignature)"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="coarseGrainedBehavior"
         ordered="false" upperBound="-1" eType="ecore:EClass servicebehavior.ecore#//CoarseGrainedBehavior"
@@ -154,9 +154,9 @@
       <details key="constraints" value="AtMostOneFineGrainedBehaviorPerProvidedService ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole"/>
     </eAnnotations>
     <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
-      <details key="AtMostOneFineGrainedBehaviorPerProvidedService" value="&#xA;&#x9;&#x9;&#x9;not self.fineGrainedBehavior->isEmpty() implies &#xA;&#x9;&#x9;&#x9;self.fineGrainedBehavior->isUnique(fgb1 : servicebehavior_0::FineGrainedBehavior | fgb1.describedSignature)"/>
+      <details key="AtMostOneFineGrainedBehaviorPerProvidedService" value="&#xA;&#x9;&#x9;&#x9;not self.fineGrainedBehavior->isEmpty() implies &#xA;&#x9;&#x9;&#x9;self.fineGrainedBehavior->isUnique(fgb1 | fgb1.describedSignature)"/>
       <details key="ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole"
-          value="&#xA;&#x9;&#x9;&#x9;self.fineGrainedBehavior->forAll(fgb1 : servicebehavior_0::FineGrainedBehavior | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))"/>
+          value="&#xA;&#x9;&#x9;&#x9;self.fineGrainedBehavior->forAll(fgb1 | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))"/>
     </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="semaphores" ordered="false"
         upperBound="-1" eType="#//Semaphore" containment="true"/>
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
index 6b9579ca7f20eaae933db515290fa109a743ba82..2ba8154afcf7bc0f6ef335e0fcc6c2180f08c1da 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/model/repository.ecore.oclinecore
@@ -15,7 +15,7 @@ package repository : repository = 'http://www.descartes-research.net/metamodel/r
 		property blackBoxBehavior : servicebehavior_0::BlackBoxBehavior[*] { composes };
 		invariant AtMostOneBlackBoxBehaviorPerProvidedService: 
 			not self.blackBoxBehavior->isEmpty() implies 
-			self.blackBoxBehavior->isUnique(bbb1 : servicebehavior_0::BlackBoxBehavior | bbb1.describedSignature);
+			self.blackBoxBehavior->isUnique(bbb1 | bbb1.describedSignature);
 	}
 	abstract class InterfaceRequiringEntity extends core_0::Entity 
 	{
@@ -27,7 +27,7 @@ package repository : repository = 'http://www.descartes-research.net/metamodel/r
 		property relationships#surroundingEntity : parameterdependency_0::Relationship[*];
 		invariant AtMostOneCoarseGrainedBehaviorPerProvidedService:
 			not self.coarseGrainedBehavior->isEmpty() implies 
-			self.coarseGrainedBehavior->isUnique(cgb1 : servicebehavior_0::CoarseGrainedBehavior | cgb1.describedSignature);
+			self.coarseGrainedBehavior->isUnique(cgb1 | cgb1.describedSignature);
 	}
 	class Import
 	{
@@ -122,9 +122,9 @@ package repository : repository = 'http://www.descartes-research.net/metamodel/r
 		property fineGrainedBehavior : servicebehavior_0::FineGrainedBehavior[*] { composes };
 		invariant AtMostOneFineGrainedBehaviorPerProvidedService:
 			not self.fineGrainedBehavior->isEmpty() implies 
-			self.fineGrainedBehavior->isUnique(fgb1 : servicebehavior_0::FineGrainedBehavior | fgb1.describedSignature);
+			self.fineGrainedBehavior->isUnique(fgb1 | fgb1.describedSignature);
 		invariant ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole: 
-			self.fineGrainedBehavior->forAll(fgb1 : servicebehavior_0::FineGrainedBehavior | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface));
+			self.fineGrainedBehavior->forAll(fgb1 | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface));
 		/* property internalFineGrainedBehaviorHelperContainer#component : servicebehavior_0::InternalFineGrainedBehaviorHelperContainer[0..1] { composes }; */
 	}
 	class Semaphore extends core::AdaptableEntity
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java
index 6a4d368706ca3ec2cb734fc73eead527ba30a796..4c39b55cd8648fecbf71842613e7d95f8d21c48a 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/BasicComponent.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.common.util.EList;
  *
  * @see edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage#getBasicComponent()
  * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='AtMostOneFineGrainedBehaviorPerProvidedService ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot AtMostOneFineGrainedBehaviorPerProvidedService='\n\t\t\tnot self.fineGrainedBehavior->isEmpty() implies \n\t\t\tself.fineGrainedBehavior->isUnique(fgb1 : servicebehavior_0::FineGrainedBehavior | fgb1.describedSignature)' ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole='\n\t\t\tself.fineGrainedBehavior->forAll(fgb1 : servicebehavior_0::FineGrainedBehavior | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot AtMostOneFineGrainedBehaviorPerProvidedService='\n\t\t\tnot self.fineGrainedBehavior->isEmpty() implies \n\t\t\tself.fineGrainedBehavior->isUnique(fgb1 | fgb1.describedSignature)' ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole='\n\t\t\tself.fineGrainedBehavior->forAll(fgb1 | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))'"
  * @generated
  */
 public interface BasicComponent extends RepositoryComponent {
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java
index 245f0b97d9efdf57e7cb2f181f9ecd24610ba5a1..bfd26d2499e8982456581e83b59441e3a2d0be00 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingEntity.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
  * @see edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage#getInterfaceProvidingEntity()
  * @model abstract="true"
  *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='AtMostOneBlackBoxBehaviorPerProvidedService'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot AtMostOneBlackBoxBehaviorPerProvidedService='\n\t\t\tnot self.blackBoxBehavior->isEmpty() implies \n\t\t\tself.blackBoxBehavior->isUnique(bbb1 : servicebehavior_0::BlackBoxBehavior | bbb1.describedSignature)'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot AtMostOneBlackBoxBehaviorPerProvidedService='\n\t\t\tnot self.blackBoxBehavior->isEmpty() implies \n\t\t\tself.blackBoxBehavior->isUnique(bbb1 | bbb1.describedSignature)'"
  * @generated
  */
 public interface InterfaceProvidingEntity extends Entity {
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
index dfae88d3f30a3c3a4f2ba618fbcb5c1574bbaebe..ee8aa801b3e1fa7e1cf52c18dcfb105cfebb645c 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/InterfaceProvidingRequiringEntity.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.common.util.EList;
  * @see edu.kit.ipd.descartes.mm.applicationlevel.repository.RepositoryPackage#getInterfaceProvidingRequiringEntity()
  * @model abstract="true"
  *        annotation="http://www.eclipse.org/emf/2002/Ecore constraints='AtMostOneCoarseGrainedBehaviorPerProvidedService'"
- *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot AtMostOneCoarseGrainedBehaviorPerProvidedService='\n\t\t\tnot self.coarseGrainedBehavior->isEmpty() implies \n\t\t\tself.coarseGrainedBehavior->isUnique(cgb1 : servicebehavior_0::CoarseGrainedBehavior | cgb1.describedSignature)'"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot AtMostOneCoarseGrainedBehaviorPerProvidedService='\n\t\t\tnot self.coarseGrainedBehavior->isEmpty() implies \n\t\t\tself.coarseGrainedBehavior->isUnique(cgb1 | cgb1.describedSignature)'"
  * @generated
  */
 public interface InterfaceProvidingRequiringEntity extends InterfaceProvidingEntity, InterfaceRequiringEntity {
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
index 482d4fd95e29b320fef758283de2323b40e8c2ed..f7f1329b86b97a6fe1eb924fac4bdd4a844da817 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/impl/RepositoryPackageImpl.java
@@ -1563,13 +1563,13 @@ public class RepositoryPackageImpl extends EPackageImpl implements RepositoryPac
 		  (interfaceProvidingEntityEClass, 
 		   source, 
 		   new String[] {
-			 "AtMostOneBlackBoxBehaviorPerProvidedService", "\n\t\t\tnot self.blackBoxBehavior->isEmpty() implies \n\t\t\tself.blackBoxBehavior->isUnique(bbb1 : servicebehavior_0::BlackBoxBehavior | bbb1.describedSignature)"
+			 "AtMostOneBlackBoxBehaviorPerProvidedService", "\n\t\t\tnot self.blackBoxBehavior->isEmpty() implies \n\t\t\tself.blackBoxBehavior->isUnique(bbb1 | bbb1.describedSignature)"
 		   });	
 		addAnnotation
 		  (interfaceProvidingRequiringEntityEClass, 
 		   source, 
 		   new String[] {
-			 "AtMostOneCoarseGrainedBehaviorPerProvidedService", "\n\t\t\tnot self.coarseGrainedBehavior->isEmpty() implies \n\t\t\tself.coarseGrainedBehavior->isUnique(cgb1 : servicebehavior_0::CoarseGrainedBehavior | cgb1.describedSignature)"
+			 "AtMostOneCoarseGrainedBehaviorPerProvidedService", "\n\t\t\tnot self.coarseGrainedBehavior->isEmpty() implies \n\t\t\tself.coarseGrainedBehavior->isUnique(cgb1 | cgb1.describedSignature)"
 		   });	
 		addAnnotation
 		  (composedStructureEClass, 
@@ -1601,8 +1601,8 @@ public class RepositoryPackageImpl extends EPackageImpl implements RepositoryPac
 		  (basicComponentEClass, 
 		   source, 
 		   new String[] {
-			 "AtMostOneFineGrainedBehaviorPerProvidedService", "\n\t\t\tnot self.fineGrainedBehavior->isEmpty() implies \n\t\t\tself.fineGrainedBehavior->isUnique(fgb1 : servicebehavior_0::FineGrainedBehavior | fgb1.describedSignature)",
-			 "ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole", "\n\t\t\tself.fineGrainedBehavior->forAll(fgb1 : servicebehavior_0::FineGrainedBehavior | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))"
+			 "AtMostOneFineGrainedBehaviorPerProvidedService", "\n\t\t\tnot self.fineGrainedBehavior->isEmpty() implies \n\t\t\tself.fineGrainedBehavior->isUnique(fgb1 | fgb1.describedSignature)",
+			 "ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole", "\n\t\t\tself.fineGrainedBehavior->forAll(fgb1 | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))"
 		   });	
 		addAnnotation
 		  (assemblyConnectorEClass, 
diff --git a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/util/RepositoryValidator.java b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/util/RepositoryValidator.java
index f8d152dd59b15fb7d387ee7642346eb59d4de301..25dadea37139edae8157a3a8e93ed1af6fc7a03e 100644
--- a/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/util/RepositoryValidator.java
+++ b/edu.kit.ipd.descartes.mm.applicationlevel/src/edu/kit/ipd/descartes/mm/applicationlevel/repository/util/RepositoryValidator.java
@@ -210,7 +210,7 @@ public class RepositoryValidator extends EObjectValidator {
 	 */
 	protected static final String INTERFACE_PROVIDING_ENTITY__AT_MOST_ONE_BLACK_BOX_BEHAVIOR_PER_PROVIDED_SERVICE__EEXPRESSION = "\n" +
 		"\t\t\tnot self.blackBoxBehavior->isEmpty() implies \n" +
-		"\t\t\tself.blackBoxBehavior->isUnique(bbb1 : servicebehavior_0::BlackBoxBehavior | bbb1.describedSignature)";
+		"\t\t\tself.blackBoxBehavior->isUnique(bbb1 | bbb1.describedSignature)";
 
 	/**
 	 * Validates the AtMostOneBlackBoxBehaviorPerProvidedService constraint of '<em>Interface Providing Entity</em>'.
@@ -281,7 +281,7 @@ public class RepositoryValidator extends EObjectValidator {
 	 */
 	protected static final String INTERFACE_PROVIDING_REQUIRING_ENTITY__AT_MOST_ONE_COARSE_GRAINED_BEHAVIOR_PER_PROVIDED_SERVICE__EEXPRESSION = "\n" +
 		"\t\t\tnot self.coarseGrainedBehavior->isEmpty() implies \n" +
-		"\t\t\tself.coarseGrainedBehavior->isUnique(cgb1 : servicebehavior_0::CoarseGrainedBehavior | cgb1.describedSignature)";
+		"\t\t\tself.coarseGrainedBehavior->isUnique(cgb1 | cgb1.describedSignature)";
 
 	/**
 	 * Validates the AtMostOneCoarseGrainedBehaviorPerProvidedService constraint of '<em>Interface Providing Requiring Entity</em>'.
@@ -705,7 +705,7 @@ public class RepositoryValidator extends EObjectValidator {
 	 */
 	protected static final String BASIC_COMPONENT__AT_MOST_ONE_FINE_GRAINED_BEHAVIOR_PER_PROVIDED_SERVICE__EEXPRESSION = "\n" +
 		"\t\t\tnot self.fineGrainedBehavior->isEmpty() implies \n" +
-		"\t\t\tself.fineGrainedBehavior->isUnique(fgb1 : servicebehavior_0::FineGrainedBehavior | fgb1.describedSignature)";
+		"\t\t\tself.fineGrainedBehavior->isUnique(fgb1 | fgb1.describedSignature)";
 
 	/**
 	 * Validates the AtMostOneFineGrainedBehaviorPerProvidedService constraint of '<em>Basic Component</em>'.
@@ -735,7 +735,7 @@ public class RepositoryValidator extends EObjectValidator {
 	 * @generated
 	 */
 	protected static final String BASIC_COMPONENT__REFERENCED_SIGNATURE_MUST_BELONG_TO_INTERFACE_REFERENCED_BY_INTERFACE_PROVIDING_ROLE__EEXPRESSION = "\n" +
-		"\t\t\tself.fineGrainedBehavior->forAll(fgb1 : servicebehavior_0::FineGrainedBehavior | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))";
+		"\t\t\tself.fineGrainedBehavior->forAll(fgb1 | self.interfaceProvidingRoles->exists(p | p.interface = fgb1.describedSignature.interface))";
 
 	/**
 	 * Validates the ReferencedSignatureMustBelongToInterfaceReferencedByInterfaceProvidingRole constraint of '<em>Basic Component</em>'.