[487342] Qualify ShadowExp type names

5 files changed, 159 insertions, 146 deletions

diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java
index 5f009f0312..1d8e1bf8c6 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/BaseCSFactory.java
@@ -12,6 +12,7 @@
 package org.eclipse.ocl.xtext.basecs;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,7 +38,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Annotation CS</em>'.
 	 * @generated
 	 */
-	AnnotationCS createAnnotationCS();
+	@NonNull AnnotationCS createAnnotationCS();
 
 	/**
 	 * Returns a new object of class '<em>Attribute CS</em>'.
@@ -46,7 +47,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Attribute CS</em>'.
 	 * @generated
 	 */
-	AttributeCS createAttributeCS();
+	@NonNull AttributeCS createAttributeCS();
 
 	/**
 	 * Returns a new object of class '<em>Constraint CS</em>'.
@@ -55,7 +56,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Constraint CS</em>'.
 	 * @generated
 	 */
-	ConstraintCS createConstraintCS();
+	@NonNull ConstraintCS createConstraintCS();
 
 	/**
 	 * Returns a new object of class '<em>Data Type CS</em>'.
@@ -64,7 +65,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Data Type CS</em>'.
 	 * @generated
 	 */
-	DataTypeCS createDataTypeCS();
+	@NonNull DataTypeCS createDataTypeCS();
 
 	/**
 	 * Returns a new object of class '<em>Detail CS</em>'.
@@ -73,7 +74,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Detail CS</em>'.
 	 * @generated
 	 */
-	DetailCS createDetailCS();
+	@NonNull DetailCS createDetailCS();
 
 	/**
 	 * Returns a new object of class '<em>Documentation CS</em>'.
@@ -82,7 +83,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Documentation CS</em>'.
 	 * @generated
 	 */
-	DocumentationCS createDocumentationCS();
+	@NonNull DocumentationCS createDocumentationCS();
 
 	/**
 	 * Returns a new object of class '<em>Enumeration CS</em>'.
@@ -91,7 +92,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Enumeration CS</em>'.
 	 * @generated
 	 */
-	EnumerationCS createEnumerationCS();
+	@NonNull EnumerationCS createEnumerationCS();
 
 	/**
 	 * Returns a new object of class '<em>Enumeration Literal CS</em>'.
@@ -100,7 +101,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Enumeration Literal CS</em>'.
 	 * @generated
 	 */
-	EnumerationLiteralCS createEnumerationLiteralCS();
+	@NonNull EnumerationLiteralCS createEnumerationLiteralCS();
 
 	/**
 	 * Returns a new object of class '<em>Import CS</em>'.
@@ -109,7 +110,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Import CS</em>'.
 	 * @generated
 	 */
-	ImportCS createImportCS();
+	@NonNull ImportCS createImportCS();
 
 	/**
 	 * Returns a new object of class '<em>Lambda Type CS</em>'.
@@ -118,7 +119,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Lambda Type CS</em>'.
 	 * @generated
 	 */
-	LambdaTypeCS createLambdaTypeCS();
+	@NonNull LambdaTypeCS createLambdaTypeCS();
 
 	/**
 	 * Returns a new object of class '<em>Model Element Ref CS</em>'.
@@ -127,7 +128,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Model Element Ref CS</em>'.
 	 * @generated
 	 */
-	ModelElementRefCS createModelElementRefCS();
+	@NonNull ModelElementRefCS createModelElementRefCS();
 
 	/**
 	 * Returns a new object of class '<em>Multiplicity Bounds CS</em>'.
@@ -136,7 +137,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Multiplicity Bounds CS</em>'.
 	 * @generated
 	 */
-	MultiplicityBoundsCS createMultiplicityBoundsCS();
+	@NonNull MultiplicityBoundsCS createMultiplicityBoundsCS();
 
 	/**
 	 * Returns a new object of class '<em>Multiplicity String CS</em>'.
@@ -145,7 +146,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Multiplicity String CS</em>'.
 	 * @generated
 	 */
-	MultiplicityStringCS createMultiplicityStringCS();
+	@NonNull MultiplicityStringCS createMultiplicityStringCS();
 
 	/**
 	 * Returns a new object of class '<em>Operation CS</em>'.
@@ -154,7 +155,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Operation CS</em>'.
 	 * @generated
 	 */
-	OperationCS createOperationCS();
+	@NonNull OperationCS createOperationCS();
 
 	/**
 	 * Returns a new object of class '<em>Package CS</em>'.
@@ -163,7 +164,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Package CS</em>'.
 	 * @generated
 	 */
-	PackageCS createPackageCS();
+	@NonNull PackageCS createPackageCS();
 
 	/**
 	 * Returns a new object of class '<em>Parameter CS</em>'.
@@ -172,7 +173,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Parameter CS</em>'.
 	 * @generated
 	 */
-	ParameterCS createParameterCS();
+	@NonNull ParameterCS createParameterCS();
 
 	/**
 	 * Returns a new object of class '<em>Path Element CS</em>'.
@@ -181,7 +182,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Path Element CS</em>'.
 	 * @generated
 	 */
-	PathElementCS createPathElementCS();
+	@NonNull PathElementCS createPathElementCS();
 
 	/**
 	 * Returns a new object of class '<em>Path Element With URICS</em>'.
@@ -190,7 +191,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Path Element With URICS</em>'.
 	 * @generated
 	 */
-	PathElementWithURICS createPathElementWithURICS();
+	@NonNull PathElementWithURICS createPathElementWithURICS();
 
 	/**
 	 * Returns a new object of class '<em>Path Name CS</em>'.
@@ -199,7 +200,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Path Name CS</em>'.
 	 * @generated
 	 */
-	PathNameCS createPathNameCS();
+	@NonNull PathNameCS createPathNameCS();
 
 	/**
 	 * Returns a new object of class '<em>Primitive Type Ref CS</em>'.
@@ -208,7 +209,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Primitive Type Ref CS</em>'.
 	 * @generated
 	 */
-	PrimitiveTypeRefCS createPrimitiveTypeRefCS();
+	@NonNull PrimitiveTypeRefCS createPrimitiveTypeRefCS();
 
 	/**
 	 * Returns a new object of class '<em>Reference CS</em>'.
@@ -217,7 +218,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Reference CS</em>'.
 	 * @generated
 	 */
-	ReferenceCS createReferenceCS();
+	@NonNull ReferenceCS createReferenceCS();
 
 	/**
 	 * Returns a new object of class '<em>Root Package CS</em>'.
@@ -226,7 +227,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Root Package CS</em>'.
 	 * @generated
 	 */
-	RootPackageCS createRootPackageCS();
+	@NonNull RootPackageCS createRootPackageCS();
 
 	/**
 	 * Returns a new object of class '<em>Specification CS</em>'.
@@ -235,7 +236,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Specification CS</em>'.
 	 * @generated
 	 */
-	SpecificationCS createSpecificationCS();
+	@NonNull SpecificationCS createSpecificationCS();
 
 	/**
 	 * Returns a new object of class '<em>Structured Class CS</em>'.
@@ -244,7 +245,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Structured Class CS</em>'.
 	 * @generated
 	 */
-	StructuredClassCS createStructuredClassCS();
+	@NonNull StructuredClassCS createStructuredClassCS();
 
 	/**
 	 * Returns a new object of class '<em>Template Binding CS</em>'.
@@ -253,7 +254,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Template Binding CS</em>'.
 	 * @generated
 	 */
-	TemplateBindingCS createTemplateBindingCS();
+	@NonNull TemplateBindingCS createTemplateBindingCS();
 
 	/**
 	 * Returns a new object of class '<em>Template Parameter Substitution CS</em>'.
@@ -262,7 +263,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Template Parameter Substitution CS</em>'.
 	 * @generated
 	 */
-	TemplateParameterSubstitutionCS createTemplateParameterSubstitutionCS();
+	@NonNull TemplateParameterSubstitutionCS createTemplateParameterSubstitutionCS();
 
 	/**
 	 * Returns a new object of class '<em>Template Signature CS</em>'.
@@ -271,7 +272,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Template Signature CS</em>'.
 	 * @generated
 	 */
-	TemplateSignatureCS createTemplateSignatureCS();
+	@NonNull TemplateSignatureCS createTemplateSignatureCS();
 
 	/**
 	 * Returns a new object of class '<em>Tuple Part CS</em>'.
@@ -280,7 +281,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Tuple Part CS</em>'.
 	 * @generated
 	 */
-	TuplePartCS createTuplePartCS();
+	@NonNull TuplePartCS createTuplePartCS();
 
 	/**
 	 * Returns a new object of class '<em>Tuple Type CS</em>'.
@@ -289,7 +290,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Tuple Type CS</em>'.
 	 * @generated
 	 */
-	TupleTypeCS createTupleTypeCS();
+	@NonNull TupleTypeCS createTupleTypeCS();
 
 	/**
 	 * Returns a new object of class '<em>Type Parameter CS</em>'.
@@ -298,7 +299,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Type Parameter CS</em>'.
 	 * @generated
 	 */
-	TypeParameterCS createTypeParameterCS();
+	@NonNull TypeParameterCS createTypeParameterCS();
 
 	/**
 	 * Returns a new object of class '<em>Typed Type Ref CS</em>'.
@@ -307,7 +308,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Typed Type Ref CS</em>'.
 	 * @generated
 	 */
-	TypedTypeRefCS createTypedTypeRefCS();
+	@NonNull TypedTypeRefCS createTypedTypeRefCS();
 
 	/**
 	 * Returns a new object of class '<em>Wildcard Type Ref CS</em>'.
@@ -316,7 +317,7 @@ public interface BaseCSFactory extends EFactory {
 	 * @return a new object of class '<em>Wildcard Type Ref CS</em>'.
 	 * @generated
 	 */
-	WildcardTypeRefCS createWildcardTypeRefCS();
+	@NonNull WildcardTypeRefCS createWildcardTypeRefCS();
 
 	/**
 	 * Returns the package supported by this factory.
diff --git a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java
index b4488aafbb..ad83bdee1d 100644
--- a/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.base/emf-gen/org/eclipse/ocl/xtext/basecs/impl/BaseCSFactoryImpl.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.pivot.internal.scoping.ScopeFilter;
 import org.eclipse.ocl.xtext.basecs.AnnotationCS;
 import org.eclipse.ocl.xtext.basecs.AttributeCS;
@@ -182,7 +183,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public AnnotationCS createAnnotationCS()
+	public @NonNull AnnotationCS createAnnotationCS()
 	{
 		AnnotationCSImpl annotationCS = new AnnotationCSImpl();
 		return annotationCS;
@@ -194,7 +195,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public AttributeCS createAttributeCS()
+	public @NonNull AttributeCS createAttributeCS()
 	{
 		AttributeCSImpl attributeCS = new AttributeCSImpl();
 		return attributeCS;
@@ -206,7 +207,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public ConstraintCS createConstraintCS()
+	public @NonNull ConstraintCS createConstraintCS()
 	{
 		ConstraintCSImpl constraintCS = new ConstraintCSImpl();
 		return constraintCS;
@@ -218,7 +219,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public DataTypeCS createDataTypeCS()
+	public @NonNull DataTypeCS createDataTypeCS()
 	{
 		DataTypeCSImpl dataTypeCS = new DataTypeCSImpl();
 		return dataTypeCS;
@@ -230,7 +231,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public DetailCS createDetailCS() {
+	public @NonNull DetailCS createDetailCS() {
 		DetailCSImpl detailCS = new DetailCSImpl();
 		return detailCS;
 	}
@@ -241,7 +242,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public DocumentationCS createDocumentationCS()
+	public @NonNull DocumentationCS createDocumentationCS()
 	{
 		DocumentationCSImpl documentationCS = new DocumentationCSImpl();
 		return documentationCS;
@@ -253,7 +254,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public EnumerationCS createEnumerationCS()
+	public @NonNull EnumerationCS createEnumerationCS()
 	{
 		EnumerationCSImpl enumerationCS = new EnumerationCSImpl();
 		return enumerationCS;
@@ -265,7 +266,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public EnumerationLiteralCS createEnumerationLiteralCS()
+	public @NonNull EnumerationLiteralCS createEnumerationLiteralCS()
 	{
 		EnumerationLiteralCSImpl enumerationLiteralCS = new EnumerationLiteralCSImpl();
 		return enumerationLiteralCS;
@@ -277,7 +278,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public ImportCS createImportCS() {
+	public @NonNull ImportCS createImportCS() {
 		ImportCSImpl importCS = new ImportCSImpl();
 		return importCS;
 	}
@@ -288,7 +289,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public LambdaTypeCS createLambdaTypeCS()
+	public @NonNull LambdaTypeCS createLambdaTypeCS()
 	{
 		LambdaTypeCSImpl lambdaTypeCS = new LambdaTypeCSImpl();
 		return lambdaTypeCS;
@@ -300,7 +301,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public ModelElementRefCS createModelElementRefCS()
+	public @NonNull ModelElementRefCS createModelElementRefCS()
 	{
 		ModelElementRefCSImpl modelElementRefCS = new ModelElementRefCSImpl();
 		return modelElementRefCS;
@@ -312,7 +313,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public MultiplicityBoundsCS createMultiplicityBoundsCS()
+	public @NonNull MultiplicityBoundsCS createMultiplicityBoundsCS()
 	{
 		MultiplicityBoundsCSImpl multiplicityBoundsCS = new MultiplicityBoundsCSImpl();
 		return multiplicityBoundsCS;
@@ -324,7 +325,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public MultiplicityStringCS createMultiplicityStringCS()
+	public @NonNull MultiplicityStringCS createMultiplicityStringCS()
 	{
 		MultiplicityStringCSImpl multiplicityStringCS = new MultiplicityStringCSImpl();
 		return multiplicityStringCS;
@@ -336,7 +337,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public OperationCS createOperationCS()
+	public @NonNull OperationCS createOperationCS()
 	{
 		OperationCSImpl operationCS = new OperationCSImpl();
 		return operationCS;
@@ -348,7 +349,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public PackageCS createPackageCS() {
+	public @NonNull PackageCS createPackageCS() {
 		PackageCSImpl packageCS = new PackageCSImpl();
 		return packageCS;
 	}
@@ -359,7 +360,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public ParameterCS createParameterCS() {
+	public @NonNull ParameterCS createParameterCS() {
 		ParameterCSImpl parameterCS = new ParameterCSImpl();
 		return parameterCS;
 	}
@@ -370,7 +371,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public PathElementCS createPathElementCS()
+	public @NonNull PathElementCS createPathElementCS()
 	{
 		PathElementCSImpl pathElementCS = new PathElementCSImpl();
 		return pathElementCS;
@@ -382,7 +383,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public PathElementWithURICS createPathElementWithURICS()
+	public @NonNull PathElementWithURICS createPathElementWithURICS()
 	{
 		PathElementWithURICSImpl pathElementWithURICS = new PathElementWithURICSImpl();
 		return pathElementWithURICS;
@@ -394,7 +395,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public PathNameCS createPathNameCS()
+	public @NonNull PathNameCS createPathNameCS()
 	{
 		PathNameCSImpl pathNameCS = new PathNameCSImpl();
 		return pathNameCS;
@@ -406,7 +407,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public PrimitiveTypeRefCS createPrimitiveTypeRefCS() {
+	public @NonNull PrimitiveTypeRefCS createPrimitiveTypeRefCS() {
 		PrimitiveTypeRefCSImpl primitiveTypeRefCS = new PrimitiveTypeRefCSImpl();
 		return primitiveTypeRefCS;
 	}
@@ -417,7 +418,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public ReferenceCS createReferenceCS()
+	public @NonNull ReferenceCS createReferenceCS()
 	{
 		ReferenceCSImpl referenceCS = new ReferenceCSImpl();
 		return referenceCS;
@@ -429,7 +430,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public RootPackageCS createRootPackageCS()
+	public @NonNull RootPackageCS createRootPackageCS()
 	{
 		RootPackageCSImpl rootPackageCS = new RootPackageCSImpl();
 		return rootPackageCS;
@@ -441,7 +442,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public SpecificationCS createSpecificationCS()
+	public @NonNull SpecificationCS createSpecificationCS()
 	{
 		SpecificationCSImpl specificationCS = new SpecificationCSImpl();
 		return specificationCS;
@@ -453,7 +454,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public StructuredClassCS createStructuredClassCS()
+	public @NonNull StructuredClassCS createStructuredClassCS()
 	{
 		StructuredClassCSImpl structuredClassCS = new StructuredClassCSImpl();
 		return structuredClassCS;
@@ -465,7 +466,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public TemplateBindingCS createTemplateBindingCS() {
+	public @NonNull TemplateBindingCS createTemplateBindingCS() {
 		TemplateBindingCSImpl templateBindingCS = new TemplateBindingCSImpl();
 		return templateBindingCS;
 	}
@@ -476,7 +477,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public TemplateParameterSubstitutionCS createTemplateParameterSubstitutionCS() {
+	public @NonNull TemplateParameterSubstitutionCS createTemplateParameterSubstitutionCS() {
 		TemplateParameterSubstitutionCSImpl templateParameterSubstitutionCS = new TemplateParameterSubstitutionCSImpl();
 		return templateParameterSubstitutionCS;
 	}
@@ -487,7 +488,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public TemplateSignatureCS createTemplateSignatureCS() {
+	public @NonNull TemplateSignatureCS createTemplateSignatureCS() {
 		TemplateSignatureCSImpl templateSignatureCS = new TemplateSignatureCSImpl();
 		return templateSignatureCS;
 	}
@@ -498,7 +499,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public TuplePartCS createTuplePartCS()
+	public @NonNull TuplePartCS createTuplePartCS()
 	{
 		TuplePartCSImpl tuplePartCS = new TuplePartCSImpl();
 		return tuplePartCS;
@@ -510,7 +511,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public TupleTypeCS createTupleTypeCS()
+	public @NonNull TupleTypeCS createTupleTypeCS()
 	{
 		TupleTypeCSImpl tupleTypeCS = new TupleTypeCSImpl();
 		return tupleTypeCS;
@@ -522,7 +523,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public TypeParameterCS createTypeParameterCS() {
+	public @NonNull TypeParameterCS createTypeParameterCS() {
 		TypeParameterCSImpl typeParameterCS = new TypeParameterCSImpl();
 		return typeParameterCS;
 	}
@@ -533,7 +534,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public TypedTypeRefCS createTypedTypeRefCS() {
+	public @NonNull TypedTypeRefCS createTypedTypeRefCS() {
 		TypedTypeRefCSImpl typedTypeRefCS = new TypedTypeRefCSImpl();
 		return typedTypeRefCS;
 	}
@@ -544,7 +545,7 @@ public class BaseCSFactoryImpl extends EFactoryImpl implements BaseCSFactory {
 	 * @generated
 	 */
 	@Override
-	public WildcardTypeRefCS createWildcardTypeRefCS() {
+	public @NonNull WildcardTypeRefCS createWildcardTypeRefCS() {
 		WildcardTypeRefCSImpl wildcardTypeRefCS = new WildcardTypeRefCSImpl();
 		return wildcardTypeRefCS;
 	}
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java
index 0ae7268c2c..4e6b2f5f32 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/EssentialOCLCSFactory.java
@@ -11,6 +11,7 @@
 package org.eclipse.ocl.xtext.essentialoclcs;
 
 import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jdt.annotation.NonNull;
 
 /**
  * <!-- begin-user-doc -->
@@ -38,7 +39,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Prefix Exp CS</em>'.
 	 * @generated
 	 */
-	PrefixExpCS createPrefixExpCS();
+	@NonNull PrefixExpCS createPrefixExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Collection Type CS</em>'.
@@ -47,7 +48,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Collection Type CS</em>'.
 	 * @generated
 	 */
-	CollectionTypeCS createCollectionTypeCS();
+	@NonNull CollectionTypeCS createCollectionTypeCS();
 
 	/**
 	 * Returns a new object of class '<em>Context CS</em>'.
@@ -56,7 +57,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Context CS</em>'.
 	 * @generated
 	 */
-	ContextCS createContextCS();
+	@NonNull ContextCS createContextCS();
 
 	/**
 	 * Returns a new object of class '<em>Curly Bracketed Clause CS</em>'.
@@ -65,7 +66,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Curly Bracketed Clause CS</em>'.
 	 * @generated
 	 */
-	CurlyBracketedClauseCS createCurlyBracketedClauseCS();
+	@NonNull CurlyBracketedClauseCS createCurlyBracketedClauseCS();
 
 	/**
 	 * Returns a new object of class '<em>Exp CS</em>'.
@@ -74,7 +75,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Exp CS</em>'.
 	 * @generated
 	 */
-	ExpCS createExpCS();
+	@NonNull ExpCS createExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Exp Specification CS</em>'.
@@ -83,7 +84,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Exp Specification CS</em>'.
 	 * @generated
 	 */
-	ExpSpecificationCS createExpSpecificationCS();
+	@NonNull ExpSpecificationCS createExpSpecificationCS();
 
 	/**
 	 * Returns a new object of class '<em>Type Literal Exp CS</em>'.
@@ -92,7 +93,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Type Literal Exp CS</em>'.
 	 * @generated
 	 */
-	TypeLiteralExpCS createTypeLiteralExpCS();
+	@NonNull TypeLiteralExpCS createTypeLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Type Name Exp CS</em>'.
@@ -101,7 +102,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Type Name Exp CS</em>'.
 	 * @generated
 	 */
-	TypeNameExpCS createTypeNameExpCS();
+	@NonNull TypeNameExpCS createTypeNameExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Unlimited Natural Literal Exp CS</em>'.
@@ -110,7 +111,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Unlimited Natural Literal Exp CS</em>'.
 	 * @generated
 	 */
-	UnlimitedNaturalLiteralExpCS createUnlimitedNaturalLiteralExpCS();
+	@NonNull UnlimitedNaturalLiteralExpCS createUnlimitedNaturalLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Variable CS</em>'.
@@ -119,7 +120,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Variable CS</em>'.
 	 * @generated
 	 */
-	VariableCS createVariableCS();
+	@NonNull VariableCS createVariableCS();
 
 	/**
 	 * Returns the package supported by this factory.
@@ -137,7 +138,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Literal Exp CS</em>'.
 	 * @generated
 	 */
-	LiteralExpCS createLiteralExpCS();
+	@NonNull LiteralExpCS createLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Map Literal Exp CS</em>'.
@@ -146,7 +147,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Map Literal Exp CS</em>'.
 	 * @generated
 	 */
-	MapLiteralExpCS createMapLiteralExpCS();
+	@NonNull MapLiteralExpCS createMapLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Map Literal Part CS</em>'.
@@ -155,7 +156,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Map Literal Part CS</em>'.
 	 * @generated
 	 */
-	MapLiteralPartCS createMapLiteralPartCS();
+	@NonNull MapLiteralPartCS createMapLiteralPartCS();
 
 	/**
 	 * Returns a new object of class '<em>Map Type CS</em>'.
@@ -164,7 +165,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Map Type CS</em>'.
 	 * @generated
 	 */
-	MapTypeCS createMapTypeCS();
+	@NonNull MapTypeCS createMapTypeCS();
 
 	/**
 	 * Returns a new object of class '<em>Name Exp CS</em>'.
@@ -173,7 +174,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Name Exp CS</em>'.
 	 * @generated
 	 */
-	NameExpCS createNameExpCS();
+	@NonNull NameExpCS createNameExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Navigating Arg CS</em>'.
@@ -182,7 +183,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Navigating Arg CS</em>'.
 	 * @generated
 	 */
-	NavigatingArgCS createNavigatingArgCS();
+	@NonNull NavigatingArgCS createNavigatingArgCS();
 
 	/**
 	 * Returns a new object of class '<em>Nested Exp CS</em>'.
@@ -191,7 +192,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Nested Exp CS</em>'.
 	 * @generated
 	 */
-	NestedExpCS createNestedExpCS();
+	@NonNull NestedExpCS createNestedExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Collection Literal Exp CS</em>'.
@@ -200,7 +201,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Collection Literal Exp CS</em>'.
 	 * @generated
 	 */
-	CollectionLiteralExpCS createCollectionLiteralExpCS();
+	@NonNull CollectionLiteralExpCS createCollectionLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Collection Literal Part CS</em>'.
@@ -209,7 +210,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Collection Literal Part CS</em>'.
 	 * @generated
 	 */
-	CollectionLiteralPartCS createCollectionLiteralPartCS();
+	@NonNull CollectionLiteralPartCS createCollectionLiteralPartCS();
 
 	/**
 	 * Returns a new object of class '<em>Collection Pattern CS</em>'.
@@ -218,7 +219,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Collection Pattern CS</em>'.
 	 * @generated
 	 */
-	CollectionPatternCS createCollectionPatternCS();
+	@NonNull CollectionPatternCS createCollectionPatternCS();
 
 	/**
 	 * Returns a new object of class '<em>Primitive Literal Exp CS</em>'.
@@ -227,7 +228,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Primitive Literal Exp CS</em>'.
 	 * @generated
 	 */
-	PrimitiveLiteralExpCS createPrimitiveLiteralExpCS();
+	@NonNull PrimitiveLiteralExpCS createPrimitiveLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Round Bracketed Clause CS</em>'.
@@ -236,7 +237,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Round Bracketed Clause CS</em>'.
 	 * @generated
 	 */
-	RoundBracketedClauseCS createRoundBracketedClauseCS();
+	@NonNull RoundBracketedClauseCS createRoundBracketedClauseCS();
 
 	/**
 	 * Returns a new object of class '<em>Self Exp CS</em>'.
@@ -245,7 +246,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Self Exp CS</em>'.
 	 * @generated
 	 */
-	SelfExpCS createSelfExpCS();
+	@NonNull SelfExpCS createSelfExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Shadow Part CS</em>'.
@@ -254,7 +255,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Shadow Part CS</em>'.
 	 * @generated
 	 */
-	ShadowPartCS createShadowPartCS();
+	@NonNull ShadowPartCS createShadowPartCS();
 
 	/**
 	 * Returns a new object of class '<em>Square Bracketed Clause CS</em>'.
@@ -263,7 +264,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Square Bracketed Clause CS</em>'.
 	 * @generated
 	 */
-	SquareBracketedClauseCS createSquareBracketedClauseCS();
+	@NonNull SquareBracketedClauseCS createSquareBracketedClauseCS();
 
 	/**
 	 * Returns a new object of class '<em>Tuple Literal Exp CS</em>'.
@@ -272,7 +273,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Tuple Literal Exp CS</em>'.
 	 * @generated
 	 */
-	TupleLiteralExpCS createTupleLiteralExpCS();
+	@NonNull TupleLiteralExpCS createTupleLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Tuple Literal Part CS</em>'.
@@ -281,7 +282,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Tuple Literal Part CS</em>'.
 	 * @generated
 	 */
-	TupleLiteralPartCS createTupleLiteralPartCS();
+	@NonNull TupleLiteralPartCS createTupleLiteralPartCS();
 
 	/**
 	 * Returns a new object of class '<em>String Literal Exp CS</em>'.
@@ -290,7 +291,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>String Literal Exp CS</em>'.
 	 * @generated
 	 */
-	StringLiteralExpCS createStringLiteralExpCS();
+	@NonNull StringLiteralExpCS createStringLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Boolean Literal Exp CS</em>'.
@@ -299,7 +300,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Boolean Literal Exp CS</em>'.
 	 * @generated
 	 */
-	BooleanLiteralExpCS createBooleanLiteralExpCS();
+	@NonNull BooleanLiteralExpCS createBooleanLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Invalid Literal Exp CS</em>'.
@@ -308,7 +309,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Invalid Literal Exp CS</em>'.
 	 * @generated
 	 */
-	InvalidLiteralExpCS createInvalidLiteralExpCS();
+	@NonNull InvalidLiteralExpCS createInvalidLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Lambda Literal Exp CS</em>'.
@@ -317,7 +318,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Lambda Literal Exp CS</em>'.
 	 * @generated
 	 */
-	LambdaLiteralExpCS createLambdaLiteralExpCS();
+	@NonNull LambdaLiteralExpCS createLambdaLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Null Literal Exp CS</em>'.
@@ -326,7 +327,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Null Literal Exp CS</em>'.
 	 * @generated
 	 */
-	NullLiteralExpCS createNullLiteralExpCS();
+	@NonNull NullLiteralExpCS createNullLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Number Literal Exp CS</em>'.
@@ -335,7 +336,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Number Literal Exp CS</em>'.
 	 * @generated
 	 */
-	NumberLiteralExpCS createNumberLiteralExpCS();
+	@NonNull NumberLiteralExpCS createNumberLiteralExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Pattern Exp CS</em>'.
@@ -344,7 +345,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Pattern Exp CS</em>'.
 	 * @generated
 	 */
-	PatternExpCS createPatternExpCS();
+	@NonNull PatternExpCS createPatternExpCS();
 
 	/**
 	 * Returns a new object of class '<em>If Exp CS</em>'.
@@ -353,7 +354,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>If Exp CS</em>'.
 	 * @generated
 	 */
-	IfExpCS createIfExpCS();
+	@NonNull IfExpCS createIfExpCS();
 
 	/**
 	 * Returns a new object of class '<em>If Then Exp CS</em>'.
@@ -362,7 +363,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>If Then Exp CS</em>'.
 	 * @generated
 	 */
-	IfThenExpCS createIfThenExpCS();
+	@NonNull IfThenExpCS createIfThenExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Infix Exp CS</em>'.
@@ -371,7 +372,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Infix Exp CS</em>'.
 	 * @generated
 	 */
-	InfixExpCS createInfixExpCS();
+	@NonNull InfixExpCS createInfixExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Let Exp CS</em>'.
@@ -380,7 +381,7 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Let Exp CS</em>'.
 	 * @generated
 	 */
-	LetExpCS createLetExpCS();
+	@NonNull LetExpCS createLetExpCS();
 
 	/**
 	 * Returns a new object of class '<em>Let Variable CS</em>'.
@@ -389,6 +390,6 @@ public interface EssentialOCLCSFactory
 	 * @return a new object of class '<em>Let Variable CS</em>'.
 	 * @generated
 	 */
-	LetVariableCS createLetVariableCS();
+	@NonNull LetVariableCS createLetVariableCS();
 
 } //EssentialOCLCSFactory
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java
index ffeafae35a..e05c9f1255 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/emf-gen/org/eclipse/ocl/xtext/essentialoclcs/impl/EssentialOCLCSFactoryImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.ocl.xtext.essentialoclcs.*;
 
 /**
@@ -151,7 +152,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public PrefixExpCS createPrefixExpCS() {
+	public @NonNull PrefixExpCS createPrefixExpCS() {
 		PrefixExpCSImpl prefixExpCS = new PrefixExpCSImpl();
 		return prefixExpCS;
 	}
@@ -162,7 +163,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public CollectionTypeCS createCollectionTypeCS() {
+	public @NonNull CollectionTypeCS createCollectionTypeCS() {
 		CollectionTypeCSImpl collectionTypeCS = new CollectionTypeCSImpl();
 		return collectionTypeCS;
 	}
@@ -173,7 +174,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public ContextCS createContextCS() {
+	public @NonNull ContextCS createContextCS() {
 		ContextCSImpl contextCS = new ContextCSImpl();
 		return contextCS;
 	}
@@ -184,7 +185,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public CurlyBracketedClauseCS createCurlyBracketedClauseCS()
+	public @NonNull CurlyBracketedClauseCS createCurlyBracketedClauseCS()
 	{
 		CurlyBracketedClauseCSImpl curlyBracketedClauseCS = new CurlyBracketedClauseCSImpl();
 		return curlyBracketedClauseCS;
@@ -196,7 +197,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public ExpCS createExpCS() {
+	public @NonNull ExpCS createExpCS() {
 		ExpCSImpl expCS = new ExpCSImpl();
 		return expCS;
 	}
@@ -207,7 +208,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public ExpSpecificationCS createExpSpecificationCS() {
+	public @NonNull ExpSpecificationCS createExpSpecificationCS() {
 		ExpSpecificationCSImpl expSpecificationCS = new ExpSpecificationCSImpl();
 		return expSpecificationCS;
 	}
@@ -218,7 +219,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public TypeLiteralExpCS createTypeLiteralExpCS() {
+	public @NonNull TypeLiteralExpCS createTypeLiteralExpCS() {
 		TypeLiteralExpCSImpl typeLiteralExpCS = new TypeLiteralExpCSImpl();
 		return typeLiteralExpCS;
 	}
@@ -229,7 +230,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public TypeNameExpCS createTypeNameExpCS() {
+	public @NonNull TypeNameExpCS createTypeNameExpCS() {
 		TypeNameExpCSImpl typeNameExpCS = new TypeNameExpCSImpl();
 		return typeNameExpCS;
 	}
@@ -240,7 +241,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public UnlimitedNaturalLiteralExpCS createUnlimitedNaturalLiteralExpCS() {
+	public @NonNull UnlimitedNaturalLiteralExpCS createUnlimitedNaturalLiteralExpCS() {
 		UnlimitedNaturalLiteralExpCSImpl unlimitedNaturalLiteralExpCS = new UnlimitedNaturalLiteralExpCSImpl();
 		return unlimitedNaturalLiteralExpCS;
 	}
@@ -251,7 +252,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public VariableCS createVariableCS() {
+	public @NonNull VariableCS createVariableCS() {
 		VariableCSImpl variableCS = new VariableCSImpl();
 		return variableCS;
 	}
@@ -284,7 +285,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public LiteralExpCS createLiteralExpCS() {
+	public @NonNull LiteralExpCS createLiteralExpCS() {
 		LiteralExpCSImpl literalExpCS = new LiteralExpCSImpl();
 		return literalExpCS;
 	}
@@ -295,7 +296,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public MapLiteralExpCS createMapLiteralExpCS()
+	public @NonNull MapLiteralExpCS createMapLiteralExpCS()
 	{
 		MapLiteralExpCSImpl mapLiteralExpCS = new MapLiteralExpCSImpl();
 		return mapLiteralExpCS;
@@ -307,7 +308,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public MapLiteralPartCS createMapLiteralPartCS()
+	public @NonNull MapLiteralPartCS createMapLiteralPartCS()
 	{
 		MapLiteralPartCSImpl mapLiteralPartCS = new MapLiteralPartCSImpl();
 		return mapLiteralPartCS;
@@ -319,7 +320,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public MapTypeCS createMapTypeCS()
+	public @NonNull MapTypeCS createMapTypeCS()
 	{
 		MapTypeCSImpl mapTypeCS = new MapTypeCSImpl();
 		return mapTypeCS;
@@ -331,7 +332,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public NameExpCS createNameExpCS() {
+	public @NonNull NameExpCS createNameExpCS() {
 		NameExpCSImpl nameExpCS = new NameExpCSImpl();
 		return nameExpCS;
 	}
@@ -342,7 +343,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public NavigatingArgCS createNavigatingArgCS() {
+	public @NonNull NavigatingArgCS createNavigatingArgCS() {
 		NavigatingArgCSImpl navigatingArgCS = new NavigatingArgCSImpl();
 		return navigatingArgCS;
 	}
@@ -353,7 +354,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public NestedExpCS createNestedExpCS() {
+	public @NonNull NestedExpCS createNestedExpCS() {
 		NestedExpCSImpl nestedExpCS = new NestedExpCSImpl();
 		return nestedExpCS;
 	}
@@ -364,7 +365,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public CollectionLiteralExpCS createCollectionLiteralExpCS() {
+	public @NonNull CollectionLiteralExpCS createCollectionLiteralExpCS() {
 		CollectionLiteralExpCSImpl collectionLiteralExpCS = new CollectionLiteralExpCSImpl();
 		return collectionLiteralExpCS;
 	}
@@ -375,7 +376,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public CollectionLiteralPartCS createCollectionLiteralPartCS() {
+	public @NonNull CollectionLiteralPartCS createCollectionLiteralPartCS() {
 		CollectionLiteralPartCSImpl collectionLiteralPartCS = new CollectionLiteralPartCSImpl();
 		return collectionLiteralPartCS;
 	}
@@ -386,7 +387,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public CollectionPatternCS createCollectionPatternCS()
+	public @NonNull CollectionPatternCS createCollectionPatternCS()
 	{
 		CollectionPatternCSImpl collectionPatternCS = new CollectionPatternCSImpl();
 		return collectionPatternCS;
@@ -398,7 +399,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public PrimitiveLiteralExpCS createPrimitiveLiteralExpCS() {
+	public @NonNull PrimitiveLiteralExpCS createPrimitiveLiteralExpCS() {
 		PrimitiveLiteralExpCSImpl primitiveLiteralExpCS = new PrimitiveLiteralExpCSImpl();
 		return primitiveLiteralExpCS;
 	}
@@ -409,7 +410,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public RoundBracketedClauseCS createRoundBracketedClauseCS()
+	public @NonNull RoundBracketedClauseCS createRoundBracketedClauseCS()
 	{
 		RoundBracketedClauseCSImpl roundBracketedClauseCS = new RoundBracketedClauseCSImpl();
 		return roundBracketedClauseCS;
@@ -421,7 +422,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public SelfExpCS createSelfExpCS() {
+	public @NonNull SelfExpCS createSelfExpCS() {
 		SelfExpCSImpl selfExpCS = new SelfExpCSImpl();
 		return selfExpCS;
 	}
@@ -432,7 +433,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public ShadowPartCS createShadowPartCS()
+	public @NonNull ShadowPartCS createShadowPartCS()
 	{
 		ShadowPartCSImpl shadowPartCS = new ShadowPartCSImpl();
 		return shadowPartCS;
@@ -444,7 +445,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public SquareBracketedClauseCS createSquareBracketedClauseCS()
+	public @NonNull SquareBracketedClauseCS createSquareBracketedClauseCS()
 	{
 		SquareBracketedClauseCSImpl squareBracketedClauseCS = new SquareBracketedClauseCSImpl();
 		return squareBracketedClauseCS;
@@ -456,7 +457,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public TupleLiteralExpCS createTupleLiteralExpCS() {
+	public @NonNull TupleLiteralExpCS createTupleLiteralExpCS() {
 		TupleLiteralExpCSImpl tupleLiteralExpCS = new TupleLiteralExpCSImpl();
 		return tupleLiteralExpCS;
 	}
@@ -467,7 +468,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public TupleLiteralPartCS createTupleLiteralPartCS() {
+	public @NonNull TupleLiteralPartCS createTupleLiteralPartCS() {
 		TupleLiteralPartCSImpl tupleLiteralPartCS = new TupleLiteralPartCSImpl();
 		return tupleLiteralPartCS;
 	}
@@ -478,7 +479,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public StringLiteralExpCS createStringLiteralExpCS() {
+	public @NonNull StringLiteralExpCS createStringLiteralExpCS() {
 		StringLiteralExpCSImpl stringLiteralExpCS = new StringLiteralExpCSImpl();
 		return stringLiteralExpCS;
 	}
@@ -489,7 +490,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public BooleanLiteralExpCS createBooleanLiteralExpCS() {
+	public @NonNull BooleanLiteralExpCS createBooleanLiteralExpCS() {
 		BooleanLiteralExpCSImpl booleanLiteralExpCS = new BooleanLiteralExpCSImpl();
 		return booleanLiteralExpCS;
 	}
@@ -500,7 +501,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public InvalidLiteralExpCS createInvalidLiteralExpCS() {
+	public @NonNull InvalidLiteralExpCS createInvalidLiteralExpCS() {
 		InvalidLiteralExpCSImpl invalidLiteralExpCS = new InvalidLiteralExpCSImpl();
 		return invalidLiteralExpCS;
 	}
@@ -511,7 +512,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public LambdaLiteralExpCS createLambdaLiteralExpCS()
+	public @NonNull LambdaLiteralExpCS createLambdaLiteralExpCS()
 	{
 		LambdaLiteralExpCSImpl lambdaLiteralExpCS = new LambdaLiteralExpCSImpl();
 		return lambdaLiteralExpCS;
@@ -523,7 +524,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public NullLiteralExpCS createNullLiteralExpCS() {
+	public @NonNull NullLiteralExpCS createNullLiteralExpCS() {
 		NullLiteralExpCSImpl nullLiteralExpCS = new NullLiteralExpCSImpl();
 		return nullLiteralExpCS;
 	}
@@ -534,7 +535,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public NumberLiteralExpCS createNumberLiteralExpCS() {
+	public @NonNull NumberLiteralExpCS createNumberLiteralExpCS() {
 		NumberLiteralExpCSImpl numberLiteralExpCS = new NumberLiteralExpCSImpl();
 		return numberLiteralExpCS;
 	}
@@ -545,7 +546,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public PatternExpCS createPatternExpCS()
+	public @NonNull PatternExpCS createPatternExpCS()
 	{
 		PatternExpCSImpl patternExpCS = new PatternExpCSImpl();
 		return patternExpCS;
@@ -567,7 +568,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public IfExpCS createIfExpCS() {
+	public @NonNull IfExpCS createIfExpCS() {
 		IfExpCSImpl ifExpCS = new IfExpCSImpl();
 		return ifExpCS;
 	}
@@ -578,7 +579,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public IfThenExpCS createIfThenExpCS()
+	public @NonNull IfThenExpCS createIfThenExpCS()
 	{
 		IfThenExpCSImpl ifThenExpCS = new IfThenExpCSImpl();
 		return ifThenExpCS;
@@ -590,7 +591,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public InfixExpCS createInfixExpCS() {
+	public @NonNull InfixExpCS createInfixExpCS() {
 		InfixExpCSImpl infixExpCS = new InfixExpCSImpl();
 		return infixExpCS;
 	}
@@ -601,7 +602,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public LetExpCS createLetExpCS() {
+	public @NonNull LetExpCS createLetExpCS() {
 		LetExpCSImpl letExpCS = new LetExpCSImpl();
 		return letExpCS;
 	}
@@ -612,7 +613,7 @@ public class EssentialOCLCSFactoryImpl
 	 * @generated
 	 */
 	@Override
-	public LetVariableCS createLetVariableCS() {
+	public @NonNull LetVariableCS createLetVariableCS() {
 		LetVariableCSImpl letVariableCS = new LetVariableCSImpl();
 		return letVariableCS;
 	}
diff --git a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
index 68e6d1a838..ca654df53f 100644
--- a/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
+++ b/plugins/org.eclipse.ocl.xtext.essentialocl/src/org/eclipse/ocl/xtext/essentialocl/as2cs/EssentialOCLDeclarationVisitor.java
@@ -142,13 +142,22 @@ public class EssentialOCLDeclarationVisitor extends BaseDeclarationVisitor
 		}
 	}
 
-	protected @NonNull NameExpCS createNameExpCS(NamedElement asNamedElement) {
+	protected @NonNull NameExpCS createNameExpCS(/*@NonNull*/NamedElement asNamedElement) {
 		NameExpCS csNameExp = EssentialOCLCSFactory.eINSTANCE.createNameExpCS();
 		PathNameCS csPathName = createPathNameCS(asNamedElement);
 		csNameExp.setOwnedPathName(csPathName);
 		return csNameExp;
 	}
 
+	protected @NonNull NameExpCS createNameExpCS(/*@NonNull*/ NamedElement asNamedElement, @Nullable Namespace scope) {
+		assert asNamedElement != null;
+		NameExpCS csNameExp = EssentialOCLCSFactory.eINSTANCE.createNameExpCS();
+		PathNameCS csPathName = BaseCSFactory.eINSTANCE.createPathNameCS();
+		csNameExp.setOwnedPathName(csPathName);
+		context.refreshPathName(csPathName, asNamedElement, scope);
+		return csNameExp;
+	}
+
 	protected @NonNull NavigatingArgCS createNavigatingArgCS(@Nullable String prefix, /*@NonNull*/ OCLExpression csExp) {
 		NavigatingArgCS csNavigatingArg = EssentialOCLCSFactory.eINSTANCE.createNavigatingArgCS();
 		csNavigatingArg.setPrefix(prefix);
@@ -642,7 +651,7 @@ public class EssentialOCLDeclarationVisitor extends BaseDeclarationVisitor
 
 	@Override
 	public @Nullable ElementCS visitShadowExp(@NonNull ShadowExp asShadowExp) {
-		NameExpCS csNameExp = createNameExpCS(asShadowExp.getType());
+		NameExpCS csNameExp = createNameExpCS(asShadowExp.getType(), null);
 		csNameExp.setPivot(asShadowExp);
 		CurlyBracketedClauseCS csCurlyBracketedClause = EssentialOCLCSFactory.eINSTANCE.createCurlyBracketedClauseCS();
 		csNameExp.setOwnedCurlyBracketedClause(csCurlyBracketedClause);;
@@ -699,8 +708,8 @@ public class EssentialOCLDeclarationVisitor extends BaseDeclarationVisitor
 
 	@Override
 	public @Nullable ElementCS visitTypeExp(@NonNull TypeExp asTypeExp) {
-		@SuppressWarnings("null")@NonNull NameExpCS csNameExp = EssentialOCLCSFactory.eINSTANCE.createNameExpCS();
-		@SuppressWarnings("null")@NonNull PathNameCS csPathName = BaseCSFactory.eINSTANCE.createPathNameCS();
+		NameExpCS csNameExp = EssentialOCLCSFactory.eINSTANCE.createNameExpCS();
+		PathNameCS csPathName = BaseCSFactory.eINSTANCE.createPathNameCS();
 		csNameExp.setOwnedPathName(csPathName);
 		Type asType = getNonNullType(asTypeExp.getReferredType());
 		context.refreshPathName(csPathName, asType, null);