diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedStyledTextCellDatabindingEditingSupport.java
similarity index 92%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedStyledTextCellDatabindingEditingSupport.java
index 8e05893ed3e7ab8dda3c98672ecd1a91000929cc..9bd84b85d77f6384f7f7973fa85b2b9e5850aea7 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractDecoratedStyledTextCellDatabindingEditingSupport.java
@@ -42,20 +42,20 @@ import org.fortiss.tooling.kernel.ui.util.DataBindingUtils;
  * abstract methods.
  * </p>
  * <P>
- * Decoration is in effect if either {@link #getTextValidator(Object)} returns a non-null
+ * Decoration is in effect if either {@link #getTextValidator(Object)} returns a non-{@code null}
  * {@link IValidator}.
  * </p>
  * 
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: BC0D36A060AE96F7784E11F4E02E16E6
+ * @ConQAT.Rating YELLOW Hash: 0836F73B8DA170C80B3C15AA185F58FE
  */
-public abstract class AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport
-		extends AbstractTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport {
+public abstract class AbstractDecoratedStyledTextCellDatabindingEditingSupport extends
+		AbstractStyledTextCellDatabindingEditingSupport {
 
 	/** Constructor. */
-	public AbstractDecoratedTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport(
+	public AbstractDecoratedStyledTextCellDatabindingEditingSupport(
 			EditorBase<? extends EObject> editor, ColumnViewer viewer,
 			DataBindingContext bindingContext) {
 		super(editor, viewer, bindingContext);
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractStyledTextCellDatabindingEditingSupport.java
similarity index 72%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractStyledTextCellDatabindingEditingSupport.java
index 508b057a13b4bb55b668fdfdbc9797f0fef039e8..7b2bf073b8d889ff8bb195a0d39b027cea41c896 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/databinding/AbstractStyledTextCellDatabindingEditingSupport.java
@@ -22,27 +22,26 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.jface.viewers.ColumnViewer;
 import org.eclipse.swt.widgets.Composite;
-import org.fortiss.tooling.base.ui.editor.TextCellEditorWithTextStyledTextActionHandler;
+import org.fortiss.tooling.base.ui.editor.StyledTextCellEditor;
 import org.fortiss.tooling.kernel.ui.extension.base.EditorBase;
 
 /**
- * Abstract base class for inline text cell, with copy-pasting.
+ * Abstract base class for inline text cell, with copy-paste support.
  * 
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 129A3738C36A26DB5CC5ACCE0BD08D28
+ * @ConQAT.Rating YELLOW Hash: 10E8790FF4A5261438CD789743CCD020
  */
-public abstract class AbstractTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport
-		extends AbstractTextCellDatabindingEditingSupport {
+public abstract class AbstractStyledTextCellDatabindingEditingSupport extends
+		AbstractTextCellDatabindingEditingSupport {
 
-	/** Editor, which contains this EditingSupport} */
+	/** Editor, which contains this EditingSupport}. */
 	protected EditorBase<? extends EObject> editor;
 
 	/** Constructor. */
-	public AbstractTextCellWithTextStyledTextActionHandlerDatabindingEditingSupport(
-			EditorBase<? extends EObject> editor, ColumnViewer viewer,
-			DataBindingContext bindingContext) {
+	public AbstractStyledTextCellDatabindingEditingSupport(EditorBase<? extends EObject> editor,
+			ColumnViewer viewer, DataBindingContext bindingContext) {
 		super(viewer, bindingContext);
 		this.editor = editor;
 	}
@@ -51,9 +50,8 @@ public abstract class AbstractTextCellWithTextStyledTextActionHandlerDatabinding
 	@Override
 	protected CellEditor createCellEditor(ColumnViewer viewer) {
 		CellEditor cellEditor =
-				new TextCellEditorWithTextStyledTextActionHandler(
-						editor.getTextStyledTextActionHandler(), (Composite)getViewer()
-								.getControl());
+				new StyledTextCellEditor(editor.getTextStyledTextActionHandler(),
+						(Composite)getViewer().getControl());
 		setupCellEditor(cellEditor);
 		return cellEditor;
 	}
diff --git a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TextCellEditorWithTextStyledTextActionHandler.java b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/StyledTextCellEditor.java
similarity index 78%
rename from org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TextCellEditorWithTextStyledTextActionHandler.java
rename to org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/StyledTextCellEditor.java
index 8965b4d6f0a0b2f3acfbcf3a295c317d8d9d8e0c..26cc7c3f5787de26cf1afaf73d457e9976ee5a37 100644
--- a/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/TextCellEditorWithTextStyledTextActionHandler.java
+++ b/org.fortiss.tooling.base.ui/trunk/src/org/fortiss/tooling/base/ui/editor/StyledTextCellEditor.java
@@ -23,19 +23,16 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.actions.TextStyledTextActionHandler;
 
 /**
- * A specific {@link TextCellEditor} with copy-paste key function
- * 
- * TODO(VA) this class should not be called "handler" IMHO, it brings confusion with all the things
- * we call handler already.
+ * A {@link TextCellEditor} with styled text fileds and copy-paste keyboard shortcut support.
  * 
  * @author wenwenchen
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating GREEN Hash: 792912BF97001631339E59902BE890A2
+ * @ConQAT.Rating YELLOW Hash: CB25ED6030D8C8BCE63C66C0B639A7C9
  */
-public class TextCellEditorWithTextStyledTextActionHandler extends TextCellEditor {
+public class StyledTextCellEditor extends TextCellEditor {
 
-	/** text action handler for text fields and styled text fields with copy-paste key function */
+	/** Text action handler for text fields and styled text fields with copy-paste key function. */
 	private TextStyledTextActionHandler textStyledTextActionHandler;
 
 	/**
@@ -46,8 +43,8 @@ public class TextCellEditorWithTextStyledTextActionHandler extends TextCellEdito
 	 * @param parent
 	 *            parent composite
 	 */
-	public TextCellEditorWithTextStyledTextActionHandler(
-			TextStyledTextActionHandler textStyledTextActionHandler, Composite parent) {
+	public StyledTextCellEditor(TextStyledTextActionHandler textStyledTextActionHandler,
+			Composite parent) {
 		super();
 		this.textStyledTextActionHandler = textStyledTextActionHandler;
 		create(parent);