diff --git a/Assets/Resources/Prefabs/Facts/Rectangle.prefab b/Assets/Resources/Prefabs/Facts/Square.prefab
similarity index 99%
rename from Assets/Resources/Prefabs/Facts/Rectangle.prefab
rename to Assets/Resources/Prefabs/Facts/Square.prefab
index 61f639129ad5efde8d6976aa4e943c0a81a9bcd2..62feb61f360ac8fd484fd0716fe6f688e15f76d5 100644
--- a/Assets/Resources/Prefabs/Facts/Rectangle.prefab
+++ b/Assets/Resources/Prefabs/Facts/Square.prefab
@@ -12,7 +12,7 @@ GameObject:
   - component: {fileID: 1812690906255965161}
   - component: {fileID: 6950663371922587874}
   m_Layer: 15
-  m_Name: Rectangle
+  m_Name: Square
   m_TagString: Selectable
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/Assets/Resources/Prefabs/Facts/Rectangle.prefab.meta b/Assets/Resources/Prefabs/Facts/Square.prefab.meta
similarity index 100%
rename from Assets/Resources/Prefabs/Facts/Rectangle.prefab.meta
rename to Assets/Resources/Prefabs/Facts/Square.prefab.meta
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index 0c443f0e2fb2abf14a1a67b03cd72b9ee09ad566..5a45b4e0e6ce3f6647b679a40ecde3390bc8393c 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -60623,12 +60623,6 @@ PrefabInstance:
       value: 
       objectReference: {fileID: 6839596689016440457, guid: 3053a4bcf6f3c7c45ad438b69ffcde9b,
         type: 3}
-    - target: {fileID: 2872381745209199267, guid: b07552db700124a4680401e6fb94c186,
-        type: 3}
-      propertyPath: Rectangle
-      value: 
-      objectReference: {fileID: 6839596689016440457, guid: 3053a4bcf6f3c7c45ad438b69ffcde9b,
-        type: 3}
     - target: {fileID: 2872381745209199267, guid: b07552db700124a4680401e6fb94c186,
         type: 3}
       propertyPath: TestPoint
@@ -62780,17 +62774,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186,
-        type: 3}
-      propertyPath: PrefabDataConfig.Array.data[29]
-      value: 
-      objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d,
-        type: 3}
     - target: {fileID: 6898471569945669422, guid: b07552db700124a4680401e6fb94c186,
         type: 3}
       propertyPath: PrefabDataConfig.Array.data[30]
       value: 
-      objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4,
+      objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d,
         type: 3}
     - target: {fileID: 6899268459312977207, guid: b07552db700124a4680401e6fb94c186,
         type: 3}
@@ -63222,17 +63210,11 @@ PrefabInstance:
       propertyPath: m_PresetInfoIsWorld
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186,
-        type: 3}
-      propertyPath: PrefabDataConfig.Array.data[29]
-      value: 
-      objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d,
-        type: 3}
     - target: {fileID: 7743735189960969443, guid: b07552db700124a4680401e6fb94c186,
         type: 3}
       propertyPath: PrefabDataConfig.Array.data[30]
       value: 
-      objectReference: {fileID: 3080888058940174091, guid: 389563c758e86d848b3341576b90b7e4,
+      objectReference: {fileID: 3080888058940174091, guid: 78a5636dd3b386a4e82a65390ad23c7d,
         type: 3}
     - target: {fileID: 7748114935345543003, guid: b07552db700124a4680401e6fb94c186,
         type: 3}
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
index 475afd267f4d8bc0f05ef1967a98eff72d574373..d6c2831c892ce3500bd06b6f8d5579b1ff17d0d2 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/FactSpawner.cs
@@ -17,7 +17,7 @@ public GameObject
         Ring,
         Prism,
         Cone,
-        Rectangle,
+        Square,
         Circle;
 
     private void OnEnable()
@@ -59,19 +59,19 @@ public void SpawnFactRepresentation(Fact fact)
                 SpawnCone(ConeVolumeFact); break;
             case TruncatedConeVolumeFact TruncatedConeVolumeFact:
                 SpawnTruncatedCone(TruncatedConeVolumeFact); break;
-            case RectangleFact rectangleFact:
-                SpawnRectangle(rectangleFact); break;
+            case SquareFact squareFact:
+                SpawnSquare(squareFact); break;
             default: break;
         };
     }
 
-    public void SpawnRectangle(RectangleFact fact){
+    public void SpawnSquare(SquareFact fact){
 
-        GameObject rectangle = GameObject.Instantiate(Rectangle);
+        GameObject square = GameObject.Instantiate(Square);
 
-        rectangle.transform.SetPositionAndRotation(fact.Position, fact.Rotation);
-        rectangle.transform.localScale = Vector3.Scale(rectangle.transform.localScale, fact.LocalScale);
-        rectangle.GetComponentInChildren<TextMeshPro>().text = fact.GetLabel(StageStatic.stage.factState) + " = " + System.Math.Round(fact.Area, 2) + "m²";
+        square.transform.SetPositionAndRotation(fact.Position, fact.Rotation);
+        square.transform.localScale = Vector3.Scale(square.transform.localScale, fact.LocalScale);
+        square.GetComponentInChildren<TextMeshPro>().text = fact.GetLabel(StageStatic.stage.factState) + " = " + System.Math.Round(fact.Area, 2) + "m²";
 
     }
 
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
index 93498170e4703b1b36cc12aad6bcd483ed92cacd..ede12cb2b3656fcef07965e8efb86cf42960b0d2 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/Fact.cs
@@ -72,8 +72,8 @@ public static class ParsingDictionary
         { MMTConstants.FunctionFact,
             FunctionFact.parseFact },
         {
-            MMTConstants.RectangleType,
-            RectangleFact.parseFact
+            MMTConstants.SquareType,
+            SquareFact.parseFact
         },
     };
 
@@ -115,7 +115,7 @@ public static class ParsingDictionary
 [JsonSubtypes.KnownSubType(typeof(QuadFact), nameof(QuadFact))]
 [JsonSubtypes.KnownSubType(typeof(TriangleFact), nameof(TriangleFact))]
 [JsonSubtypes.KnownSubType(typeof(RealLitFact), nameof(RealLitFact))]
-[JsonSubtypes.KnownSubType(typeof(RectangleFact), nameof(RectangleFact))]
+[JsonSubtypes.KnownSubType(typeof(SquareFact), nameof(SquareFact))]
 public abstract class Fact
 {
     [JsonIgnore]
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs b/Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs
similarity index 86%
rename from Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs
rename to Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs
index f69cc74e3a8d232ee952823274307b10a67ac021..f222e8bb4b1bb40857ebd661d7ab241f8165e2ef 100644
--- a/Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs
+++ b/Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs
@@ -9,7 +9,7 @@
 /// <summary>
 /// Point in 3D Space
 /// </summary>
-public class RectangleFact : FactWrappedCRTP<RectangleFact>
+public class SquareFact : FactWrappedCRTP<SquareFact>
 {
 
 
@@ -45,13 +45,13 @@ protected void calculate_vectors(){
         
     }
 
-    public RectangleFact() : base(){
+    public SquareFact() : base(){
         this.PidA = null;
         this.PidB = null;
         this.PidC = null;
     }
     [JsonConstructor]
-    public RectangleFact( string PidA, string PidB, string PidC) : base()
+    public SquareFact( string PidA, string PidB, string PidC) : base()
     {
 
         this.PidA = PidA;
@@ -68,7 +68,7 @@ public RectangleFact( string PidA, string PidB, string PidC) : base()
     /// </summary>
     /// <param name="Point">sets <see cref="Point"/></param>
     /// <param name="ServerDefinition">MMT URI as OMS</param>
-    public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinition) : base()
+    public SquareFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinition) : base()
     {
   
 
@@ -100,7 +100,7 @@ public RectangleFact(string PidA, string PidB, string PidC, SOMDoc ServerDefinit
 
         
 
-        ret.Add(new RectangleFact(PidA, PidB, PidC, fact.@ref));
+        ret.Add(new SquareFact(PidA, PidB, PidC, fact.@ref));
 
         //ParsingDictionary.parseTermsToId.TryAdd(defines.ToString(), fact.@ref.uri);
         //ret.Add(new PointFact(SOMDoc.MakeVector3(defines), fact.@ref));
@@ -123,7 +123,7 @@ protected override void RecalculateTransform()
         calculate_vectors();
     }
     /// \copydoc Fact.Equivalent(Fact, Fact)
-    protected override bool EquivalentWrapped(RectangleFact f1, RectangleFact f2){
+    protected override bool EquivalentWrapped(SquareFact f1, SquareFact f2){
         
         return (
 
@@ -138,20 +138,20 @@ protected override bool EquivalentWrapped(RectangleFact f1, RectangleFact f2){
 
     protected override Fact _ReInitializeMe(Dictionary<string, string> old_to_new){
         
-        return new RectangleFact(this.PidA, this.PidB, this.PidC);
+        return new SquareFact(this.PidA, this.PidB, this.PidC);
 
     }
 
     public override MMTFact MakeMMTDeclaration()
     {
-        SOMDoc tp = new OMS(MMTConstants.RectangleType);
+        SOMDoc tp = new OMS(MMTConstants.SquareType);
 
         return new MMTGeneralFact(_LastLabel, tp, Defines());
     }
 
     public override SOMDoc Defines()
         => new OMA(
-                new OMS(MMTConstants.RectangleCons),
+                new OMS(MMTConstants.SquareCons),
                 new[] {
                         new OMS(PidA),
                         new OMS(PidB),
diff --git a/Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs.meta b/Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs.meta
similarity index 100%
rename from Assets/Scripts/InteractionEngine/FactHandling/Facts/RectangleFact.cs.meta
rename to Assets/Scripts/InteractionEngine/FactHandling/Facts/SquareFact.cs.meta
diff --git a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
index 4e036c29cd3e4dc3c7c1efd9b26eef3d0b1e3285..edcf791280416b2d97dde30b1a376c537747f577 100644
--- a/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
+++ b/Assets/Scripts/MMTServer/CommunicationProtocoll/MMTConstants.cs
@@ -40,9 +40,9 @@ public static class MMTConstants
         //public static readonly string RectangleFactmk = "http://mathhub.info/FrameIT/frameworld?FrameITRectangles?mkRectangle";
 
 
-         public static readonly string RectangleCons = "http://mathhub.info/FrameIT/frameworld?RectangleType?rectangleCons";
-        public static readonly string RectangleType = "http://mathhub.info/FrameIT/frameworld?RectangleType?rectangleType";
-        public static readonly string RectangleScroll = "http://mathhub.info/FrameIT/frameworld?RectangleScroll";
+         public static readonly string SquareCons = "http://mathhub.info/FrameIT/frameworld?SquareType?squareCons";
+        public static readonly string SquareType = "http://mathhub.info/FrameIT/frameworld?SquareType?squareType";
+        public static readonly string SquareScroll = "http://mathhub.info/FrameIT/frameworld?SquareScroll";
 
         public static readonly string CircleType3d = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?circleType3D";
         public static readonly string MkCircle3d = "http://mathhub.info/FrameIT/frameworld?FrameITCircle?circle3D";
@@ -151,8 +151,8 @@ public static class MMTConstants
             { TypeType,
                 typeof(Type) },
             {
-                RectangleType,
-                typeof(RectangleFact)
+                SquareType,
+                typeof(SquareFact)
             },
 
             { Point,