diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings
index 7acad8d98b24d80bd0dfbfd2001aede4be5ba0eb..d3e23172e17bc8a3a3f8baf945e57f21619d3131 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/.ratings
@@ -1,10 +1,14 @@
 CoordinateCorrections.java c5cc475b45de38c56fc2e888a2d3093cd2efb52a YELLOW
+LayoutedCircularAnchorageContentVisualBase.java 2aa292444671bf644e37bc923b877c92de0235b1 YELLOW
+LayoutedCircularAnchorageDiagramVisualBase.java f06e3b908020408e3cd268a3c63edcd75ef74f8b YELLOW
 LayoutedCircularContentAnchorageVisualBase.java 4c3ee2d3c00f3b04c0824330fa5c5aeaeb91da2f YELLOW
 LayoutedCircularDiagramAnchorageVisualBase.java dff18208ffd98682dca49c061361550d310bdf76 YELLOW
 LayoutedLineLinkVisual.java 634c6ceeab057afc5da0924f227375785836b179 YELLOW
 LayoutedRectangularContentVisualBase.java c2a3937b99284713e0bbcd3ce458874567b25ac5 YELLOW
+NamedLayoutedCircularAnchorageContentVisual.java c680002469ce897679fa5a3f4af51d1b19cb53d6 YELLOW
+NamedLayoutedCircularAnchorageDiagramVisual.java 714a176a0569a2049efb4009f710ca66bf3a57fb YELLOW
 NamedLayoutedConnectorContentVisual.java 087280aba1c523f5055bccad5cd4acde37abd7b9 YELLOW
 NamedLayoutedConnectorDiagramVisual.java 9fcf3825f7cfcdd5dafb58f9c53ad99fa9c0f381 YELLOW
+NamedLayoutedLineLinkVisual.java 72f577d9dc8748cbb488964633bb21ff88649aa1 YELLOW
 NamedLayoutedLinkVisual.java 92ce828c82e3a231b8f6e153d39bc77f396118fa YELLOW
 NamedLayoutedRectangularContentVisual.java 122e193ac587857d1dad23b42583a0bcf465f0d0 YELLOW
-NamedLayoutedRectengularContentVisual.java 8d5428bdf53d50c604a2af5d6161a1a7a627250b YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularContentAnchorageVisualBase.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularAnchorageContentVisualBase.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularContentAnchorageVisualBase.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularAnchorageContentVisualBase.java
index 4c3ee2d3c00f3b04c0824330fa5c5aeaeb91da2f..2aa292444671bf644e37bc923b877c92de0235b1 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularContentAnchorageVisualBase.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularAnchorageContentVisualBase.java
@@ -46,11 +46,11 @@ import javafx.scene.paint.Paint;
  * 
  * @author munaro
  */
-public abstract class LayoutedCircularContentAnchorageVisualBase<T extends ILayoutedModelElement>
+public abstract class LayoutedCircularAnchorageContentVisualBase<T extends ILayoutedModelElement>
 		extends CircularContentAnchorageVisualBase implements ISideLayout, IOffsetLayout {
 
 	/** Constructor. */
-	public LayoutedCircularContentAnchorageVisualBase(IContentAnchorageMVCBundle mvcb,
+	public LayoutedCircularAnchorageContentVisualBase(IContentAnchorageMVCBundle mvcb,
 			Class<T> modelType) {
 		super(mvcb);
 
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularDiagramAnchorageVisualBase.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularAnchorageDiagramVisualBase.java
similarity index 97%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularDiagramAnchorageVisualBase.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularAnchorageDiagramVisualBase.java
index dff18208ffd98682dca49c061361550d310bdf76..f06e3b908020408e3cd268a3c63edcd75ef74f8b 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularDiagramAnchorageVisualBase.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/LayoutedCircularAnchorageDiagramVisualBase.java
@@ -39,11 +39,11 @@ import javafx.scene.paint.Paint;
  * 
  * @author munaro
  */
-public abstract class LayoutedCircularDiagramAnchorageVisualBase<T extends ILayoutedModelElement>
+public abstract class LayoutedCircularAnchorageDiagramVisualBase<T extends ILayoutedModelElement>
 		extends CircularDiagramAnchorageVisualBase {
 
 	/** Constructor. */
-	public LayoutedCircularDiagramAnchorageVisualBase(IDiagramAnchorageMVCBundle mvcb,
+	public LayoutedCircularAnchorageDiagramVisualBase(IDiagramAnchorageMVCBundle mvcb,
 			Class<T> modelType) {
 		super(mvcb);
 
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedConnectorContentVisual.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageContentVisual.java
similarity index 87%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedConnectorContentVisual.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageContentVisual.java
index 087280aba1c523f5055bccad5cd4acde37abd7b9..c680002469ce897679fa5a3f4af51d1b19cb53d6 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedConnectorContentVisual.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageContentVisual.java
@@ -27,11 +27,11 @@ import org.fortiss.tooling.kernel.model.INamedElement;
  * 
  * @author diewald
  */
-public class NamedLayoutedConnectorContentVisual<T extends ILayoutedModelElement & INamedElement>
-		extends LayoutedCircularContentAnchorageVisualBase<T> {
+public class NamedLayoutedCircularAnchorageContentVisual<T extends ILayoutedModelElement & INamedElement>
+		extends LayoutedCircularAnchorageContentVisualBase<T> {
 
 	/** Constructor. */
-	public NamedLayoutedConnectorContentVisual(IContentAnchorageMVCBundle mvcb, Class<T> modelType) {
+	public NamedLayoutedCircularAnchorageContentVisual(IContentAnchorageMVCBundle mvcb, Class<T> modelType) {
 		super(mvcb, modelType);
 	}
 
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedConnectorDiagramVisual.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java
similarity index 87%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedConnectorDiagramVisual.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java
index 9fcf3825f7cfcdd5dafb58f9c53ad99fa9c0f381..714a176a0569a2049efb4009f710ca66bf3a57fb 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedConnectorDiagramVisual.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java
@@ -26,11 +26,11 @@ import org.fortiss.tooling.kernel.model.INamedElement;
  * 
  * @author diewald
  */
-public class NamedLayoutedConnectorDiagramVisual<T extends ILayoutedModelElement & INamedElement>
-		extends LayoutedCircularDiagramAnchorageVisualBase<T> {
+public class NamedLayoutedCircularAnchorageDiagramVisual<T extends ILayoutedModelElement & INamedElement>
+		extends LayoutedCircularAnchorageDiagramVisualBase<T> {
 
 	/** Constructor. */
-	public NamedLayoutedConnectorDiagramVisual(IDiagramAnchorageMVCBundle mvcb, Class<T> modelType) {
+	public NamedLayoutedCircularAnchorageDiagramVisual(IDiagramAnchorageMVCBundle mvcb, Class<T> modelType) {
 		super(mvcb, modelType);
 	}
 
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLinkVisual.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLineLinkVisual.java
similarity index 92%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLinkVisual.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLineLinkVisual.java
index 92ce828c82e3a231b8f6e153d39bc77f396118fa..72f577d9dc8748cbb488964633bb21ff88649aa1 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLinkVisual.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedLineLinkVisual.java
@@ -27,11 +27,11 @@ import org.fortiss.tooling.kernel.model.INamedElement;
  * 
  * @author diewald
  */
-public class NamedLayoutedLinkVisual<T extends INamedElement & ILayoutedModelElement>
+public class NamedLayoutedLineLinkVisual<T extends INamedElement & ILayoutedModelElement>
 		extends LayoutedLineLinkVisual<T> {
 
 	/** Constructor. */
-	public NamedLayoutedLinkVisual(ILinkMVCBundle mvcb, Class<T> modelType) {
+	public NamedLayoutedLineLinkVisual(ILinkMVCBundle mvcb, Class<T> modelType) {
 		super(mvcb, modelType);
 	}