diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_RedefinitionScoping.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_RedefinitionScoping.kerml.xt
new file mode 100644
index 000000000..a498b2954
--- /dev/null
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/parsing/ParsingTests_RedefinitionScoping.kerml.xt
@@ -0,0 +1,41 @@
+//* XPECT_SETUP org.omg.kerml.xpect.tests.parsing.KerMLParsingTest
+        ResourceSet {
+                ThisFile {}
+                File {from ="/library/Base.kerml"}
+        }
+        Workspace {
+                JavaProject {
+                        SrcFolder {
+                                ThisFile {}
+                                File {from ="/library/Base.kerml"}
+                        }
+                }
+        }
+END_SETUP
+*/
+
+// XPECT noErrors ---> ""
+package RedefinitionScoping {
+	
+    classifier A {
+        feature x { 
+            feature y;
+        }
+    }
+    
+    classifier B specializes A {
+        feature x redefines x {
+            // Should redefine A::x::y.
+            feature redefines x::y;
+        }
+    }
+    
+    classifier C {
+        feature x;
+        feature y {
+            // Should redefine C::x.
+            feature redefines x;
+        }
+    }
+
+}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance3_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance3_Rdef.kerml.xt
index e3b6e22ea..fb52b2495 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance3_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance3_Rdef.kerml.xt
@@ -27,40 +27,40 @@ package test{
 	feature C subsets B{
 		//XPECT linkedName at b --> test.B.b
 		//* XPECT scope at b ---
-		A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
-		A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
-		B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c2,
-		C.c2.aa, C.c2.aa.self, C.c2.aa.that, C.c2.aa.that.self, C.c2.self, C.c2.that,
-		C.c2.that.self, C.self, C.that, C.that.self, D, D.d, D.d.self, D.d.that, D.d.that.self, D.self,
-		D.that, D.that.self, b, b.aa, b.aa.self, b.aa.that, b.aa.that.self, b.self, b.that,
-		b.that.self, self, test.A, test.A.a, test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that,
-		test.A.a.aa.that.self, test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.self, test.A.that,
-		test.A.that.self, test.B, test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that,
-		test.B.b.aa.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that,
-		test.B.that.self, test.C, test.C.c2, test.C.c2.aa, test.C.c2.aa.self, test.C.c2.aa.that,
-		test.C.c2.aa.that.self, test.C.c2.self, test.C.c2.that, test.C.c2.that.self, test.C.self, test.C.that,
-		test.C.that.self, test.D, test.D.d, test.D.d.self, test.D.d.that, test.D.d.that.self,
-		test.D.self, test.D.that, test.D.that.self, that, that.self
+        A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
+        A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
+        B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.b, C.b.aa,
+        C.b.aa.self, C.b.aa.that, C.b.aa.that.self, C.b.self, C.b.that, C.b.that.self, C.self,
+        C.that, C.that.self, D, D.d, D.d.self, D.d.that, D.d.that.self, D.self, D.that,
+        D.that.self, b, b.aa, b.aa.self, b.aa.that, b.aa.that.self, b.self, b.that, b.that.self,
+        self, test.A, test.A.a, test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that,
+        test.A.a.aa.that.self, test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.self, test.A.that,
+        test.A.that.self, test.B, test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that,
+        test.B.b.aa.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that,
+        test.B.that.self, test.C, test.C.b, test.C.b.aa, test.C.b.aa.self, test.C.b.aa.that,
+        test.C.b.aa.that.self, test.C.b.self, test.C.b.that, test.C.b.that.self, test.C.self, test.C.that,
+        test.C.that.self, test.D, test.D.d, test.D.d.self, test.D.d.that, test.D.d.that.self,
+        test.D.self, test.D.that, test.D.that.self, that, that.self
 		--- */
 		feature c2 redefines b {}
 	}
 	feature D subsets C.c2{
 		//XPECT linkedName at aa --> test.A.a.aa
 		//* XPECT scope at aa ---
-		A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
-		A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
-		B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c2,
-		C.c2.aa, C.c2.aa.self, C.c2.aa.that, C.c2.aa.that.self, C.c2.self, C.c2.that,
-		C.c2.that.self, C.self, C.that, C.that.self, D, D.d, D.d.self, D.d.that, D.d.that.self, D.self,
-		D.that, D.that.self, aa, aa.self, aa.that, aa.that.self, self, test.A, test.A.a,
-		test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that, test.A.a.aa.that.self, test.A.a.self,
-		test.A.a.that, test.A.a.that.self, test.A.self, test.A.that, test.A.that.self, test.B,
-		test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that, test.B.b.aa.that.self,
-		test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that, test.B.that.self,
-		test.C, test.C.c2, test.C.c2.aa, test.C.c2.aa.self, test.C.c2.aa.that,
-		test.C.c2.aa.that.self, test.C.c2.self, test.C.c2.that, test.C.c2.that.self, test.C.self, test.C.that,
-		test.C.that.self, test.D, test.D.d, test.D.d.self, test.D.d.that, test.D.d.that.self,
-		test.D.self, test.D.that, test.D.that.self, that, that.self
+        A, A.a, A.a.aa, A.a.aa.self, A.a.aa.that, A.a.aa.that.self, A.a.self, A.a.that,
+        A.a.that.self, A.self, A.that, A.that.self, B, B.b, B.b.aa, B.b.aa.self, B.b.aa.that,
+        B.b.aa.that.self, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c2,
+        C.c2.aa, C.c2.aa.self, C.c2.aa.that, C.c2.aa.that.self, C.c2.self, C.c2.that,
+        C.c2.that.self, C.self, C.that, C.that.self, D, D.aa, D.aa.self, D.aa.that, D.aa.that.self,
+        D.self, D.that, D.that.self, aa, aa.self, aa.that, aa.that.self, self, test.A,
+        test.A.a, test.A.a.aa, test.A.a.aa.self, test.A.a.aa.that, test.A.a.aa.that.self,
+        test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.self, test.A.that, test.A.that.self,
+        test.B, test.B.b, test.B.b.aa, test.B.b.aa.self, test.B.b.aa.that,
+        test.B.b.aa.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self, test.B.that,
+        test.B.that.self, test.C, test.C.c2, test.C.c2.aa, test.C.c2.aa.self, test.C.c2.aa.that,
+        test.C.c2.aa.that.self, test.C.c2.self, test.C.c2.that, test.C.c2.that.self, test.C.self, test.C.that,
+        test.C.that.self, test.D, test.D.aa, test.D.aa.self, test.D.aa.that, test.D.aa.that.self,
+        test.D.self, test.D.that, test.D.that.self, that, that.self
 		--- */
 		feature d redefines aa {}
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance_Rdef.kerml.xt
index a1569a6dd..38ce7a5bc 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_MultipleInheritance_Rdef.kerml.xt
@@ -47,14 +47,14 @@ package test{
 	--- */
 	feature C subsets B{
 		//* XPECT scope at b ---
-		A, A.a, A.a.self, A.a.that, A.a.that.self, A.self, A.that, A.that.self, B, B.b,
-		B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.c, C.c.self,
-		C.c.that, C.c.that.self, C.self, C.that, C.that.self, D, D.self, D.that, D.that.self, b,
-		b.self, b.that, b.that.self, self, test.A, test.A.a, test.A.a.self, test.A.a.that,
-		test.A.a.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.self,
-		test.B.b.that, test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.C,
-		test.C.c, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self, test.C.that,
-		test.C.that.self, test.D, test.D.self, test.D.that, test.D.that.self, that, that.self
+        A, A.a, A.a.self, A.a.that, A.a.that.self, A.self, A.that, A.that.self, B, B.b,
+        B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, C, C.b, C.b.self,
+        C.b.that, C.b.that.self, C.self, C.that, C.that.self, D, D.self, D.that, D.that.self, b,
+        b.self, b.that, b.that.self, self, test.A, test.A.a, test.A.a.self, test.A.a.that,
+        test.A.a.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.self,
+        test.B.b.that, test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.C,
+        test.C.b, test.C.b.self, test.C.b.that, test.C.b.that.self, test.C.self, test.C.that,
+        test.C.that.self, test.D, test.D.self, test.D.that, test.D.that.self, that, that.self
 		--- */
 		feature c redefines b {}
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberForPrivate_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberForPrivate_Rdef.kerml.xt
index d05a64c06..e7110326e 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberForPrivate_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberForPrivate_Rdef.kerml.xt
@@ -20,11 +20,9 @@ package test {
 	private alias k for something;
 	feature hello {
 		//* XPECT scope at k ---
-		hello, hello.self, hello.test, hello.test.self, hello.test.that,
-		hello.test.that.self, hello.that, hello.that.self, k, k.self, k.that, k.that.self, self, something,
-		something.self, something.that, something.that.self, test.hello, test.hello.self,
-		test.hello.test, test.hello.test.self, test.hello.test.that, test.hello.test.that.self,
-		test.hello.that, test.hello.that.self, that, that.self
+        hello, hello.self, hello.that, hello.that.self, k, k.self, k.that, k.that.self,
+        self, something, something.self, something.that, something.that.self, test.hello,
+        test.hello.self, test.hello.that, test.hello.that.self, that, that.self
 		--- */
 		//XPECT linkedName at k --> test.something
 		feature test redefines k{}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberFromInheritance2_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberFromInheritance2_Rdef.kerml.xt
index 5bf78e6d8..3df92dca1 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberFromInheritance2_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MemberNameTests_NamedMemberFromInheritance2_Rdef.kerml.xt
@@ -38,18 +38,20 @@ package test{
 	//XPECT linkedName at AA --> test.A
 	feature B subsets AA{
 		//* XPECT scope at aa ---
-		   A, A.a, A.a.self, A.a.that, A.a.that.self, A.aa, A.aa.self, A.aa.that,
-		   A.aa.that.self, A.self, A.that, A.that.self, AA, AA.a, AA.a.self, AA.a.that, AA.a.that.self,
-		   AA.aa, AA.aa.self, AA.aa.that, AA.aa.that.self, AA.self, AA.that, AA.that.self, B,
-		   B.b, B.b.self, B.b.that, B.b.that.self, B.b_alias, B.b_alias.self, B.b_alias.that,
-		   B.b_alias.that.self, B.self, B.that, B.that.self, a, a.self, a.that, a.that.self, aa, aa.self,
-		   aa.that, aa.that.self, self, test.A, test.A.a, test.A.a.self, test.A.a.that,
-		   test.A.a.that.self, test.A.aa, test.A.aa.self, test.A.aa.that, test.A.aa.that.self, test.A.self,
-		   test.A.that, test.A.that.self, test.AA, test.AA.a, test.AA.a.self, test.AA.a.that,
-		   test.AA.a.that.self, test.AA.aa, test.AA.aa.self, test.AA.aa.that, test.AA.aa.that.self,
-		   test.AA.self, test.AA.that, test.AA.that.self, test.B, test.B.b, test.B.b.self,
-		   test.B.b.that, test.B.b.that.self, test.B.b_alias, test.B.b_alias.self, test.B.b_alias.that,
-		   test.B.b_alias.that.self, test.B.self, test.B.that, test.B.that.self, that, that.self
+        A, A.a, A.a.self, A.a.that, A.a.that.self, A.aa, A.aa.self, A.aa.that,
+        A.aa.that.self, A.self, A.that, A.that.self, AA, AA.a, AA.a.self, AA.a.that, AA.a.that.self,
+        AA.aa, AA.aa.self, AA.aa.that, AA.aa.that.self, AA.self, AA.that, AA.that.self, B,
+        B.a, B.a.self, B.a.that, B.a.that.self, B.aa, B.aa.self, B.aa.that, B.aa.that.self,
+        B.b_alias, B.b_alias.self, B.b_alias.that, B.b_alias.that.self, B.self, B.that,
+        B.that.self, a, a.self, a.that, a.that.self, aa, aa.self, aa.that, aa.that.self, self,
+        test.A, test.A.a, test.A.a.self, test.A.a.that, test.A.a.that.self, test.A.aa,
+        test.A.aa.self, test.A.aa.that, test.A.aa.that.self, test.A.self, test.A.that,
+        test.A.that.self, test.AA, test.AA.a, test.AA.a.self, test.AA.a.that, test.AA.a.that.self,
+        test.AA.aa, test.AA.aa.self, test.AA.aa.that, test.AA.aa.that.self, test.AA.self,
+        test.AA.that, test.AA.that.self, test.B, test.B.a, test.B.a.self, test.B.a.that,
+        test.B.a.that.self, test.B.aa, test.B.aa.self, test.B.aa.that, test.B.aa.that.self, test.B.b_alias,
+        test.B.b_alias.self, test.B.b_alias.that, test.B.b_alias.that.self, test.B.self, test.B.that,
+        test.B.that.self, that, that.self
 		--- */
 		//XPECT linkedName at aa --> test.A.a
 		feature b redefines aa;
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassMoreTimes_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassMoreTimes_Rdef.kerml.xt
index 41140023e..d8032c3b6 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassMoreTimes_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassMoreTimes_Rdef.kerml.xt
@@ -60,39 +60,38 @@ package test{
 	feature EE subsets D {
 		//XPECT linkedName at D::f --> OuterPackage3.D.f
 		//* XPECT scope at D::f ---
-		   D, D.c, D.c.self, D.c.that, D.c.that.self, D.f, D.f.a1, D.f.a1.self,
-		   D.f.a1.that, D.f.a1.that.self, D.f.self, D.f.that, D.f.that.self, D.self, D.that,
-		   D.that.self, EE, EE.c, EE.c.self, EE.c.that, EE.c.that.self, EE.self, EE.that, EE.that.self,
-		   EE.try, EE.try.a1, EE.try.a1.self, EE.try.a1.that, EE.try.a1.that.self, EE.try.self,
-		   EE.try.that, EE.try.that.self, OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self,
-		   OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that,
-		   OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1,
-		   OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self,
-		   OuterPackage.B.b.that, OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that,
-		   OuterPackage.B.that.self, OuterPackage2.B, OuterPackage2.B.b, OuterPackage2.B.b.a1,
-		   OuterPackage2.B.b.a1.self, OuterPackage2.B.b.a1.that, OuterPackage2.B.b.a1.that.self,
-		   OuterPackage2.B.b.self, OuterPackage2.B.b.that, OuterPackage2.B.b.that.self, OuterPackage2.B.self,
-		   OuterPackage2.B.that, OuterPackage2.B.that.self, OuterPackage2.C, OuterPackage2.C.b,
-		   OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self, OuterPackage2.C.b.a1.that,
-		   OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that, OuterPackage2.C.b.that.self,
-		   OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that, OuterPackage2.C.c.that.self,
-		   OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, OuterPackage3.C,
-		   OuterPackage3.C.b, OuterPackage3.C.b.a1, OuterPackage3.C.b.a1.self, OuterPackage3.C.b.a1.that,
-		   OuterPackage3.C.b.a1.that.self, OuterPackage3.C.b.self, OuterPackage3.C.b.that, OuterPackage3.C.b.that.self,
-		   OuterPackage3.C.c, OuterPackage3.C.c.self, OuterPackage3.C.c.that, OuterPackage3.C.c.that.self,
-		   OuterPackage3.C.self, OuterPackage3.C.that, OuterPackage3.C.that.self, OuterPackage3.D,
-		   OuterPackage3.D.c, OuterPackage3.D.c.self, OuterPackage3.D.c.that, OuterPackage3.D.c.that.self,
-		   OuterPackage3.D.f, OuterPackage3.D.f.a1, OuterPackage3.D.f.a1.self, OuterPackage3.D.f.a1.that,
-		   OuterPackage3.D.f.a1.that.self, OuterPackage3.D.f.self, OuterPackage3.D.f.that, OuterPackage3.D.f.that.self,
-		   OuterPackage3.D.self, OuterPackage3.D.that, OuterPackage3.D.that.self, c, c.self, c.that,
-		   c.that.self, f, f.a1, f.a1.self, f.a1.that, f.a1.that.self, f.self, f.that, f.that.self,
-		   self, test.D, test.D.c, test.D.c.self, test.D.c.that, test.D.c.that.self, test.D.f,
-		   test.D.f.a1, test.D.f.a1.self, test.D.f.a1.that, test.D.f.a1.that.self, test.D.f.self,
-		   test.D.f.that, test.D.f.that.self, test.D.self, test.D.that, test.D.that.self, test.EE,
-		   test.EE.c, test.EE.c.self, test.EE.c.that, test.EE.c.that.self, test.EE.self,
-		   test.EE.that, test.EE.that.self, test.EE.try, test.EE.try.a1, test.EE.try.a1.self,
-		   test.EE.try.a1.that, test.EE.try.a1.that.self, test.EE.try.self, test.EE.try.that,
-		   test.EE.try.that.self, that, that.self
+           D, D.c, D.c.self, D.c.that, D.c.that.self, D.f, D.f.a1, D.f.a1.self,
+           D.f.a1.that, D.f.a1.that.self, D.f.self, D.f.that, D.f.that.self, D.self, D.that,
+           D.that.self, EE, EE.c, EE.c.self, EE.c.that, EE.c.that.self, EE.f, EE.f.a1, EE.f.a1.self,
+           EE.f.a1.that, EE.f.a1.that.self, EE.f.self, EE.f.that, EE.f.that.self, EE.self, EE.that,
+           EE.that.self, OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self,
+           OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that,
+           OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1,
+           OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self,
+           OuterPackage.B.b.that, OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that,
+           OuterPackage.B.that.self, OuterPackage2.B, OuterPackage2.B.b, OuterPackage2.B.b.a1,
+           OuterPackage2.B.b.a1.self, OuterPackage2.B.b.a1.that, OuterPackage2.B.b.a1.that.self,
+           OuterPackage2.B.b.self, OuterPackage2.B.b.that, OuterPackage2.B.b.that.self, OuterPackage2.B.self,
+           OuterPackage2.B.that, OuterPackage2.B.that.self, OuterPackage2.C, OuterPackage2.C.b,
+           OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self, OuterPackage2.C.b.a1.that,
+           OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that, OuterPackage2.C.b.that.self,
+           OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that, OuterPackage2.C.c.that.self,
+           OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, OuterPackage3.C,
+           OuterPackage3.C.b, OuterPackage3.C.b.a1, OuterPackage3.C.b.a1.self, OuterPackage3.C.b.a1.that,
+           OuterPackage3.C.b.a1.that.self, OuterPackage3.C.b.self, OuterPackage3.C.b.that, OuterPackage3.C.b.that.self,
+           OuterPackage3.C.c, OuterPackage3.C.c.self, OuterPackage3.C.c.that, OuterPackage3.C.c.that.self,
+           OuterPackage3.C.self, OuterPackage3.C.that, OuterPackage3.C.that.self, OuterPackage3.D,
+           OuterPackage3.D.c, OuterPackage3.D.c.self, OuterPackage3.D.c.that, OuterPackage3.D.c.that.self,
+           OuterPackage3.D.f, OuterPackage3.D.f.a1, OuterPackage3.D.f.a1.self, OuterPackage3.D.f.a1.that,
+           OuterPackage3.D.f.a1.that.self, OuterPackage3.D.f.self, OuterPackage3.D.f.that, OuterPackage3.D.f.that.self,
+           OuterPackage3.D.self, OuterPackage3.D.that, OuterPackage3.D.that.self, c, c.self, c.that,
+           c.that.self, f, f.a1, f.a1.self, f.a1.that, f.a1.that.self, f.self, f.that, f.that.self,
+           self, test.D, test.D.c, test.D.c.self, test.D.c.that, test.D.c.that.self, test.D.f,
+           test.D.f.a1, test.D.f.a1.self, test.D.f.a1.that, test.D.f.a1.that.self, test.D.f.self,
+           test.D.f.that, test.D.f.that.self, test.D.self, test.D.that, test.D.that.self, test.EE,
+           test.EE.c, test.EE.c.self, test.EE.c.that, test.EE.c.that.self, test.EE.f, test.EE.f.a1,
+           test.EE.f.a1.self, test.EE.f.a1.that, test.EE.f.a1.that.self, test.EE.f.self, test.EE.f.that,
+           test.EE.f.that.self, test.EE.self, test.EE.that, test.EE.that.self, that, that.self
 		--- */
 		feature try redefines D::f;
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassWithAlias_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassWithAlias_Rdef.kerml.xt
index e7f3761b7..f8b0b28c5 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassWithAlias_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClassWithAlias_Rdef.kerml.xt
@@ -23,18 +23,16 @@ package test{
 	//XPECT linkedName at aliass --> OuterPackage.A
 	feature C {
 		//* XPECT scope at aliass---
-		   C, C.c, C.c.a1, C.c.a1.self, C.c.a1.that, C.c.a1.that.self, C.c.self, C.c.that,
-		   C.c.that.self, C.self, C.that, C.that.self, OuterPackage.A, OuterPackage.A.a1,
-		   OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self,
-		   OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b,
-		   OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
-		   OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
-		   OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, aliass, aliass.a1,
-		   aliass.a1.self, aliass.a1.that, aliass.a1.that.self, aliass.self, aliass.that,
-		   aliass.that.self, self, test.C, test.C.c, test.C.c.a1, test.C.c.a1.self, test.C.c.a1.that,
-		   test.C.c.a1.that.self, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self, test.C.that,
-		   test.C.that.self, test.aliass, test.aliass.a1, test.aliass.a1.self, test.aliass.a1.that,
-		   test.aliass.a1.that.self, test.aliass.self, test.aliass.that, test.aliass.that.self, that, that.self
+           C, C.self, C.that, C.that.self, OuterPackage.A, OuterPackage.A.a1,
+           OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self,
+           OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b,
+           OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
+           OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
+           OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, aliass, aliass.a1,
+           aliass.a1.self, aliass.a1.that, aliass.a1.that.self, aliass.self, aliass.that,
+           aliass.that.self, self, test.C, test.C.self, test.C.that, test.C.that.self, test.aliass,
+           test.aliass.a1, test.aliass.a1.self, test.aliass.a1.that, test.aliass.a1.that.self,
+           test.aliass.self, test.aliass.that, test.aliass.that.self, that, that.self
 		--- */
 		feature c redefines aliass;
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClass_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClass_Rdef.kerml.xt
index fe8cd7526..5bdc994b8 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClass_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportClass_Rdef.kerml.xt
@@ -49,29 +49,29 @@ package test{
 	feature D subsets C {
 		//XPECT linkedName at b --> OuterPackage.B.b
 		//* XPECT scope at b ---
-		   C, C.b, C.b.a1, C.b.a1.self, C.b.a1.that, C.b.a1.that.self, C.b.self, C.b.that,
-		   C.b.that.self, C.c, C.c.self, C.c.that, C.c.that.self, C.self, C.that, C.that.self, D, D.c,
-		   D.c.self, D.c.that, D.c.that.self, D.self, D.that, D.that.self, D.try, D.try.a1,
-		   D.try.a1.self, D.try.a1.that, D.try.a1.that.self, D.try.self, D.try.that, D.try.that.self,
-		   OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that,
-		   OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self,
-		   OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self,
-		   OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that,
-		   OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self,
-		   OuterPackage2.B, OuterPackage2.B.b, OuterPackage2.B.b.a1, OuterPackage2.B.b.a1.self,
-		   OuterPackage2.B.b.a1.that, OuterPackage2.B.b.a1.that.self, OuterPackage2.B.b.self, OuterPackage2.B.b.that,
-		   OuterPackage2.B.b.that.self, OuterPackage2.B.self, OuterPackage2.B.that, OuterPackage2.B.that.self,
-		   OuterPackage2.C, OuterPackage2.C.b, OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self,
-		   OuterPackage2.C.b.a1.that, OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that,
-		   OuterPackage2.C.b.that.self, OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that,
-		   OuterPackage2.C.c.that.self, OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, b, b.a1,
-		   b.a1.self, b.a1.that, b.a1.that.self, b.self, b.that, b.that.self, c, c.self, c.that,
-		   c.that.self, self, test.C, test.C.b, test.C.b.a1, test.C.b.a1.self, test.C.b.a1.that,
-		   test.C.b.a1.that.self, test.C.b.self, test.C.b.that, test.C.b.that.self, test.C.c, test.C.c.self,
-		   test.C.c.that, test.C.c.that.self, test.C.self, test.C.that, test.C.that.self, test.D,
-		   test.D.c, test.D.c.self, test.D.c.that, test.D.c.that.self, test.D.self, test.D.that,
-		   test.D.that.self, test.D.try, test.D.try.a1, test.D.try.a1.self, test.D.try.a1.that,
-		   test.D.try.a1.that.self, test.D.try.self, test.D.try.that, test.D.try.that.self, that, that.self
+           C, C.b, C.b.a1, C.b.a1.self, C.b.a1.that, C.b.a1.that.self, C.b.self, C.b.that,
+           C.b.that.self, C.c, C.c.self, C.c.that, C.c.that.self, C.self, C.that, C.that.self, D, D.b,
+           D.b.a1, D.b.a1.self, D.b.a1.that, D.b.a1.that.self, D.b.self, D.b.that, D.b.that.self,
+           D.c, D.c.self, D.c.that, D.c.that.self, D.self, D.that, D.that.self, OuterPackage.A,
+           OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self,
+           OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B,
+           OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
+           OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
+           OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, OuterPackage2.B,
+           OuterPackage2.B.b, OuterPackage2.B.b.a1, OuterPackage2.B.b.a1.self, OuterPackage2.B.b.a1.that,
+           OuterPackage2.B.b.a1.that.self, OuterPackage2.B.b.self, OuterPackage2.B.b.that, OuterPackage2.B.b.that.self,
+           OuterPackage2.B.self, OuterPackage2.B.that, OuterPackage2.B.that.self, OuterPackage2.C,
+           OuterPackage2.C.b, OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self, OuterPackage2.C.b.a1.that,
+           OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that, OuterPackage2.C.b.that.self,
+           OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that, OuterPackage2.C.c.that.self,
+           OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, b, b.a1, b.a1.self, b.a1.that,
+           b.a1.that.self, b.self, b.that, b.that.self, c, c.self, c.that, c.that.self, self, test.C,
+           test.C.b, test.C.b.a1, test.C.b.a1.self, test.C.b.a1.that, test.C.b.a1.that.self,
+           test.C.b.self, test.C.b.that, test.C.b.that.self, test.C.c, test.C.c.self, test.C.c.that,
+           test.C.c.that.self, test.C.self, test.C.that, test.C.that.self, test.D, test.D.b, test.D.b.a1,
+           test.D.b.a1.self, test.D.b.a1.that, test.D.b.a1.that.self, test.D.b.self, test.D.b.that,
+           test.D.b.that.self, test.D.c, test.D.c.self, test.D.c.that, test.D.c.that.self, test.D.self,
+           test.D.that, test.D.that.self, that, that.self
 		--- */
 		feature try redefines b;
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportImportImp_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportImportImp_Rdef.kerml.xt
index 3c5d2b39e..fcf511746 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportImportImp_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportImportImp_Rdef.kerml.xt
@@ -77,20 +77,20 @@ package test{
 		OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self, OuterPackage2.C.b.a1.that,
 		OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that, OuterPackage2.C.b.that.self,
 		OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that, OuterPackage2.C.c.that.self,
-		OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, Test, Test.c, Test.c.self,
-		Test.c.that, Test.c.that.self, Test.self, Test.that, Test.that.self, Test.try, Test.try.a1,
-		Test.try.a1.self, Test.try.a1.that, Test.try.a1.that.self, Test.try.self, Test.try.that,
-		Test.try.that.self, b, b.a1, b.a1.self, b.a1.that, b.a1.that.self, b.self, b.that, b.that.self, c,
-		c.self, c.that, c.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
-		test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.a1,
-		test.B.b.a1.self, test.B.b.a1.that, test.B.b.a1.that.self, test.B.b.self, test.B.b.that,
-		test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.C, test.C.b, test.C.b.a1,
-		test.C.b.a1.self, test.C.b.a1.that, test.C.b.a1.that.self, test.C.b.self, test.C.b.that,
-		test.C.b.that.self, test.C.c, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self,
-		test.C.that, test.C.that.self, test.Test, test.Test.c, test.Test.c.self, test.Test.c.that,
-		test.Test.c.that.self, test.Test.self, test.Test.that, test.Test.that.self, test.Test.try,
-		test.Test.try.a1, test.Test.try.a1.self, test.Test.try.a1.that, test.Test.try.a1.that.self,
-		test.Test.try.self, test.Test.try.that, test.Test.try.that.self, that, that.self
+        OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, Test, Test.b, Test.b.a1,
+        Test.b.a1.self, Test.b.a1.that, Test.b.a1.that.self, Test.b.self, Test.b.that,
+        Test.b.that.self, Test.c, Test.c.self, Test.c.that, Test.c.that.self, Test.self, Test.that,
+        Test.that.self, b, b.a1, b.a1.self, b.a1.that, b.a1.that.self, b.self, b.that, b.that.self, c,
+        c.self, c.that, c.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
+        test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.a1,
+        test.B.b.a1.self, test.B.b.a1.that, test.B.b.a1.that.self, test.B.b.self, test.B.b.that,
+        test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.C, test.C.b, test.C.b.a1,
+        test.C.b.a1.self, test.C.b.a1.that, test.C.b.a1.that.self, test.C.b.self, test.C.b.that,
+        test.C.b.that.self, test.C.c, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self,
+        test.C.that, test.C.that.self, test.Test, test.Test.b, test.Test.b.a1, test.Test.b.a1.self,
+        test.Test.b.a1.that, test.Test.b.a1.that.self, test.Test.b.self, test.Test.b.that,
+        test.Test.b.that.self, test.Test.c, test.Test.c.self, test.Test.c.that, test.Test.c.that.self,
+        test.Test.self, test.Test.that, test.Test.that.self, that, that.self
 		--- */
 		feature try redefines b;
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportMembershipImp_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportMembershipImp_Rdef.kerml.xt
index fbb381794..5c8131519 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportMembershipImp_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_ImportMembershipImp_Rdef.kerml.xt
@@ -52,33 +52,32 @@ package test{
 	feature Test subsets C {
 		//XPECT linkedName at b --> OuterPackage.B.b
 		//* XPECT scope at b ---	
-		C, C.b, C.b.a1, C.b.a1.self, C.b.a1.that, C.b.a1.that.self, C.b.self, C.b.that,
-		C.b.that.self, C.c, C.c.self, C.c.that, C.c.that.self, C.self, C.that, C.that.self,
-		OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that,
-		OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self,
-		OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self,
-		OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that,
-		OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self,
-		OuterPackage2.A, OuterPackage2.A.a1, OuterPackage2.A.a1.self, OuterPackage2.A.a1.that,
-		OuterPackage2.A.a1.that.self, OuterPackage2.A.self, OuterPackage2.A.that, OuterPackage2.A.that.self,
-		OuterPackage2.B, OuterPackage2.B.b, OuterPackage2.B.b.a1, OuterPackage2.B.b.a1.self,
-		OuterPackage2.B.b.a1.that, OuterPackage2.B.b.a1.that.self, OuterPackage2.B.b.self, OuterPackage2.B.b.that,
-		OuterPackage2.B.b.that.self, OuterPackage2.B.self, OuterPackage2.B.that, OuterPackage2.B.that.self,
-		OuterPackage2.C, OuterPackage2.C.b, OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self,
-		OuterPackage2.C.b.a1.that, OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that,
-		OuterPackage2.C.b.that.self, OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that,
-		OuterPackage2.C.c.that.self, OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, Test,
-		Test.c, Test.c.self, Test.c.that, Test.c.that.self, Test.self, Test.that,
-		Test.that.self, Test.try, Test.try.a1, Test.try.a1.self, Test.try.a1.that,
-		Test.try.a1.that.self, Test.try.self, Test.try.that, Test.try.that.self, b, b.a1, b.a1.self,
-		b.a1.that, b.a1.that.self, b.self, b.that, b.that.self, c, c.self, c.that, c.that.self,
-		self, test.C, test.C.b, test.C.b.a1, test.C.b.a1.self, test.C.b.a1.that,
-		test.C.b.a1.that.self, test.C.b.self, test.C.b.that, test.C.b.that.self, test.C.c, test.C.c.self,
-		test.C.c.that, test.C.c.that.self, test.C.self, test.C.that, test.C.that.self, test.Test,
-		test.Test.c, test.Test.c.self, test.Test.c.that, test.Test.c.that.self, test.Test.self,
-		test.Test.that, test.Test.that.self, test.Test.try, test.Test.try.a1, test.Test.try.a1.self,
-		test.Test.try.a1.that, test.Test.try.a1.that.self, test.Test.try.self, test.Test.try.that,
-		test.Test.try.that.self, that, that.self
+        C, C.b, C.b.a1, C.b.a1.self, C.b.a1.that, C.b.a1.that.self, C.b.self, C.b.that,
+        C.b.that.self, C.c, C.c.self, C.c.that, C.c.that.self, C.self, C.that, C.that.self,
+        OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that,
+        OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self,
+        OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self,
+        OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that,
+        OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self,
+        OuterPackage2.A, OuterPackage2.A.a1, OuterPackage2.A.a1.self, OuterPackage2.A.a1.that,
+        OuterPackage2.A.a1.that.self, OuterPackage2.A.self, OuterPackage2.A.that, OuterPackage2.A.that.self,
+        OuterPackage2.B, OuterPackage2.B.b, OuterPackage2.B.b.a1, OuterPackage2.B.b.a1.self,
+        OuterPackage2.B.b.a1.that, OuterPackage2.B.b.a1.that.self, OuterPackage2.B.b.self, OuterPackage2.B.b.that,
+        OuterPackage2.B.b.that.self, OuterPackage2.B.self, OuterPackage2.B.that, OuterPackage2.B.that.self,
+        OuterPackage2.C, OuterPackage2.C.b, OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self,
+        OuterPackage2.C.b.a1.that, OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that,
+        OuterPackage2.C.b.that.self, OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that,
+        OuterPackage2.C.c.that.self, OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, Test,
+        Test.b, Test.b.a1, Test.b.a1.self, Test.b.a1.that, Test.b.a1.that.self, Test.b.self,
+        Test.b.that, Test.b.that.self, Test.c, Test.c.self, Test.c.that, Test.c.that.self,
+        Test.self, Test.that, Test.that.self, b, b.a1, b.a1.self, b.a1.that, b.a1.that.self,
+        b.self, b.that, b.that.self, c, c.self, c.that, c.that.self, self, test.C, test.C.b,
+        test.C.b.a1, test.C.b.a1.self, test.C.b.a1.that, test.C.b.a1.that.self, test.C.b.self,
+        test.C.b.that, test.C.b.that.self, test.C.c, test.C.c.self, test.C.c.that, test.C.c.that.self,
+        test.C.self, test.C.that, test.C.that.self, test.Test, test.Test.b, test.Test.b.a1,
+        test.Test.b.a1.self, test.Test.b.a1.that, test.Test.b.a1.that.self, test.Test.b.self,
+        test.Test.b.that, test.Test.b.that.self, test.Test.c, test.Test.c.self, test.Test.c.that,
+        test.Test.c.that.self, test.Test.self, test.Test.that, test.Test.that.self, that, that.self
 		--- */
 		feature try redefines b;
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_MembershipImportImp_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_MembershipImportImp_Rdef.kerml.xt
index c2796d141..1cff18994 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_MembershipImportImp_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/MultipleImport_MembershipImportImp_Rdef.kerml.xt
@@ -70,19 +70,19 @@ package test{
 		   OuterPackage2.C.b.a1, OuterPackage2.C.b.a1.self, OuterPackage2.C.b.a1.that,
 		   OuterPackage2.C.b.a1.that.self, OuterPackage2.C.b.self, OuterPackage2.C.b.that, OuterPackage2.C.b.that.self,
 		   OuterPackage2.C.c, OuterPackage2.C.c.self, OuterPackage2.C.c.that, OuterPackage2.C.c.that.self,
-		   OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, Test, Test.c, Test.c.self,
-		   Test.c.that, Test.c.that.self, Test.self, Test.that, Test.that.self, Test.try, Test.try.a1,
-		   Test.try.a1.self, Test.try.a1.that, Test.try.a1.that.self, Test.try.self, Test.try.that,
-		   Test.try.that.self, b, b.a1, b.a1.self, b.a1.that, b.a1.that.self, b.self, b.that, b.that.self, c,
-		   c.self, c.that, c.that.self, self, test.B, test.B.b, test.B.b.a1, test.B.b.a1.self,
-		   test.B.b.a1.that, test.B.b.a1.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self,
-		   test.B.self, test.B.that, test.B.that.self, test.C, test.C.b, test.C.b.a1, test.C.b.a1.self,
-		   test.C.b.a1.that, test.C.b.a1.that.self, test.C.b.self, test.C.b.that, test.C.b.that.self,
-		   test.C.c, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self, test.C.that,
-		   test.C.that.self, test.Test, test.Test.c, test.Test.c.self, test.Test.c.that,
-		   test.Test.c.that.self, test.Test.self, test.Test.that, test.Test.that.self, test.Test.try,
-		   test.Test.try.a1, test.Test.try.a1.self, test.Test.try.a1.that, test.Test.try.a1.that.self,
-		   test.Test.try.self, test.Test.try.that, test.Test.try.that.self, that, that.self
+           OuterPackage2.C.self, OuterPackage2.C.that, OuterPackage2.C.that.self, Test, Test.b, Test.b.a1,
+           Test.b.a1.self, Test.b.a1.that, Test.b.a1.that.self, Test.b.self, Test.b.that,
+           Test.b.that.self, Test.c, Test.c.self, Test.c.that, Test.c.that.self, Test.self, Test.that,
+           Test.that.self, b, b.a1, b.a1.self, b.a1.that, b.a1.that.self, b.self, b.that, b.that.self, c,
+           c.self, c.that, c.that.self, self, test.B, test.B.b, test.B.b.a1, test.B.b.a1.self,
+           test.B.b.a1.that, test.B.b.a1.that.self, test.B.b.self, test.B.b.that, test.B.b.that.self,
+           test.B.self, test.B.that, test.B.that.self, test.C, test.C.b, test.C.b.a1, test.C.b.a1.self,
+           test.C.b.a1.that, test.C.b.a1.that.self, test.C.b.self, test.C.b.that, test.C.b.that.self,
+           test.C.c, test.C.c.self, test.C.c.that, test.C.c.that.self, test.C.self, test.C.that,
+           test.C.that.self, test.Test, test.Test.b, test.Test.b.a1, test.Test.b.a1.self,
+           test.Test.b.a1.that, test.Test.b.a1.that.self, test.Test.b.self, test.Test.b.that,
+           test.Test.b.that.self, test.Test.c, test.Test.c.self, test.Test.c.that, test.Test.c.that.self,
+           test.Test.self, test.Test.that, test.Test.that.self, that, that.self
    		--- */
 		feature try redefines b;
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameBadCase3_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameBadCase3_Rdef.kerml.xt
index 0c5181ea6..a11f902fd 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameBadCase3_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameBadCase3_Rdef.kerml.xt
@@ -29,33 +29,33 @@ package test{
 		feature B redefines A {
 			//XPECT linkedName at a1 --> OuterPackage.A.a1
 			//* XPECT scope at a1 ---
-			A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, B,
-			B.b, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, OuterPackage.A,
-			OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self,
-			OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B,
-			OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
-			OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
-			OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, a1, a1.self, a1.that,
-			a1.that.self, inner, inner.A, inner.A.a1, inner.A.a1.self, inner.A.a1.that,
-			inner.A.a1.that.self, inner.A.self, inner.A.that, inner.A.that.self, inner.B, inner.B.b,
-			inner.B.b.a1, inner.B.b.a1.self, inner.B.b.a1.that, inner.B.b.a1.that.self, inner.B.b.self,
-			inner.B.b.that, inner.B.b.that.self, inner.B.self, inner.B.that, inner.B.that.self, inner.self,
-			inner.that, inner.that.self, inner1, inner1.A, inner1.A.a1, inner1.A.a1.self,
-			inner1.A.a1.that, inner1.A.a1.that.self, inner1.A.self, inner1.A.that, inner1.A.that.self,
-			inner1.B, inner1.B.b, inner1.B.b.self, inner1.B.b.that, inner1.B.b.that.self,
-			inner1.B.self, inner1.B.that, inner1.B.that.self, inner1.self, inner1.that, inner1.that.self,
-			self, test.A, test.A.a2, test.A.a2.self, test.A.a2.that, test.A.a2.that.self,
-			test.A.self, test.A.that, test.A.that.self, test.inner, test.inner.A, test.inner.A.a1,
-			test.inner.A.a1.self, test.inner.A.a1.that, test.inner.A.a1.that.self, test.inner.A.self,
-			test.inner.A.that, test.inner.A.that.self, test.inner.B, test.inner.B.b, test.inner.B.b.a1,
-			test.inner.B.b.a1.self, test.inner.B.b.a1.that, test.inner.B.b.a1.that.self, test.inner.B.b.self,
-			test.inner.B.b.that, test.inner.B.b.that.self, test.inner.B.self, test.inner.B.that,
-			test.inner.B.that.self, test.inner.self, test.inner.that, test.inner.that.self, test.inner1,
-			test.inner1.A, test.inner1.A.a1, test.inner1.A.a1.self, test.inner1.A.a1.that,
-			test.inner1.A.a1.that.self, test.inner1.A.self, test.inner1.A.that, test.inner1.A.that.self, test.inner1.B,
-			test.inner1.B.b, test.inner1.B.b.self, test.inner1.B.b.that, test.inner1.B.b.that.self,
-			test.inner1.B.self, test.inner1.B.that, test.inner1.B.that.self, test.inner1.self,
-			test.inner1.that, test.inner1.that.self, that, that.self
+            A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, B,
+            B.a1, B.a1.self, B.a1.that, B.a1.that.self, B.self, B.that, B.that.self,
+            OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that,
+            OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self,
+            OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self,
+            OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that,
+            OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, a1,
+            a1.self, a1.that, a1.that.self, inner, inner.A, inner.A.a1, inner.A.a1.self,
+            inner.A.a1.that, inner.A.a1.that.self, inner.A.self, inner.A.that, inner.A.that.self, inner.B,
+            inner.B.b, inner.B.b.a1, inner.B.b.a1.self, inner.B.b.a1.that, inner.B.b.a1.that.self,
+            inner.B.b.self, inner.B.b.that, inner.B.b.that.self, inner.B.self, inner.B.that,
+            inner.B.that.self, inner.self, inner.that, inner.that.self, inner1, inner1.A, inner1.A.a1,
+            inner1.A.a1.self, inner1.A.a1.that, inner1.A.a1.that.self, inner1.A.self, inner1.A.that,
+            inner1.A.that.self, inner1.B, inner1.B.a1, inner1.B.a1.self, inner1.B.a1.that,
+            inner1.B.a1.that.self, inner1.B.self, inner1.B.that, inner1.B.that.self, inner1.self, inner1.that,
+            inner1.that.self, self, test.A, test.A.a2, test.A.a2.self, test.A.a2.that, test.A.a2.that.self,
+            test.A.self, test.A.that, test.A.that.self, test.inner, test.inner.A, test.inner.A.a1,
+            test.inner.A.a1.self, test.inner.A.a1.that, test.inner.A.a1.that.self, test.inner.A.self,
+            test.inner.A.that, test.inner.A.that.self, test.inner.B, test.inner.B.b, test.inner.B.b.a1,
+            test.inner.B.b.a1.self, test.inner.B.b.a1.that, test.inner.B.b.a1.that.self, test.inner.B.b.self,
+            test.inner.B.b.that, test.inner.B.b.that.self, test.inner.B.self, test.inner.B.that,
+            test.inner.B.that.self, test.inner.self, test.inner.that, test.inner.that.self, test.inner1,
+            test.inner1.A, test.inner1.A.a1, test.inner1.A.a1.self, test.inner1.A.a1.that,
+            test.inner1.A.a1.that.self, test.inner1.A.self, test.inner1.A.that, test.inner1.A.that.self, test.inner1.B,
+            test.inner1.B.a1, test.inner1.B.a1.self, test.inner1.B.a1.that, test.inner1.B.a1.that.self,
+            test.inner1.B.self, test.inner1.B.that, test.inner1.B.that.self, test.inner1.self,
+            test.inner1.that, test.inner1.that.self, that, that.self
 			--- */
 			feature b redefines a1{}
 		}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameGoodCase2_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameGoodCase2_Rdef.kerml.xt
index 9f5902951..4de05da2a 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameGoodCase2_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_ImportAndInnerClassesNamesAreTheSameGoodCase2_Rdef.kerml.xt
@@ -39,16 +39,17 @@ package test{
 	feature B subsets A {
 		//XPECT linkedName at a2 --> test.A.a2
 		//* XPECT scope at a2 ---
-		A, A.a2, A.a2.self, A.a2.that, A.a2.that.self, A.self, A.that, A.that.self, B,
-		B.b, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, OuterPackage.A,
-		OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self,
-		OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B,
-		OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
-		OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
-		OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, a2, a2.self, a2.that,
-		a2.that.self, self, test.A, test.A.a2, test.A.a2.self, test.A.a2.that, test.A.a2.that.self,
-		test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.self, test.B.b.that,
-		test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, that, that.self
+        A, A.a2, A.a2.self, A.a2.that, A.a2.that.self, A.self, A.that, A.that.self, B,
+        B.a2, B.a2.self, B.a2.that, B.a2.that.self, B.self, B.that, B.that.self,
+        OuterPackage.A, OuterPackage.A.a1, OuterPackage.A.a1.self, OuterPackage.A.a1.that,
+        OuterPackage.A.a1.that.self, OuterPackage.A.self, OuterPackage.A.that, OuterPackage.A.that.self,
+        OuterPackage.B, OuterPackage.B.b, OuterPackage.B.b.a1, OuterPackage.B.b.a1.self,
+        OuterPackage.B.b.a1.that, OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that,
+        OuterPackage.B.b.that.self, OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, a2,
+        a2.self, a2.that, a2.that.self, self, test.A, test.A.a2, test.A.a2.self, test.A.a2.that,
+        test.A.a2.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.a2, test.B.a2.self,
+        test.B.a2.that, test.B.a2.that.self, test.B.self, test.B.that, test.B.that.self, that,
+        that.self
 		--- */
 		feature b redefines a2 {}
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCaseWithAlias_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCaseWithAlias_Rdef.kerml.xt
index 611f0b73a..285f9803b 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCaseWithAlias_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCaseWithAlias_Rdef.kerml.xt
@@ -41,17 +41,17 @@ package test{
 		}
 		//XPECT linkedName at a1 --> test.A.a1
 		//* XPECT scope at a1 ---
-		A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, A1,
-		A1.a1, A1.a1.self, A1.a1.that, A1.a1.that.self, A1.self, A1.that, A1.that.self, B,
-		B.A, B.A.a2, B.A.a2.self, B.A.a2.that, B.A.a2.that.self, B.A.self, B.A.that,
-		B.A.that.self, B.b, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, a1,
-		a1.self, a1.that, a1.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
-		test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.A1, test.A1.a1,
-		test.A1.a1.self, test.A1.a1.that, test.A1.a1.that.self, test.A1.self, test.A1.that,
-		test.A1.that.self, test.B, test.B.A, test.B.A.a2, test.B.A.a2.self, test.B.A.a2.that,
-		test.B.A.a2.that.self, test.B.A.self, test.B.A.that, test.B.A.that.self, test.B.b, test.B.b.self,
-		test.B.b.that, test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, that,
-		that.self
+        A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, A1,
+        A1.a1, A1.a1.self, A1.a1.that, A1.a1.that.self, A1.self, A1.that, A1.that.self, B,
+        B.A, B.A.a2, B.A.a2.self, B.A.a2.that, B.A.a2.that.self, B.A.self, B.A.that,
+        B.A.that.self, B.a1, B.a1.self, B.a1.that, B.a1.that.self, B.self, B.that, B.that.self, a1,
+        a1.self, a1.that, a1.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
+        test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.A1, test.A1.a1,
+        test.A1.a1.self, test.A1.a1.that, test.A1.a1.that.self, test.A1.self, test.A1.that,
+        test.A1.that.self, test.B, test.B.A, test.B.A.a2, test.B.A.a2.self, test.B.A.a2.that,
+        test.B.A.a2.that.self, test.B.A.self, test.B.A.that, test.B.A.that.self, test.B.a1, test.B.a1.self,
+        test.B.a1.that, test.B.a1.that.self, test.B.self, test.B.that, test.B.that.self, that,
+        that.self
 		--- */
 		feature b redefines a1{}
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCase_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCase_Rdef.kerml.xt
index 03eb4ff7d..f2f8f207a 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCase_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesGoodCase_Rdef.kerml.xt
@@ -36,14 +36,14 @@ package test{
 		}
 		//XPECT linkedName at a1 --> test.A.a1
 		//* XPECT scope at a1 ---
-		A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, B,
-		B.A, B.A.a2, B.A.a2.self, B.A.a2.that, B.A.a2.that.self, B.A.self, B.A.that,
-		B.A.that.self, B.b, B.b.self, B.b.that, B.b.that.self, B.self, B.that, B.that.self, a1,
-		a1.self, a1.that, a1.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
-		test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.A, test.B.A.a2,
-		test.B.A.a2.self, test.B.A.a2.that, test.B.A.a2.that.self, test.B.A.self, test.B.A.that,
-		test.B.A.that.self, test.B.b, test.B.b.self, test.B.b.that, test.B.b.that.self, test.B.self,
-		test.B.that, test.B.that.self, that, that.self
+        A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, B,
+        B.A, B.A.a2, B.A.a2.self, B.A.a2.that, B.A.a2.that.self, B.A.self, B.A.that,
+        B.A.that.self, B.a1, B.a1.self, B.a1.that, B.a1.that.self, B.self, B.that, B.that.self, a1,
+        a1.self, a1.that, a1.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
+        test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.A, test.B.A.a2,
+        test.B.A.a2.self, test.B.A.a2.that, test.B.A.a2.that.self, test.B.A.self, test.B.A.that,
+        test.B.A.that.self, test.B.a1, test.B.a1.self, test.B.a1.that, test.B.a1.that.self, test.B.self,
+        test.B.that, test.B.that.self, that, that.self
 		--- */
 		feature b redefines a1{}
 	}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesInnerClassAndOuterClassWithAlias_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesInnerClassAndOuterClassWithAlias_Rdef.kerml.xt
index c27744de0..b033446fe 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesInnerClassAndOuterClassWithAlias_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/ShadowingTests_SameNamesInnerClassAndOuterClassWithAlias_Rdef.kerml.xt
@@ -22,14 +22,11 @@ package test{
 		feature A{
 			//XPECT linkedName at A --> test.A1.A
 			//* XPECT scope at A ---
-			A, A.B, A.B.B, A.B.self, A.B.that, A.B.that.self, A.self, A.that, A.that.self,
-			A1, A1.A, A1.A.B, A1.A.B.B, A1.A.B.self, A1.A.B.that, A1.A.B.that.self, A1.A.self,
-			A1.A.that, A1.A.that.self, A1.self, A1.that, A1.that.self, self, test.A, test.A.A,
-			test.A.A.B, test.A.A.B.B, test.A.A.B.self, test.A.A.B.that, test.A.A.B.that.self,
-			test.A.A.self, test.A.A.that, test.A.A.that.self, test.A.self, test.A.that, test.A.that.self,
-			test.A1, test.A1.A, test.A1.A.B, test.A1.A.B.B, test.A1.A.B.self, test.A1.A.B.that,
-			test.A1.A.B.that.self, test.A1.A.self, test.A1.A.that, test.A1.A.that.self, test.A1.self,
-			test.A1.that, test.A1.that.self, that, that.self
+            A, A.self, A.that, A.that.self, A1, A1.A, A1.A.self, A1.A.that, A1.A.that.self,
+            A1.self, A1.that, A1.that.self, self, test.A, test.A.A, test.A.A.self, test.A.A.that,
+            test.A.A.that.self, test.A.self, test.A.that, test.A.that.self, test.A1, test.A1.A, test.A1.A.self,
+            test.A1.A.that, test.A1.A.that.self, test.A1.self, test.A1.that, test.A1.that.self, that,
+            that.self
 			--- */
 			feature B redefines A{}
 		}
diff --git a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/SimpleImportTestsFromOtherFile_Import2_Rdef.kerml.xt b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/SimpleImportTestsFromOtherFile_Import2_Rdef.kerml.xt
index 3f43f3941..081c7fef5 100644
--- a/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/SimpleImportTestsFromOtherFile_Import2_Rdef.kerml.xt
+++ b/org.omg.kerml.xpect.tests/src/org/omg/kerml/xpect/tests/testsuite/SimpleImportTestsFromOtherFile_Import2_Rdef.kerml.xt
@@ -42,23 +42,23 @@ package test {
 	feature Try subsets B{
 		//XPECT linkedName at b --> OuterPackage.B.b
 		//* XPECT scope at b ---
-		   A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, B,
-		   B.b, B.b.a1, B.b.a1.self, B.b.a1.that, B.b.a1.that.self, B.b.self, B.b.that,
-		   B.b.that.self, B.self, B.that, B.that.self, OuterPackage.A, OuterPackage.A.a1,
-		   OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self,
-		   OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b,
-		   OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
-		   OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
-		   OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, Try, Try.self, Try.that,
-		   Try.that.self, Try.try, Try.try.a1, Try.try.a1.self, Try.try.a1.that, Try.try.a1.that.self,
-		   Try.try.self, Try.try.that, Try.try.that.self, b, b.a1, b.a1.self, b.a1.that, b.a1.that.self,
-		   b.self, b.that, b.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
-		   test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.a1,
-		   test.B.b.a1.self, test.B.b.a1.that, test.B.b.a1.that.self, test.B.b.self, test.B.b.that,
-		   test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.Try, test.Try.self,
-		   test.Try.that, test.Try.that.self, test.Try.try, test.Try.try.a1, test.Try.try.a1.self,
-		   test.Try.try.a1.that, test.Try.try.a1.that.self, test.Try.try.self, test.Try.try.that,
-		   test.Try.try.that.self, that, that.self
+           A, A.a1, A.a1.self, A.a1.that, A.a1.that.self, A.self, A.that, A.that.self, B,
+           B.b, B.b.a1, B.b.a1.self, B.b.a1.that, B.b.a1.that.self, B.b.self, B.b.that,
+           B.b.that.self, B.self, B.that, B.that.self, OuterPackage.A, OuterPackage.A.a1,
+           OuterPackage.A.a1.self, OuterPackage.A.a1.that, OuterPackage.A.a1.that.self, OuterPackage.A.self,
+           OuterPackage.A.that, OuterPackage.A.that.self, OuterPackage.B, OuterPackage.B.b,
+           OuterPackage.B.b.a1, OuterPackage.B.b.a1.self, OuterPackage.B.b.a1.that,
+           OuterPackage.B.b.a1.that.self, OuterPackage.B.b.self, OuterPackage.B.b.that, OuterPackage.B.b.that.self,
+           OuterPackage.B.self, OuterPackage.B.that, OuterPackage.B.that.self, Try, Try.b, Try.b.a1,
+           Try.b.a1.self, Try.b.a1.that, Try.b.a1.that.self, Try.b.self, Try.b.that, Try.b.that.self,
+           Try.self, Try.that, Try.that.self, b, b.a1, b.a1.self, b.a1.that, b.a1.that.self, b.self,
+           b.that, b.that.self, self, test.A, test.A.a1, test.A.a1.self, test.A.a1.that,
+           test.A.a1.that.self, test.A.self, test.A.that, test.A.that.self, test.B, test.B.b, test.B.b.a1,
+           test.B.b.a1.self, test.B.b.a1.that, test.B.b.a1.that.self, test.B.b.self, test.B.b.that,
+           test.B.b.that.self, test.B.self, test.B.that, test.B.that.self, test.Try, test.Try.b,
+           test.Try.b.a1, test.Try.b.a1.self, test.Try.b.a1.that, test.Try.b.a1.that.self,
+           test.Try.b.self, test.Try.b.that, test.Try.b.that.self, test.Try.self, test.Try.that,
+           test.Try.that.self, that, that.self
 		--- */
 		feature try redefines b;
 	}
diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend
index 2d4577cbc..1ea6cbc87 100644
--- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend
+++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend
@@ -57,6 +57,7 @@ import org.eclipse.xtext.naming.IQualifiedNameConverter
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.omg.sysml.util.NamespaceUtil
 import org.omg.kerml.xtext.naming.QualifiedNameUtil
+import org.omg.sysml.lang.sysml.Redefinition
 
 class KerMLScope extends AbstractScope implements ISysMLScope {
 	
@@ -265,7 +266,9 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 			
 			NamespaceUtil.addAdditionalMembersTo(ns)
 			for (mem: ns.ownedMembership.clone) { // Clone to avoid any possible ConcurrentModificationException.
-				if (!scopeProvider.visited.contains(mem)) {
+				if (!(scopeProvider.visited.contains(mem) || 
+				     mem instanceof OwningMembership && skip instanceof Redefinition && 
+				     (skip as Redefinition).owningType == mem.memberElement)) {
 					if (includeAll || isInsideScope || mem.visibility == VisibilityKind.PUBLIC || 
 						     mem.visibility == VisibilityKind.PROTECTED && isInheriting) {
 
@@ -371,7 +374,7 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 			val newRedefined = new HashSet()
 			if (redefined !== null) {
 				newRedefined.addAll(redefined)
-				newRedefined.addAll(TypeUtil.getFeaturesRedefinedBy(ns, skip))
+				newRedefined.addAll(TypeUtil.getFeaturesRedefinedBy(ns, if (skip instanceof Redefinition) skip.owningFeature else null))
 			}
 			
 			// Note: All specializations are traversed, even if a resolution is found, in order to check for possible redefinitions inherited
diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScopeProvider.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScopeProvider.xtend
index b19335815..8151bb931 100644
--- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScopeProvider.xtend
+++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScopeProvider.xtend
@@ -50,6 +50,7 @@ import org.omg.sysml.lang.sysml.Subsetting
 import org.omg.sysml.util.NamespaceUtil
 import org.omg.sysml.lang.sysml.FeatureTyping
 import org.omg.kerml.xtext.library.LibraryNamespaces
+import org.omg.sysml.lang.sysml.Redefinition
 
 class KerMLScopeProvider extends AbstractKerMLScopeProvider {
 
@@ -124,7 +125,7 @@ class KerMLScopeProvider extends AbstractKerMLScopeProvider {
 			    	featureChained = owningNamespace as Connector
 			    }
 			}
-			featureChained.scope_relativeNamespace(owningNamespace, ch, reference)
+			featureChained.scope_relativeNamespace(owningNamespace, owningRelationship, reference)
 		} else
 			ch.scope_Namespace(ownedFeatureChainings.get(i-1).chainingFeature, ch, reference, false)
 	}
@@ -142,7 +143,9 @@ class KerMLScopeProvider extends AbstractKerMLScopeProvider {
 			super.getScope(element, reference)		
 		else 
 			namespace.scopeFor(reference, element, isInsideScope, true,
-				reference == SysMLPackage.eINSTANCE.redefinition_RedefinedFeature, 
+			    context instanceof Redefinition &&
+				(reference == SysMLPackage.eINSTANCE.redefinition_RedefinedFeature ||
+				 reference == SysMLPackage.eINSTANCE.featureChaining_ChainingFeature), 
 				if (context instanceof Element) context else null)
 	}
 	
diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend
index 41a59b3d1..acfbaa1a1 100644
--- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend
+++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend
@@ -599,7 +599,7 @@ class KerMLValidator extends AbstractKerMLValidator {
 		val crossFeature = FeatureUtil.getCrossFeatureOf(f)
 		val ownedCrossFeature = f.ownedCrossFeature()
 		if (crossFeature !== null) {
-			val redefinedFeatures = FeatureUtil.getRedefinedFeaturesWithComputedOf(f, null);
+			val redefinedFeatures = FeatureUtil.getRedefinedFeaturesWithComputedOf(f);
 			if (redefinedFeatures.map[rf | FeatureUtil.getCrossFeatureOf(rf)].
 				exists[cf | cf !== null && !TypeUtil.specializes(crossFeature, cf)]) {
 				if (f.ownedCrossSubsetting === null) {
diff --git a/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/ExpressionEvaluator.java b/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/ExpressionEvaluator.java
index 0be03ed70..119e927e4 100644
--- a/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/ExpressionEvaluator.java
+++ b/org.omg.sysml.execution/src/org/omg/sysml/execution/expressions/ExpressionEvaluator.java
@@ -97,7 +97,7 @@ protected InvocationExpression instantiateInvocation(InvocationExpression expres
 				TypeUtil.addOwnedFeatureTo(instantiation, newParameter);
 				
 				newParameter.setDirection(parameter.getDirection());
-				for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(parameter, null)) {
+				for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(parameter)) {
 					Redefinition newRedefinition = SysMLFactory.eINSTANCE.createRedefinition();
 					newRedefinition.setRedefinedFeature(redefinedFeature);
 					newRedefinition.setRedefiningFeature(newParameter);
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstructorExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConstructorExpressionAdapter.java
index d8e61ea16..04afd5302 100644
--- a/org.omg.sysml/src/org/omg/sysml/adapter/ConstructorExpressionAdapter.java
+++ b/org.omg.sysml/src/org/omg/sysml/adapter/ConstructorExpressionAdapter.java
@@ -40,8 +40,10 @@ public ConstructorExpression getTarget() {
 		
 	// Transformation
 	
+	/**
+	 * @satisifies checkConstructorExpressionResultSpecialization
+	 */
 	protected void addResultTyping() {
-		// checkConstructorExpressionResultSpecialization
 		ConstructorExpression target = getTarget();
 		Type instantiatedType = target.getInstantiatedType();
 		if (instantiatedType != null) {
@@ -59,11 +61,6 @@ protected void addResultTyping() {
 	@Override
 	public void addAdditionalMembers() {
 		TypeUtil.addResultParameterTo(getTarget());
-	}
-	
-	@Override
-	public void doTransform() {
-		super.doTransform();
 		addResultTyping();
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
index 0fb71a4aa..df41237d1 100644
--- a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
+++ b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
@@ -57,7 +57,6 @@
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.lang.sysml.TypeFeaturing;
 import org.omg.sysml.lang.sysml.VisibilityKind;
-import org.omg.sysml.lang.sysml.impl.RedefinitionImpl;
 import org.omg.sysml.util.ConnectorUtil;
 import org.omg.sysml.util.ElementUtil;
 import org.omg.sysml.util.ExpressionUtil;
@@ -302,7 +301,7 @@ protected void addOwnedCrossFeatureSpecialization() {
 				addImplicitGeneralType(SysMLPackage.eINSTANCE.getFeatureTyping(), type);
 			}
 			
-			for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf((Feature)owner, null)) {
+			for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf((Feature)owner)) {
 				if (redefinedFeature.isEnd()) {
 					Feature crossFeature = getCrossFeatureOf(redefinedFeature);
 					if (crossFeature != null) {
@@ -500,7 +499,7 @@ public Set<Feature> getAllRedefinedFeatures() {
 	
 	public void addAllRedefinedFeaturesTo(Set<Feature> redefinedFeatures) {
 		redefinedFeatures.add(getTarget());
-		getRedefinedFeaturesWithComputed(null).stream().forEach(redefinedFeature->{
+		getRedefinedFeaturesWithComputed().stream().forEach(redefinedFeature->{
 			if (redefinedFeature != null && !redefinedFeatures.contains(redefinedFeature)) {
 				FeatureUtil.addAllRedefinedFeaturesTo(redefinedFeature, redefinedFeatures);
 			}
@@ -509,15 +508,15 @@ public void addAllRedefinedFeaturesTo(Set<Feature> redefinedFeatures) {
 	
 	// Computed Redefinition
 	
-	public List<Feature> getRedefinedFeaturesWithComputed(Element skip) {
+	public List<Feature> getRedefinedFeaturesWithComputed() {
 		Feature target = getTarget();
 		
-		addComputedRedefinitions(skip);
+		addComputedRedefinitions(null);
 		EList<Redefinition> redefinitions = target.getOwnedRedefinition();
 		
 		List<Feature> redefinedFeatures = new ArrayList<>();
 		redefinitions.stream().
-			map(r->r == skip? ((RedefinitionImpl)r).basicGetRedefinedFeature(): r.getRedefinedFeature()).
+			map(Redefinition::getRedefinedFeature).
 			filter(f->f != null).
 			forEachOrdered(redefinedFeatures::add);
 		
@@ -877,7 +876,7 @@ public void addOwnedCrossFeatureTypeFeaturing() {
 					
 					addFeaturingType(cartesianProductFeature);
 
-					for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(owningFeature, null)) {
+					for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf(owningFeature)) {
 						if (redefinedFeature.isEnd()) {
 							Feature crossFeature = getCrossFeatureOf(redefinedFeature);
 							if (crossFeature != null) {
diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java b/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java
index 898c523e9..fcb2dca6e 100644
--- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java
+++ b/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_namingFeature_InvocationDelegate.java
@@ -40,7 +40,7 @@ public Feature_namingFeature_InvocationDelegate(EOperation operation) {
 	public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {
 		Feature self = (Feature) target;
 		
-		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self, null).stream().
+		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self).stream().
 				findFirst().orElse(null);
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java b/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java
index 355f04909..87327fb33 100644
--- a/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java
+++ b/org.omg.sysml/src/org/omg/sysml/delegate/invocation/Feature_redefines_InvocationDelegate.java
@@ -41,7 +41,7 @@ public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws I
 		Feature self = (Feature) target;
 		Feature redefinedFeature = (Feature) arguments.get(0);
 		
-		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self, null).
+		return FeatureUtil.getRedefinedFeaturesWithComputedOf(self).
 				contains(redefinedFeature);
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java b/org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java
index 23f965e8c..94f98c9bd 100644
--- a/org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java
+++ b/org.omg.sysml/src/org/omg/sysml/util/FeatureUtil.java
@@ -37,7 +37,6 @@
 import org.omg.sysml.adapter.FeatureAdapter;
 import org.omg.sysml.lang.sysml.Behavior;
 import org.omg.sysml.lang.sysml.CrossSubsetting;
-import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.FeatureChaining;
@@ -195,8 +194,8 @@ public static List<Feature> getRedefinedFeaturesOf(Feature feature) {
 		return getFeatureAdapter(feature).getRedefinedFeatures();
 	}
 	
-	public static List<Feature> getRedefinedFeaturesWithComputedOf(Feature feature, Element skip) {
-		return getFeatureAdapter(feature).getRedefinedFeaturesWithComputed(skip);
+	public static List<Feature> getRedefinedFeaturesWithComputedOf(Feature feature) {
+		return getFeatureAdapter(feature).getRedefinedFeaturesWithComputed();
 	}
 	
 	public static void forceComputeRedefinitionsFor(Feature feature) {
diff --git a/org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java b/org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java
index 9ecd346fe..60b54d2fa 100644
--- a/org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java
+++ b/org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java
@@ -97,9 +97,10 @@ public static Collection<Feature> getAllFeaturesRedefinedBy(Type type) {
 				collect(Collectors.toSet());
 	}
 	
-	public static List<Feature> getFeaturesRedefinedBy(Type type, Element skip) {
+	public static List<Feature> getFeaturesRedefinedBy(Type type, Feature skip) {
 		return type.getOwnedFeature().stream().
-				flatMap(feature->FeatureUtil.getRedefinedFeaturesWithComputedOf(feature, skip).stream()).
+				filter(feature->feature != skip).
+				flatMap(feature->FeatureUtil.getRedefinedFeaturesWithComputedOf(feature).stream()).
 				toList();
 	}
 
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/SpecializationImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/SpecializationImpl.java
index 1e038f4fa..aec16674b 100644
--- a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/SpecializationImpl.java
+++ b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/SpecializationImpl.java
@@ -281,14 +281,12 @@ public void setOwningType(Type newOwningType) {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated NOT
+	 * @generated
 	 */
 	@Override
 	public EList<Element> getTarget() {
 		EList<Element> target = new UniqueEList<Element>();
-		// TODO: Remove this?
-		// NOTE: The "general" object must NOT be resolved here, in order to avoid Xtext lazy linking errors.
-		Element general = basicGetGeneral();
+		Element general = getGeneral();
 		if (general != null) {
 			target.add(general);
 		}
@@ -307,13 +305,12 @@ public boolean isSetTarget() {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated NOT
+	 * @generated
 	 */
 	@Override
 	public EList<Element> getSource() {
 		EList<Element> source = new UniqueEList<Element>();
-		// TODO: Remove this difference?
-		Type specific = basicGetSpecific();
+		Type specific = getSpecific();
 		if (specific != null) {
 			source.add(specific);
 		}