diff --git a/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Deserialize4SymbolDeSer.ftl b/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Deserialize4SymbolDeSer.ftl
index dd739b6960..7b6018676e 100644
--- a/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Deserialize4SymbolDeSer.ftl
+++ b/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Deserialize4SymbolDeSer.ftl
@@ -3,6 +3,9 @@ ${tc.signature("symTabMill", "symbolFullName", "symbolSimpleName","symbolRuleAtt
 <#assign genHelper = glex.getGlobalVar("astHelper")>
   ${symbolFullName}Builder builder = ${symTabMill}.${symbolSimpleName?uncap_first}Builder();
   builder.setName(symbolJson.getStringMember(de.monticore.symboltable.serialization.JsonDeSers.NAME));
+  if (scope != null) {
+    builder.setEnclosingScope(scope);
+  }
   if (symbolJson.hasStringMember(de.monticore.symboltable.serialization.JsonDeSers.FULL_NAME)) {
     builder.setFullName(symbolJson.getStringMember(de.monticore.symboltable.serialization.JsonDeSers.FULL_NAME));
   }
diff --git a/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Serialize4SymbolDeSer.ftl b/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Serialize4SymbolDeSer.ftl
index 16fe488d8a..f793352eca 100644
--- a/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Serialize4SymbolDeSer.ftl
+++ b/monticore-generator/src/main/resources/_symboltable/serialization/symbolDeSer/Serialize4SymbolDeSer.ftl
@@ -5,7 +5,6 @@ ${tc.signature("hasSpannedScope", "symbolRuleAttributes")}
   p.beginObject();
   p.member(de.monticore.symboltable.serialization.JsonDeSers.KIND, getSerializedKind());
   p.member(de.monticore.symboltable.serialization.JsonDeSers.NAME, toSerialize.getName());
-  p.member(de.monticore.symboltable.serialization.JsonDeSers.FULL_NAME, toSerialize.getFullName());
   p.member(de.monticore.symboltable.serialization.JsonDeSers.PACKAGE_NAME, toSerialize.getPackageName());
   p.array(
     de.monticore.symboltable.serialization.JsonDeSers.STEREO_INFO,
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/Simple.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/Simple.json
index d5b7223e4f..89347474a1 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/Simple.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/Simple.json
@@ -1,5 +1,4 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
-  "name": "Comp",
-  "fullName": "Comp"
+  "name": "Comp"
 }
\ No newline at end of file
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithField.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithField.json
index bfd8539d90..053292dc46 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithField.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithField.json
@@ -1,13 +1,11 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "Comp",
-  "fullName": "Comp",
   "spannedScope": {
     "symbols": [
       {
         "kind": "de.monticore.symbols.basicsymbols._symboltable.VariableSymbol",
         "name": "inst",
-        "fullName": "Comp.inst",
         "type": {
           "kind": "de.monticore.types.check.SymTypePrimitive",
           "primitiveName": "int"
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithInner.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithInner.json
index 35eac8ac03..a4df8f489d 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithInner.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithInner.json
@@ -1,13 +1,11 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "Comp",
-  "fullName": "Comp",
   "spannedScope": {
     "symbols": [
       {
         "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
-        "name": "inst",
-        "fullName": "Comp.inst"
+        "name": "inst"
       }
     ]
   }
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithParams.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithParams.json
index 978093178e..5634132718 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithParams.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithParams.json
@@ -1,12 +1,10 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "Comp",
-  "fullName": "Comp",
   "parameters": [
     {
       "kind": "de.monticore.symbols.basicsymbols._symboltable.VariableSymbol",
       "name": "a",
-      "fullName": "Comp.a",
       "type": {
         "kind": "de.monticore.types.check.SymTypePrimitive",
         "primitiveName": "int"
@@ -15,7 +13,6 @@
     {
       "kind": "de.monticore.symbols.basicsymbols._symboltable.VariableSymbol",
       "name": "b",
-      "fullName": "Comp.b",
       "type": {
         "kind": "de.monticore.types.check.SymTypePrimitive",
         "primitiveName": "int"
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithPorts.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithPorts.json
index 16bd288e12..b5806b5321 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithPorts.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithPorts.json
@@ -1,13 +1,11 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "Comp",
-  "fullName": "Comp",
   "spannedScope": {
     "symbols": [
       {
         "kind": "de.monticore.symbols.compsymbols._symboltable.PortSymbol",
         "name": "inc",
-        "fullName": "Comp.inc",
         "type": {
           "kind": "de.monticore.types.check.SymTypePrimitive",
           "primitiveName": "int"
@@ -18,7 +16,6 @@
       {
         "kind": "de.monticore.symbols.compsymbols._symboltable.PortSymbol",
         "name": "outg",
-        "fullName": "Comp.outg",
         "type": {
           "kind": "de.monticore.types.check.SymTypePrimitive",
           "primitiveName": "int"
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithRefinement.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithRefinement.json
index fb6dd816b8..256a42957f 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithRefinement.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithRefinement.json
@@ -1,7 +1,6 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "Comp",
-  "fullName": "Comp",
   "refinements": [
     {
       "kind": "de.monticore.types.check.CompKindOfComponentType",
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSub.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSub.json
index 951012fb66..ce6ef32c08 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSub.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSub.json
@@ -1,13 +1,11 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "Parent",
-  "fullName": "Parent",
   "spannedScope": {
     "symbols": [
       {
         "kind": "de.monticore.symbols.compsymbols._symboltable.SubcomponentSymbol",
         "name": "inst",
-        "fullName": "Parent.inst",
         "type": {
           "kind": "de.monticore.types.check.CompKindOfComponentType",
           "componentTypeName": "Comp"
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper1.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper1.json
index dd371df7d5..c7b55445be 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper1.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper1.json
@@ -1,7 +1,6 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "CompTypeWithSuper1",
-  "fullName": "CompTypeWithSuper1",
   "super": [
     {
       "kind": "de.monticore.types.check.CompKindOfComponentType",
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper2.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper2.json
index 5e7186f95b..5096284ad4 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper2.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithSuper2.json
@@ -1,7 +1,6 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "CompTypeWithSuper2",
-  "fullName": "CompTypeWithSuper2",
   "super": [
     {
       "kind": "de.monticore.types.check.CompKindOfComponentType",
diff --git a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithTypeParams.json b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithTypeParams.json
index 3a20ce3efb..a7378231b7 100644
--- a/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithTypeParams.json
+++ b/monticore-grammar/src/test/resources/de/monticore/symbols/compsymbols/_symboltable/WithTypeParams.json
@@ -1,18 +1,15 @@
 {
   "kind": "de.monticore.symbols.compsymbols._symboltable.ComponentTypeSymbol",
   "name": "Comp",
-  "fullName": "Comp",
   "spannedScope": {
     "symbols": [
       {
         "kind": "de.monticore.symbols.basicsymbols._symboltable.TypeVarSymbol",
-        "name": "A",
-        "fullName": "Comp.A"
+        "name": "A"
       },
       {
         "kind": "de.monticore.symbols.basicsymbols._symboltable.TypeVarSymbol",
-        "name": "B",
-        "fullName": "Comp.B"
+        "name": "B"
       }
     ]
   }