diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/.ratings
index 74ecded403f0ef2a8aa97292c26a5a964c6c4788..d17f3c38d4701582e8122a7fc31cec5d32f004d4 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/.ratings
@@ -1 +1 @@
-HierarchicModelElementTreeViewer.java 8662b201c3a459f3ebe3620970652f7a3f90270e GREEN
+ModelElementTreeViewer.java d8443481e634347b0c533f23d0ae65e312b658f6 YELLOW
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/HierarchicModelElementTreeViewer.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/ModelElementTreeViewer.java
similarity index 95%
rename from org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/HierarchicModelElementTreeViewer.java
rename to org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/ModelElementTreeViewer.java
index 8662b201c3a459f3ebe3620970652f7a3f90270e..d8443481e634347b0c533f23d0ae65e312b658f6 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/HierarchicModelElementTreeViewer.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/javafx/control/treetableview/ModelElementTreeViewer.java
@@ -15,20 +15,21 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.tooling.base.ui.javafx.control.treetableview;
 
-import javafx.embed.swt.SWTFXUtils;
-import javafx.scene.Node;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.TreeView;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-
 import org.fortiss.tooling.base.model.element.IHierarchicElement;
+import org.fortiss.tooling.base.model.element.IModelElement;
 import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeContentProviderBase;
 import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeUIProviderBase;
 import org.fortiss.tooling.common.ui.javafx.control.treetableview.DynamicTreeViewer;
 import org.fortiss.tooling.kernel.model.INamedCommentedElement;
 import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
 
+import javafx.embed.swt.SWTFXUtils;
+import javafx.scene.Node;
+import javafx.scene.control.ContextMenu;
+import javafx.scene.control.TreeView;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
 /**
  * TreeViewer that constructs a DynamicTreeViewer whose UI provider uses the methods and kernel
  * services for {@link IHierarchicElement}s and {@link INamedCommentedElement}s.
@@ -37,13 +38,13 @@ import org.fortiss.tooling.kernel.ui.service.IModelElementHandlerService;
  * 
  * @author diewald
  */
-public class HierarchicModelElementTreeViewer<T extends IHierarchicElement & INamedCommentedElement> {
+public class ModelElementTreeViewer<T extends IModelElement & INamedCommentedElement> {
 
 	/** References the constructed {@link DynamicTreeViewer} "controller". */
 	protected DynamicTreeViewer<T> dynTreeViewer;
 
 	/** Constructor. */
-	public HierarchicModelElementTreeViewer(TreeView<T> treeView, T modelRoot,
+	public ModelElementTreeViewer(TreeView<T> treeView, T modelRoot,
 			DynamicTreeContentProviderBase<T> contentProvider) {
 		DynamicTreeUIProviderBase<T> uiProvider = createContentUIProvider();
 		dynTreeViewer =