diff --git a/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF
index 6b37b9d9578f382a1d425e57f9fe1f65a5b6ae75..171e250f82078ae889657b55c04ea09e10d0629b 100644
--- a/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tooling Base UI
 Bundle-SymbolicName: org.fortiss.tooling.base.ui;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-Activator: org.fortiss.tooling.base.ui.ToolingBaseUIActivator
-Require-Bundle: org.fortiss.tooling.base;bundle-version="2.16.0";visibility:=reexport,
- org.fortiss.tooling.kernel.ui;bundle-version="2.16.0";visibility:=reexport,
+Require-Bundle: org.fortiss.tooling.base;bundle-version="2.17.0";visibility:=reexport,
+ org.fortiss.tooling.kernel.ui;bundle-version="2.17.0";visibility:=reexport,
  org.eclipse.swt
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
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 fb68c914d2f2a86e204431e75a68394825817a46..5f7c2a4c67d4cda96caf0b56fb57a8829a9b3384 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
@@ -6,7 +6,7 @@ LayoutedEllipticContentVisualBase.java 6f3daf386d5120793b90ce4569dd9bea33dd2a0f
 LayoutedLineLinkVisual.java 5fc26086e2f63afee403379ba8f09f5113d4c025 GREEN
 LayoutedRectangularContentVisualBase.java 61698ffd771ee2ad798025df8195d1bc09c2c765 GREEN
 NamedLayoutedCircularAnchorageContentVisual.java 5ba0b5d133998eac47425696ef0a02b575418c2d GREEN
-NamedLayoutedCircularAnchorageDiagramVisual.java 94eccb7bb03c5518ae875e9972f062ddd0e1f62d GREEN
+NamedLayoutedCircularAnchorageDiagramVisual.java eb1e736d7715b86dbc3ca0551bb754157f71cc5f GREEN
 NamedLayoutedCurveLinkVisual.java 7945b2f550d5e4804f44891294ee60cc8ffcbf1e GREEN
 NamedLayoutedEllipticContentVisual.java f96a956c2f71b675eee56cfc613684397545da68 GREEN
 NamedLayoutedLineLinkVisual.java 4fc48616000516dc90ba22b7069ffdabadc9c377 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java
index 94eccb7bb03c5518ae875e9972f062ddd0e1f62d..eb1e736d7715b86dbc3ca0551bb754157f71cc5f 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/visual/NamedLayoutedCircularAnchorageDiagramVisual.java
@@ -65,6 +65,15 @@ public class NamedLayoutedCircularAnchorageDiagramVisual<T extends ILayoutedMode
 		}
 	}
 
+	/** {@inheritDoc} */
+	@Override
+	public void removeAllVisuals(DiagramLayers layers) {
+		super.removeAllVisuals(layers);
+		if(nameText.getParent() != null) {
+			layers.getVisualFeedbackLayer().remove(nameText);
+		}
+	}
+
 	/** Returns whether the name label should be enabled. */
 	public boolean enableName() {
 		return !freeConnectorHasVisibleConnections(getModelElement());
diff --git a/org.fortiss.tooling.base/META-INF/MANIFEST.MF b/org.fortiss.tooling.base/META-INF/MANIFEST.MF
index da1872c50b6409f7577bf81fefc66d5e729d4e1c..645b4099c2e8f8c9d3d76aaf0c033834804f8682 100644
--- a/org.fortiss.tooling.base/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.base/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.fortiss.tooling.base;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.fortiss.tooling.kernel;visibility:=reexport;bundle-version="2.16.0"
+ org.fortiss.tooling.kernel;visibility:=reexport;bundle-version="2.17.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.fortiss.tooling.base,
  org.fortiss.tooling.base.annotation,
diff --git a/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF
index d94aac1c47acf866e4d32c46ffa14022a84a7b3e..136c94b88a7bb325a675fa04974adaea53f0ed1c 100644
--- a/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tooling Commons UI
 Bundle-SymbolicName: org.fortiss.tooling.common.ui;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.fortiss.tooling.common;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,
diff --git a/org.fortiss.tooling.common/META-INF/MANIFEST.MF b/org.fortiss.tooling.common/META-INF/MANIFEST.MF
index dfea4aa5f4b6632d93ea32ec457849094e521a8f..45f1d6f81cf279ed46f0d088bb00eea12192e01f 100644
--- a/org.fortiss.tooling.common/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tooling Commons
 Bundle-SymbolicName: org.fortiss.tooling.common;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  com.ibm.icu;visibility:=reexport,
  org.junit;visibility:=reexport
diff --git a/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF
index c899444de77fbb98f962b68389e56dc812ce91bb..4541b67867e5eb7c2ba5a497f206b946d43650e6 100644
--- a/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.graphicsGL.ui/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tooling Graphics GL UI
 Bundle-SymbolicName: org.fortiss.tooling.graphicsGL.ui;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-Activator: org.fortiss.tooling.graphicsGL.ui.ToolingGraphicsGLUIActivator
-Require-Bundle: org.fortiss.tooling.graphicsGL;bundle-version="2.16.0";visibility:=reexport,
- org.fortiss.tooling.base.ui;bundle-version="2.16.0";visibility:=reexport
+Require-Bundle: org.fortiss.tooling.graphicsGL;bundle-version="2.17.0";visibility:=reexport,
+ org.fortiss.tooling.base.ui;bundle-version="2.17.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: fortiss GmbH
diff --git a/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF b/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF
index 4549f29fd1ca7689d5b3833a9c843ae06b1d5047..38e347fd178aa2986bb18ea16e10a68e03648fcb 100644
--- a/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.graphicsGL/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.fortiss.tooling.graphicsGL;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -23,5 +23,5 @@ Export-Package: org.fortiss.tooling.graphicsGL,
  org.fortiss.tooling.graphicsGL.model.scene.util,
  org.fortiss.tooling.graphicsGL.model.util,
  org.fortiss.tooling.graphicsGL.util
-Require-Bundle: org.fortiss.tooling.kernel;bundle-version="2.16.0";visibility:=reexport
+Require-Bundle: org.fortiss.tooling.kernel;bundle-version="2.17.0";visibility:=reexport
 Automatic-Module-Name: org.fortiss.tooling.graphicsGL
diff --git a/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
index ca6401da3143db4f507bbbef21b47a85dddd61e1..d97f766684abd4577b6729d877aaedb6da57701a 100644
--- a/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Tooling Kernel UI
 Bundle-SymbolicName: org.fortiss.tooling.kernel.ui;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-Activator: org.fortiss.tooling.kernel.ui.ToolingKernelUIActivator
 Require-Bundle: org.fortiss.tooling.common.ui;visibility:=reexport,
  org.fortiss.tooling.kernel;visibility:=reexport,
diff --git a/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF b/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF
index dd8e11900cc82c37aad26f0107afd74c32e94978..bc68dbd61aeb49ad50b76d339af9e8b79568f08e 100644
--- a/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.kernel/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.fortiss.tooling.kernel;singleton:=true
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.fortiss.tooling.kernel.ToolingKernelActivator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.16.0",
+Require-Bundle: org.fortiss.tooling.common;visibility:=reexport;bundle-version="2.17.0",
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport;bundle-version="2.7.0",
  org.eclipse.emf.transaction;visibility:=reexport;bundle-version="1.4.0",
diff --git a/org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF b/org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF
index a8e3e829222ef2511c387c192ff39007c1c8b982..c89ba19a5107cb3016de7bf571720bb88fedc2c8 100644
--- a/org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF
+++ b/org.fortiss.tooling.spiderchart.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Spider Chart
 Bundle-SymbolicName: org.fortiss.tooling.spiderchart.ui
-Bundle-Version: 2.16.0.qualifier
+Bundle-Version: 2.17.0.qualifier
 Bundle-Vendor: fortiss GmbH
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Developer: Amit Kumar Mondal (admin@amitinside.com)
@@ -12,6 +12,6 @@ Export-Package: org.fortiss.tooling.spiderchart.model,
  org.fortiss.tooling.spiderchart.util,
  org.fortiss.tooling.spiderchart.widget
 Require-Bundle: org.eclipse.swt,
- org.fortiss.tooling.base.ui;bundle-version="2.16.0";visibility:=reexport
+ org.fortiss.tooling.base.ui;bundle-version="2.17.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.fortiss.tooling.spiderchart.ui